Skip to content

feat: snapshot spawn pre-requisite #1166

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
jeffreyrainy merged 8 commits into from
Sep 13, 2021
Merged

feat: snapshot spawn pre-requisite #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3185e2a
feat: snapshot. Enabling spawns via snapshot by default
jeffreyrainy Sep 9, 2021
5e2bff9
Merge remote-tracking branch 'origin/develop' into feature/enable-sna…
jeffreyrainy Sep 9, 2021
2526e78
Merge branch 'develop' into feature/enable-snapshot-spawn
jeffreyrainy Sep 9, 2021
e07b934
feat: snapshot. Fixing the snapshot spawns mechanism to not rely on S…
jeffreyrainy Sep 10, 2021
eff9a36
feat: snapshot. Removing the default on for snapshot spawns
jeffreyrainy Sep 10, 2021
6e1f2f6
Merge branch 'develop' into feature/enable-snapshot-spawn-pre
jeffreyrainy Sep 10, 2021
2caf865
Merge branch 'develop' into feature/enable-snapshot-spawn-pre
jeffreyrainy Sep 13, 2021
fcc060d
Merge branch 'develop' into feature/enable-snapshot-spawn-pre
jeffreyrainy Sep 13, 2021
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
1 change: 1 addition & 0 deletions com.unity.netcode.gameobjects/Runtime/Messaging/IInternalMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ internal interface IInternalMessageHandler
void HandleUnnamedMessage(ulong clientId, Stream stream);
void HandleNamedMessage(ulong clientId, Stream stream);
void HandleNetworkLog(ulong clientId, Stream stream);
void HandleSnapshot(ulong clientId, Stream messageStream);
}
}
4 changes: 2 additions & 2 deletions com.unity.netcode.gameobjects/Runtime/Messaging/InternalMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@ public void HandleNetworkLog(ulong clientId, Stream stream)
}
}

internal static void HandleSnapshot(ulong clientId, Stream messageStream)
public void HandleSnapshot(ulong clientId, Stream messageStream)
{
NetworkManager.Singleton.SnapshotSystem.ReadSnapshot(clientId, messageStream);
m_NetworkManager.SnapshotSystem.ReadSnapshot(clientId, messageStream);
}
}
}
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void ProcessMessage(in MessageFrameItem item)

break;
case MessageQueueContainer.MessageType.SnapshotData:
InternalMessageHandler.HandleSnapshot(item.NetworkId, item.NetworkBuffer);
m_NetworkManager.MessageHandler.HandleSnapshot(item.NetworkId, item.NetworkBuffer);
break;
case MessageQueueContainer.MessageType.NetworkVariableDelta:
m_NetworkManager.MessageHandler.HandleNetworkVariableDelta(item.NetworkId, item.NetworkBuffer);
Expand Down
9 changes: 9 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ public void HandleNetworkVariableDelta(ulong clientId, Stream stream)
m_HandleNetworkVariableDelta.End();
}

public void HandleSnapshot(ulong clientId, Stream stream)
{
m_HandleNetworkVariableDelta.Begin();

m_MessageHandler.HandleSnapshot(clientId, stream);

m_HandleNetworkVariableDelta.End();
}

public void MessageReceiveQueueItem(ulong clientId, Stream stream, float receiveTime, MessageQueueContainer.MessageType messageType)
{
switch (messageType)
Expand Down
2 changes: 2 additions & 0 deletions com.unity.netcode.gameobjects/Tests/Editor/DummyMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public void MessageReceiveQueueItem(ulong clientId, Stream stream, float receive

public void HandleNetworkLog(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleNetworkLog));

public void HandleSnapshot(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleSnapshot));

public void HandleAllClientsSwitchSceneCompleted(ulong clientId, Stream stream) => VerifyCalled(nameof(HandleAllClientsSwitchSceneCompleted));

private void VerifyCalled(string method)
Expand Down