fix: NetworkRigidbody sets interpolation mode to none on proxies (#1285)

Author: LukeStampfli

com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs

@@ -14,6 +14,7 @@ public class NetworkRigidbody : NetworkBehaviour
         private NetworkTransform m_NetworkTransform;
 
         private bool m_OriginalKinematic;
+        private RigidbodyInterpolation m_OriginalInterpolation;
 
         // Used to cache the authority state of this rigidbody during the last frame
         private bool m_IsAuthority;
@@ -48,11 +49,16 @@ private void UpdateRigidbodyKinematicMode()
             {
                 m_OriginalKinematic = m_Rigidbody.isKinematic;
                 m_Rigidbody.isKinematic = true;
+
+                m_OriginalInterpolation = m_Rigidbody.interpolation;
+                // Set interpolation to none, the NetworkTransform component interpolates the position of the object.
+                m_Rigidbody.interpolation = RigidbodyInterpolation.None;
             }
             else
             {
                 // Resets the rigidbody back to it's non replication only state. Happens on shutdown and when authority is lost
                 m_Rigidbody.isKinematic = m_OriginalKinematic;
+                m_Rigidbody.interpolation = m_OriginalInterpolation;
             }
         }
 
@@ -61,6 +67,7 @@ public override void OnNetworkSpawn()
         {
             m_IsAuthority = HasAuthority;
             m_OriginalKinematic = m_Rigidbody.isKinematic;
+            m_OriginalInterpolation = m_Rigidbody.interpolation;
             UpdateRigidbodyKinematicMode();
         }
 

com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs

@@ -14,6 +14,7 @@ public class NetworkRigidbody2D : NetworkBehaviour
         private NetworkTransform m_NetworkTransform;
 
         private bool m_OriginalKinematic;
+        private RigidbodyInterpolation2D m_OriginalInterpolation;
 
         // Used to cache the authority state of this rigidbody during the last frame
         private bool m_IsAuthority;
@@ -48,11 +49,16 @@ private void UpdateRigidbodyKinematicMode()
             {
                 m_OriginalKinematic = m_Rigidbody.isKinematic;
                 m_Rigidbody.isKinematic = true;
+
+                m_OriginalInterpolation = m_Rigidbody.interpolation;
+                // Set interpolation to none, the NetworkTransform component interpolates the position of the object.
+                m_Rigidbody.interpolation = RigidbodyInterpolation2D.None;
             }
             else
             {
                 // Resets the rigidbody back to it's non replication only state. Happens on shutdown and when authority is lost
                 m_Rigidbody.isKinematic = m_OriginalKinematic;
+                m_Rigidbody.interpolation = m_OriginalInterpolation;
             }
         }
 
@@ -61,6 +67,7 @@ public override void OnNetworkSpawn()
         {
             m_IsAuthority = HasAuthority;
             m_OriginalKinematic = m_Rigidbody.isKinematic;
+            m_OriginalInterpolation = m_Rigidbody.interpolation;
             UpdateRigidbodyKinematicMode();
         }
 

com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs

@@ -30,6 +30,7 @@ public override IEnumerator Setup()
                 playerPrefab.AddComponent<NetworkTransform>();
                 playerPrefab.AddComponent<Rigidbody2D>();
                 playerPrefab.AddComponent<NetworkRigidbody2D>();
+                playerPrefab.GetComponent<Rigidbody2D>().interpolation = RigidbodyInterpolation2D.Interpolate;
                 playerPrefab.GetComponent<Rigidbody2D>().isKinematic = Kinematic;
             });
         }
@@ -58,9 +59,11 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
 
             // server rigidbody has authority and should have a kinematic mode of false
             Assert.True(serverPlayer.GetComponent<Rigidbody2D>().isKinematic == Kinematic);
+            Assert.AreEqual(RigidbodyInterpolation2D.Interpolate, serverPlayer.GetComponent<Rigidbody2D>().interpolation);
 
             // client rigidbody has no authority and should have a kinematic mode of true
             Assert.True(clientPlayer.GetComponent<Rigidbody2D>().isKinematic);
+            Assert.AreEqual(RigidbodyInterpolation2D.None, clientPlayer.GetComponent<Rigidbody2D>().interpolation);
 
             // despawn the server player, (but keep it around on the server)
             serverPlayer.GetComponent<NetworkObject>().Despawn(false);

com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs

@@ -30,6 +30,7 @@ public override IEnumerator Setup()
                 playerPrefab.AddComponent<NetworkTransform>();
                 playerPrefab.AddComponent<Rigidbody>();
                 playerPrefab.AddComponent<NetworkRigidbody>();
+                playerPrefab.GetComponent<Rigidbody>().interpolation = RigidbodyInterpolation.Interpolate;
                 playerPrefab.GetComponent<Rigidbody>().isKinematic = Kinematic;
             });
         }
@@ -58,9 +59,11 @@ public IEnumerator TestRigidbodyKinematicEnableDisable()
 
             // server rigidbody has authority and should have a kinematic mode of false
             Assert.True(serverPlayer.GetComponent<Rigidbody>().isKinematic == Kinematic);
+            Assert.AreEqual(RigidbodyInterpolation.Interpolate, serverPlayer.GetComponent<Rigidbody>().interpolation);
 
             // client rigidbody has no authority and should have a kinematic mode of true
             Assert.True(clientPlayer.GetComponent<Rigidbody>().isKinematic);
+            Assert.AreEqual(RigidbodyInterpolation.None, clientPlayer.GetComponent<Rigidbody>().interpolation);
 
             // despawn the server player (but keep it around on the server)
             serverPlayer.GetComponent<NetworkObject>().Despawn(false);