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

Cleanup

Browse Source
This commit is contained in:
Robin Rolf 2024-01-01 16:43:37 +01:00
parent fc2028f1f6
commit b900b2e00a
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Assets/Mirror/Components/InterestManagement/Match/MatchInterestManagement.cs
View File

@ -10,9 +10,6 @@ public class MatchInterestManagement : InterestManagement
readonly Dictionary<Guid, HashSet<NetworkMatch>> matchObjects =
new Dictionary<Guid, HashSet<NetworkMatch>>();
readonly Dictionary<NetworkIdentity, NetworkMatch> lastObjectMatch =
new Dictionary<NetworkIdentity, NetworkMatch>();
readonly HashSet<Guid> dirtyMatches = new HashSet<Guid>();
// LateUpdate so that all spawns/despawns/changes are done
@ -38,17 +35,14 @@ void RebuildMatchObservers(Guid matchId)
// called by NetworkMatch.matchId setter
[ServerCallback]
internal void OnMatchChanged(NetworkMatch networkMatch)
internal void OnMatchChanged(NetworkMatch networkMatch, Guid oldMatch)
{
// Mark new/old matches as dirty so they get rebuilt
UpdateDirtyMatches(networkMatch.matchId, networkMatch);
if (lastObjectMatch.TryGetValue(networkMatch.netIdentity, out NetworkMatch currentMatch))
{
// This object is in a new match so observers in the prior match
// and the new match need to rebuild their respective observers lists.
UpdateMatchObjects(networkMatch.netIdentity, networkMatch, currentMatch);
}
// This object is in a new match so observers in the prior match
// and the new match need to rebuild their respective observers lists.
UpdateMatchObjects(networkMatch, oldMatch);
}
[ServerCallback]
@ -62,22 +56,27 @@ void UpdateDirtyMatches(Guid newMatch, NetworkMatch currentMatch)
}
[ServerCallback]
void UpdateMatchObjects(NetworkIdentity netIdentity, NetworkMatch newMatch, NetworkMatch currentMatch)
void UpdateMatchObjects(NetworkMatch match, Guid oldMatch)
{
// Remove this object from the hashset of the match it just left
// Guid.Empty is never a valid matchId
if (currentMatch.matchId != Guid.Empty)
matchObjects[currentMatch.matchId].Remove(currentMatch);
// Set this to the new match this object just entered
lastObjectMatch[netIdentity] = newMatch;
if (oldMatch != Guid.Empty)
{
HashSet<NetworkMatch> matchSet = matchObjects[oldMatch];
matchSet.Remove(match);
// clean up empty entries in the dict
if (matchSet.Count == 0)
{
matchObjects.Remove(oldMatch);
}
}
// Make sure this new match is in the dictionary
if (!matchObjects.ContainsKey(newMatch.matchId))
matchObjects[newMatch.matchId] = new HashSet<NetworkMatch>();
if (!matchObjects.ContainsKey(match.matchId))
matchObjects[match.matchId] = new HashSet<NetworkMatch>();
// Add this object to the hashset of the new match
matchObjects[newMatch.matchId].Add(newMatch);
matchObjects[match.matchId].Add(match);
}
[ServerCallback]
@ -87,7 +86,6 @@ public override void OnSpawned(NetworkIdentity identity)
return;
Guid networkMatchId = networkMatch.matchId;
lastObjectMatch[identity] = networkMatch;
// Guid.Empty is never a valid matchId...do not add to matchObjects collection
if (networkMatchId == Guid.Empty)
@ -115,9 +113,8 @@ public override void OnDestroyed(NetworkIdentity identity)
// Multiple objects could be destroyed in same frame and we don't
// want to rebuild for each one...let LateUpdate do it once.
// We must add the current match to dirtyMatches for LateUpdate to rebuild it.
if (lastObjectMatch.TryGetValue(identity, out NetworkMatch currentMatch))
if (identity.TryGetComponent(out NetworkMatch currentMatch))
{
lastObjectMatch.Remove(identity);
if (currentMatch.matchId != Guid.Empty && matchObjects.TryGetValue(currentMatch.matchId, out HashSet<NetworkMatch> objects) && objects.Remove(currentMatch))
dirtyMatches.Add(currentMatch.matchId);
}

3
Assets/Mirror/Components/InterestManagement/Match/NetworkMatch.cs
View File

@ -23,10 +23,11 @@ public Guid matchId
if (_matchId == value)
return;
Guid oldMatch = _matchId;
_matchId = value;
if (NetworkServer.aoi is MatchInterestManagement matchInterestManagement)
matchInterestManagement.OnMatchChanged(this);
matchInterestManagement.OnMatchChanged(this, oldMatch);
}
}
}