Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: abide by the original RigidBody2D body type #2995

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: abide by the original RigidBody2D body type #2995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ public class NetworkRigidbody2D : NetworkBehaviour
/// </summary>
private bool m_IsServerAuthoritative;

/// <summary>
/// Stores the original body type of the rigidbody
/// so to abide to the original type desired by the user
/// when authority changes
/// </summary>
private RigidbodyType2D m_OriginalBodyType;

private Rigidbody2D m_Rigidbody;
private NetworkTransform m_NetworkTransform;

Expand Down Expand Up @@ -48,11 +55,14 @@ private void SetupRigidBody()
m_Rigidbody = GetComponent<Rigidbody2D>();
m_OriginalInterpolation = m_Rigidbody.interpolation;

// Store the original body type of the rigidbody
m_OriginalBodyType = m_Rigidbody.bodyType;

m_Rigidbody.interpolation = m_IsAuthority ? m_OriginalInterpolation : (m_NetworkTransform.Interpolate ? RigidbodyInterpolation2D.None : m_OriginalInterpolation);
// Turn off physics for the rigid body until spawned, otherwise
// clients can run fixed update before the first full
// NetworkTransform update
m_Rigidbody.isKinematic = true;
m_Rigidbody.bodyType = RigidbodyType2D.Kinematic;
}

/// <summary>
Expand Down Expand Up @@ -89,7 +99,8 @@ private void UpdateOwnershipAuthority()
}

// If you have authority then you are not kinematic
m_Rigidbody.isKinematic = !m_IsAuthority;
// unless the original body type was set to be Kinematic by the user
m_Rigidbody.bodyType = m_IsAuthority && m_OriginalBodyType == RigidbodyType2D.Dynamic ? RigidbodyType2D.Dynamic : RigidbodyType2D.Kinematic;

// Set interpolation of the Rigidbody2D based on authority
// With authority: let local transform handle interpolation
Expand Down