feat: NetworkObject Parenting

com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs

@@ -2,7 +2,6 @@
 using MLAPI.NetworkVariable;
 using MLAPI.Transports;
 using UnityEngine;
-using UnityEngine.Serialization;
 
 namespace MLAPI.Prototyping
 {
@@ -41,24 +40,20 @@ public enum Authority
         /// TODO MTT-766 once we have per var interpolation
         /// Enable interpolation
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
-        [FormerlySerializedAs("m_InterpolatePosition")]
         [SerializeField, Tooltip("This requires AssumeSyncedSends to be true")]
         public bool InterpolatePosition = true;
 
         /// <summary>
         /// TODO MTT-766 once we have per var interpolation
         /// The distance before snaping to the position
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
         [SerializeField, Tooltip("The transform will snap if the distance is greater than this distance")]
         public float SnapDistance = 10f;
 
         /// <summary>
         /// TODO MTT-766 once we have per var interpolation
         /// Should the server interpolate
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
         [SerializeField]
         public bool InterpolateServer = true;
 
@@ -68,23 +63,20 @@ public enum Authority
         ///      The setting in the NetworkTransform would be to just apply it to our netvars when available
         /// The min meters to move before a send is sent
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
         [SerializeField, Tooltip("The min meters to move before a send is sent")]
         public float MinMeters = 0.15f;
 
         /// <summary>
         /// TODO MTT-767 once we have this per var setting
         /// The min degrees to rotate before a send is sent
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
         [SerializeField, Tooltip("The min degrees to rotate before a send is sent")]
         public float MinDegrees = 1.5f;
 
         /// <summary>
         /// TODO MTT-767 once we have this per var setting
         /// The min meters to scale before a send is sent
         /// </summary>
-        // ReSharper disable once NotAccessedField.Global
         [SerializeField, Tooltip("The min meters to scale before a send is sent")]
         public float MinSize = 0.15f;
 
@@ -178,7 +170,7 @@ private void SetWorldScale(Vector3 globalScale)
             m_Transform.localScale = new Vector3(globalScale.x / lossyScale.x, globalScale.y / lossyScale.y, globalScale.z / lossyScale.z);
         }
 
-        private bool CanUpdateTransform()
+        public bool CanUpdateTransform()
         {
             return (IsClient && TransformAuthority == Authority.Client && IsOwner) || (IsServer && TransformAuthority == Authority.Server) || TransformAuthority == Authority.Shared;
         }
@@ -221,6 +213,11 @@ void SetupVar<T>(NetworkVariable<T> v, T initialValue, ref T oldVal)
             }
         }
 
+        public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
+        {
+            // TODO: handle parent NetworkObject change and potentially optimize pos/rot/scale replication?
+        }
+
         private NetworkVariable<T>.OnValueChangedDelegate GetOnValueChangedDelegate<T>(Action<T> assignCurrent)
         {
             return (old, current) =>

com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs

@@ -18,6 +18,7 @@ internal static class NetworkConstants
         internal const byte TIME_SYNC = 11;
         internal const byte NETWORK_VARIABLE_DELTA = 12;
         internal const byte ALL_CLIENTS_LOADED_SCENE = 14;
+        internal const byte PARENT_SYNC = 16;
         internal const byte UNNAMED_MESSAGE = 20;
         internal const byte DESTROY_OBJECTS = 21;
         internal const byte NAMED_MESSAGE = 22;
@@ -45,7 +46,7 @@ internal static class NetworkConstants
             "",
             "ALL_CLIENTS_SWITCH_SCENE_COMPLETED",
             "",
-            "", // 16
+            "PARENT_SYNC", // 16
             "",
             "",
             "",

com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs

@@ -342,6 +342,11 @@ public virtual void OnGainedOwnership() { }
         /// </summary>
         public virtual void OnLostOwnership() { }
 
+        /// <summary>
+        /// Gets called when the parent NetworkObject of this NetworkBehaviour's NetworkObject has changed
+        /// </summary>
+        public virtual void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject) { }
+
         private bool m_VarInit = false;
 
         private readonly List<HashSet<int>> m_ChannelMappedNetworkVariableIndexes = new List<HashSet<int>>();

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

@@ -322,11 +322,11 @@ private void OnValidate()
         }
 #endif
 
-        private void Init(bool server)
+        private void Initialize(bool server)
         {
             if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
             {
-                NetworkLog.LogInfo(nameof(Init));
+                NetworkLog.LogInfo(nameof(Initialize));
             }
 
             LocalClientId = 0;
@@ -337,6 +337,7 @@ private void Init(bool server)
             PendingClients.Clear();
             ConnectedClients.Clear();
             ConnectedClientsList.Clear();
+            NetworkObject.OrphanChildren.Clear();
 
             // Create spawn manager instance
             SpawnManager = new NetworkSpawnManager(this);
@@ -541,7 +542,7 @@ public SocketTasks StartServer()
                 }
             }
 
-            Init(true);
+            Initialize(true);
 
             var socketTasks = NetworkConfig.NetworkTransport.StartServer();
 
@@ -576,7 +577,7 @@ public SocketTasks StartClient()
                 return SocketTask.Fault.AsTasks();
             }
 
-            Init(false);
+            Initialize(false);
 
             var socketTasks = NetworkConfig.NetworkTransport.StartClient();
 
@@ -702,7 +703,7 @@ public SocketTasks StartHost()
                 }
             }
 
-            Init(true);
+            Initialize(true);
 
             var socketTasks = NetworkConfig.NetworkTransport.StartServer();
 
@@ -1330,6 +1331,29 @@ internal void HandleIncomingData(ulong clientId, NetworkChannel networkChannel,
                                 }
                             }
 
+                            break;
+                        }
+                    case NetworkConstants.PARENT_SYNC:
+                        {
+                            if (IsClient)
+                            {
+                                using (var reader = PooledNetworkReader.Get(messageStream))
+                                {
+                                    var networkObjectId = reader.ReadUInt64Packed();
+                                    var (isReparented, latestParent) = NetworkObject.ReadNetworkParenting(reader);
+                                    if (SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+                                    {
+                                        var networkObject = SpawnManager.SpawnedObjects[networkObjectId];
+                                        networkObject.SetNetworkParenting(isReparented, latestParent);
+                                        networkObject.ApplyNetworkParenting();
+                                    }
+                                    else if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                                    {
+                                        NetworkLog.LogWarning($"Read {nameof(NetworkConstants.PARENT_SYNC)} for {nameof(NetworkObject)} #{networkObjectId} but could not find it in the {nameof(SpawnManager.SpawnedObjects)}");
+                                    }
+                                }
+                            }
+
                             break;
                         }
                     default: