Skip to content

feat: SyncedVar #298

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

Merged
TwoTenPvP merged 4 commits into from
Nov 22, 2019
Merged

feat: SyncedVar #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e11b4b
feat: Added SyncedVars
TwoTenPvP Nov 12, 2019
19d048e
feat: Added send rate to SyncedVar
TwoTenPvP Nov 22, 2019
86b4979
fix: SyncedVar loop running on client
TwoTenPvP Nov 22, 2019
271218d
docs: Added documnetation for SyncedVar
TwoTenPvP Nov 22, 2019
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
5 changes: 3 additions & 2 deletions MLAPI/Configuration/MLAPIConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MLAPI.Configuration
namespace MLAPI.Configuration
{
/// <summary>
/// A static class containing MLAPI constants
Expand Down Expand Up @@ -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 = {
Expand All @@ -56,7 +57,7 @@ internal static class MLAPIConstants
"MLAPI_UNNAMED_MESSAGE",
"MLAPI_DESTROY_OBJECTS",
"MLAPI_NAMED_MESSAGE",
"",
"MLAPI_SYNCED_VAR",
"",
"",
"",
Expand Down
539 changes: 424 additions & 115 deletions MLAPI/Core/NetworkedBehaviour.cs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 25 additions & 3 deletions MLAPI/Core/NetworkedObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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);
}
}
Expand Down
7 changes: 6 additions & 1 deletion MLAPI/Core/NetworkingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ private void OnEnable()
else
{
Singleton = this;
if (OnSingletonReady != null)
if (OnSingletonReady != null)
OnSingletonReady();
if (DontDestroy)
DontDestroyOnLoad(gameObject);
Expand Down Expand Up @@ -990,6 +990,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;
Expand Down Expand Up @@ -1226,6 +1229,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
if (NetworkConfig.EnableNetworkedVar)
{
observedObject.WriteNetworkedVarData(stream, clientId);
observedObject.WriteSyncedVarData(stream, clientId);
}
}

Expand Down Expand Up @@ -1286,6 +1290,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);
Expand Down
Loading