fix: Parenting does not preserve WorldPositionStays option and other parenting related issues

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -575,6 +575,7 @@ internal void InvokeBehaviourOnNetworkObjectParentChanged(NetworkObject parentNe
         private bool m_IsReparented; // Did initial parent (came from the scene hierarchy) change at runtime?
         private ulong? m_LatestParent; // What is our last set parent NetworkObject's ID?
         private Transform m_CachedParent; // What is our last set parent Transform reference?
+        private bool m_WorldPositionStays = true; // Used to preserve the world position stays parameter passed in TrySetParent
 
         internal void SetCachedParent(Transform parentTransform)
         {
@@ -583,10 +584,11 @@ internal void SetCachedParent(Transform parentTransform)
 
         internal (bool IsReparented, ulong? LatestParent) GetNetworkParenting() => (m_IsReparented, m_LatestParent);
 
-        internal void SetNetworkParenting(bool isReparented, ulong? latestParent)
+        internal void SetNetworkParenting(bool isReparented, ulong? latestParent, bool worldPositionStays)
         {
             m_IsReparented = isReparented;
             m_LatestParent = latestParent;
+            m_WorldPositionStays = worldPositionStays;
         }
 
         /// <summary>
@@ -648,7 +650,7 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
             {
                 return false;
             }
-
+            m_WorldPositionStays = worldPositionStays;
             transform.SetParent(parent.transform, worldPositionStays);
             return true;
         }
@@ -709,6 +711,7 @@ private void OnTransformParentChanged()
             else
             {
                 m_LatestParent = null;
+                m_WorldPositionStays = true; // Reset to the default setting of true
             }
 
             m_IsReparented = true;
@@ -770,6 +773,7 @@ internal bool ApplyNetworkParenting()
             {
                 m_CachedParent = null;
                 transform.parent = null;
+                m_WorldPositionStays = true;  // Reset to the default setting of true
 
                 InvokeBehaviourOnNetworkObjectParentChanged(null);
                 return true;
@@ -784,7 +788,7 @@ internal bool ApplyNetworkParenting()
             var parentObject = NetworkManager.SpawnManager.SpawnedObjects[m_LatestParent.Value];
 
             m_CachedParent = parentObject.transform;
-            transform.parent = parentObject.transform;
+            transform.SetParent(parentObject.transform, m_WorldPositionStays);
 
             InvokeBehaviourOnNetworkObjectParentChanged(parentObject);
             return true;
@@ -997,12 +1001,19 @@ public struct TransformData : INetworkSerializeByMemcpy
 
             public int NetworkSceneHandle;
 
+            public bool WorldPositionStays;
+
             public unsafe void Serialize(FastBufferWriter writer)
             {
                 var writeSize = sizeof(HeaderData);
                 writeSize += Header.HasParent ? FastBufferWriter.GetWriteSize(ParentObjectId) : 0;
                 writeSize += Header.HasTransform ? FastBufferWriter.GetWriteSize(Transform) : 0;
-                writeSize += Header.IsReparented ? FastBufferWriter.GetWriteSize(IsLatestParentSet) + (IsLatestParentSet ? FastBufferWriter.GetWriteSize<ulong>() : 0) : 0;
+                if (Header.IsReparented)
+                {
+                    writeSize += FastBufferWriter.GetWriteSize(WorldPositionStays);
+                    writeSize += FastBufferWriter.GetWriteSize(IsLatestParentSet);
+                    writeSize += IsLatestParentSet ? FastBufferWriter.GetWriteSize<ulong>() : 0;
+                }
                 writeSize += Header.IsSceneObject ? FastBufferWriter.GetWriteSize<int>() : 0;
 
                 if (!writer.TryBeginWrite(writeSize))
@@ -1024,6 +1035,7 @@ public unsafe void Serialize(FastBufferWriter writer)
 
                 if (Header.IsReparented)
                 {
+                    writer.WriteValue(WorldPositionStays);
                     writer.WriteValue(IsLatestParentSet);
                     if (IsLatestParentSet)
                     {
@@ -1053,7 +1065,12 @@ public unsafe void Deserialize(FastBufferReader reader)
                 reader.ReadValue(out Header);
                 var readSize = Header.HasParent ? FastBufferWriter.GetWriteSize(ParentObjectId) : 0;
                 readSize += Header.HasTransform ? FastBufferWriter.GetWriteSize(Transform) : 0;
-                readSize += Header.IsReparented ? FastBufferWriter.GetWriteSize(IsLatestParentSet) + (IsLatestParentSet ? FastBufferWriter.GetWriteSize<ulong>() : 0) : 0;
+                if (Header.IsReparented)
+                {
+                    readSize += FastBufferWriter.GetWriteSize(IsLatestParentSet);
+                    readSize += FastBufferWriter.GetWriteSize(WorldPositionStays);
+                    readSize += IsLatestParentSet ? FastBufferWriter.GetWriteSize<ulong>() : 0;
+                }
                 readSize += Header.IsSceneObject ? FastBufferWriter.GetWriteSize<int>() : 0;
 
                 if (!reader.TryBeginRead(readSize))
@@ -1073,6 +1090,7 @@ public unsafe void Deserialize(FastBufferReader reader)
 
                 if (Header.IsReparented)
                 {
+                    reader.ReadValue(out WorldPositionStays);
                     reader.ReadValue(out IsLatestParentSet);
                     if (IsLatestParentSet)
                     {
@@ -1126,8 +1144,10 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId)
                 obj.Header.HasTransform = true;
                 obj.Transform = new SceneObject.TransformData
                 {
-                    Position = transform.position,
-                    Rotation = transform.rotation
+                    // If we are parented and we have the m_WorldPositionStays disabled, then use the default
+                    // values as opposed to the world space values and adjust relative to the parent.
+                    Position = parentNetworkObject && !m_WorldPositionStays ? Vector3.zero : transform.position,
+                    Rotation = parentNetworkObject && !m_WorldPositionStays ? Quaternion.identity : transform.rotation
                 };
             }
 
@@ -1137,6 +1157,7 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId)
             {
                 var isLatestParentSet = latestParent != null && latestParent.HasValue;
                 obj.IsLatestParentSet = isLatestParentSet;
+                obj.WorldPositionStays = m_WorldPositionStays;
                 if (isLatestParentSet)
                 {
                     obj.LatestParent = latestParent.Value;
@@ -1182,7 +1203,7 @@ internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBuf
                 sceneObject.Header.IsSceneObject, sceneObject.Header.Hash,
                 sceneObject.Header.OwnerClientId, parentNetworkId, networkSceneHandle, position, rotation, sceneObject.Header.IsReparented);
 
-            networkObject?.SetNetworkParenting(sceneObject.Header.IsReparented, sceneObject.LatestParent);
+            networkObject?.SetNetworkParenting(sceneObject.Header.IsReparented, sceneObject.LatestParent, sceneObject.WorldPositionStays);
 
             if (networkObject == null)
             {
@@ -1197,7 +1218,7 @@ internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBuf
                 return null;
             }
 
-            // Spawn the NetworkObject(
+            // Spawn the NetworkObject
             networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, sceneObject, variableData, false);
 
             return networkObject;

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs

@@ -6,18 +6,23 @@ internal struct ParentSyncMessage : INetworkMessage
 
         public bool IsReparented;
 
+        public bool WorldPositionStays;
+
         //If(Metadata.IsReparented)
         public bool IsLatestParentSet;
 
         //If(IsLatestParentSet)
         public ulong? LatestParent;
 
+
+
         public void Serialize(FastBufferWriter writer)
         {
             writer.WriteValueSafe(NetworkObjectId);
             writer.WriteValueSafe(IsReparented);
             if (IsReparented)
             {
+                writer.WriteValueSafe(WorldPositionStays);
                 writer.WriteValueSafe(IsLatestParentSet);
                 if (IsLatestParentSet)
                 {
@@ -36,8 +41,10 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
 
             reader.ReadValueSafe(out NetworkObjectId);
             reader.ReadValueSafe(out IsReparented);
+
             if (IsReparented)
             {
+                reader.ReadValueSafe(out WorldPositionStays);
                 reader.ReadValueSafe(out IsLatestParentSet);
                 if (IsLatestParentSet)
                 {
@@ -59,7 +66,7 @@ public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
             var networkObject = networkManager.SpawnManager.SpawnedObjects[NetworkObjectId];
-            networkObject.SetNetworkParenting(IsReparented, LatestParent);
+            networkObject.SetNetworkParenting(IsReparented, LatestParent, WorldPositionStays);
             networkObject.ApplyNetworkParenting();
         }
     }