Merge pull request #298 from MidLevel/syncedvar

feat: SyncedVar

Author: TwoTenPvP

MLAPI/Configuration/MLAPIConstants.cs

@@ -1,4 +1,4 @@
-namespace MLAPI.Configuration
+namespace MLAPI.Configuration
 {
     /// <summary>
     /// A static class containing MLAPI constants
@@ -30,6 +30,7 @@ internal static class MLAPIConstants
         internal const byte MLAPI_UNNAMED_MESSAGE = 20;
         internal const byte MLAPI_DESTROY_OBJECTS = 21;
         internal const byte MLAPI_NAMED_MESSAGE = 22;
+        internal const byte MLAPI_SYNCED_VAR = 23;
         internal const byte INVALID = 32;
 
         internal static readonly string[] MESSAGE_NAMES = {
@@ -56,7 +57,7 @@ internal static class MLAPIConstants
             "MLAPI_UNNAMED_MESSAGE",
             "MLAPI_DESTROY_OBJECTS",
             "MLAPI_NAMED_MESSAGE",
-            "",
+            "MLAPI_SYNCED_VAR",
             "",
             "",
             "",

MLAPI/Core/NetworkedBehaviour.cs

@@ -546,21 +546,43 @@ internal static void NetworkedBehaviourUpdate()
             for (int i = 0; i < amountToProcess; i++)
             {
                 if (_lastProcessedObject >= SpawnManager.SpawnedObjectsList.Count)
+                {
                     _lastProcessedObject = 0;
+                }
 
                 // Sync all vars
                 for (int j = 0; j < SpawnManager.SpawnedObjectsList[_lastProcessedObject].childNetworkedBehaviours.Count; j++)
-                    SpawnManager.SpawnedObjectsList[_lastProcessedObject].childNetworkedBehaviours[j].NetworkedVarUpdate();
+                {
+                    SpawnManager.SpawnedObjectsList[_lastProcessedObject].childNetworkedBehaviours[j].VarUpdate();
+                }
 
                 _lastProcessedObject++;
             }
         }
 
+        internal void WriteSyncedVarData(Stream stream, ulong clientId)
+        {
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
+            {
+                childNetworkedBehaviours[i].InitializeVars();
+                NetworkedBehaviour.WriteSyncedVarData(childNetworkedBehaviours[i].syncedVars, stream, clientId);
+            }
+        }
+
+        internal void SetSyncedVarData(Stream stream)
+        {
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
+            {
+                childNetworkedBehaviours[i].InitializeVars();
+                NetworkedBehaviour.SetSyncedVarData(childNetworkedBehaviours[i].syncedVars, stream);
+            }
+        }
+
         internal void WriteNetworkedVarData(Stream stream, ulong clientId)
         {
             for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                childNetworkedBehaviours[i].NetworkedVarInit();
+                childNetworkedBehaviours[i].InitializeVars();
                 NetworkedBehaviour.WriteNetworkedVarData(childNetworkedBehaviours[i].networkedVarFields, stream, clientId);
             }
         }
@@ -569,7 +591,7 @@ internal void SetNetworkedVarData(Stream stream)
         {
             for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                childNetworkedBehaviours[i].NetworkedVarInit();
+                childNetworkedBehaviours[i].InitializeVars();
                 NetworkedBehaviour.SetNetworkedVarData(childNetworkedBehaviours[i].networkedVarFields, stream);
             }
         }

MLAPI/Core/NetworkedObject.cs

@@ -593,7 +593,7 @@ private void OnEnable()
             else
             {
                 Singleton = this;
-                if (OnSingletonReady != null) 
+                if (OnSingletonReady != null)
                     OnSingletonReady();
                 if (DontDestroy)
                     DontDestroyOnLoad(gameObject);
@@ -992,6 +992,9 @@ private void HandleIncomingData(ulong clientId, string channelName, ArraySegment
                     case MLAPIConstants.MLAPI_CLIENT_SWITCH_SCENE_COMPLETED:
                         if (IsServer && NetworkConfig.EnableSceneManagement) InternalMessageHandler.HandleClientSwitchSceneCompleted(clientId, messageStream);
                         break;
+                    case MLAPIConstants.MLAPI_SYNCED_VAR:
+                        if (IsClient) InternalMessageHandler.HandleSyncedVar(clientId, messageStream);
+                        break;
                     default:
                         if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Read unrecognized messageType " + messageType);
                         break;
@@ -1228,6 +1231,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
                             if (NetworkConfig.EnableNetworkedVar)
                             {
                                 observedObject.WriteNetworkedVarData(stream, clientId);
+                                observedObject.WriteSyncedVarData(stream, clientId);
                             }
                         }
 
@@ -1288,6 +1292,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
                             if (NetworkConfig.EnableNetworkedVar)
                             {
                                 ConnectedClients[clientId].PlayerObject.WriteNetworkedVarData(stream, clientPair.Key);
+                                ConnectedClients[clientId].PlayerObject.WriteSyncedVarData(stream, clientPair.Key);
                             }
 
                             InternalMessageSender.Send(clientPair.Key, MLAPIConstants.MLAPI_ADD_OBJECT, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, null);