charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: simplify dirty bit cleaning

Browse Source
This commit is contained in:
Paul Pacheco 2019-08-11 06:47:02 -07:00
parent 37760adcc0
commit b6c0b86f3d
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Assets/Mirror/Runtime/NetworkIdentity.cs
View File

@ -699,13 +699,6 @@ internal bool OnSerializeAllSafely(bool initialState, NetworkWriter writer)
// serialize the data
if (LogFilter.Debug) Debug.Log("OnSerializeAllSafely: " + name + " -> " + comp.GetType() + " initial=" + initialState);
OnSerializeSafely(comp, writer, initialState);
// Clear dirty bits only if we are synchronizing data and not sending a spawn message.
// This preserves the behavior in HLAPI
if (!initialState)
{
comp.ClearAllDirtyBits();
}
}
}
@ -1143,29 +1136,37 @@ internal void Reset()
// invoked by NetworkServer during Update()
internal void MirrorUpdate()
{
if (observers == null || observers.Count == 0)
if (observers != null && observers.Count > 0)
{
// if we have no observers, then flush all objects
// (fixes https://github.com/vis2k/Mirror/issues/963)
foreach (NetworkBehaviour comp in networkBehavioursCache)
{
comp.ClearAllDirtyBits();
}
return;
}
NetworkWriter writer = NetworkWriterPool.GetWriter();
// serialize all the dirty components and send (if any were dirty)
if (OnSerializeAllSafely(false, writer))
{
// populate cached UpdateVarsMessage and send
varsMessage.netId = netId;
// segment to avoid reader allocations.
// (never null because of our above check)
varsMessage.payload = writer.ToArraySegment();
NetworkServer.SendToReady(this, varsMessage);
NetworkWriter writer = NetworkWriterPool.GetWriter();
// serialize all the dirty components and send (if any were dirty)
if (OnSerializeAllSafely(false, writer))
{
// populate cached UpdateVarsMessage and send
varsMessage.netId = netId;
// segment to avoid reader allocations.
// (never null because of our above check)
varsMessage.payload = writer.ToArraySegment();
NetworkServer.SendToReady(this, varsMessage);
// only clear bits if we sent something
ClearDirtyBits();
}
NetworkWriterPool.Recycle(writer);
}
else
{
ClearDirtyBits();
}
}
private void ClearDirtyBits()
{
foreach (NetworkBehaviour comp in NetworkBehaviours)
{
comp.ClearAllDirtyBits();
}
NetworkWriterPool.Recycle(writer);
}
}
}