Skip to content

Cache deleting identities Approach #2 #57

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

Draft
ashtonmeuser wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Cache deleting identities Approach #2 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f724ff6
Cache deleting identities
ashtonmeuser Jun 12, 2026
ac303fc
Always use deleting cache for identity resolution
ashtonmeuser Jun 12, 2026
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
2 changes: 1 addition & 1 deletion Assets/PurrDiction/Runtime/Core/PredictedComponentIDExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public static bool TryGetIdentity(this PredictedComponentID? id, PredictionManag
return id?.TryGetIdentity(manager, out identity) ?? false;
}
}
}
}
110 changes: 82 additions & 28 deletions Assets/PurrDiction/Runtime/Core/PredictionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,22 @@ public void UnregisterPooledInstance(GameObject go)
}

readonly Dictionary<PredictedComponentID, PredictedIdentity> _instanceMap = new ();
readonly Dictionary<PredictedComponentID, PredictedIdentity> _deletingInstanceMap = new ();

public bool TryGetIdentity(PredictedComponentID id, out PredictedIdentity instance)
{
return _instanceMap.TryGetValue(id, out instance);
if (_instanceMap.TryGetValue(id, out instance))
return true;

return _deletingInstanceMap.TryGetValue(id, out instance);
}

public PredictedIdentity GetIdentity(PredictedComponentID id)
{
return _instanceMap.GetValueOrDefault(id);
if (_instanceMap.TryGetValue(id, out var identity))
return identity;

return _deletingInstanceMap.GetValueOrDefault(id);
}

private void RegisterInstance(PredictedIdentity system, PredictedObjectID objectId, uint componentId, PlayerID? owner)
Expand Down Expand Up @@ -679,8 +686,7 @@ private void OnPreTick()
}
}

for (var i = 0; i < _systemsCount; i++)
_systems[i].PostSimulate();
PostSimulateAll();

if (cachedIsServer)
FinalizeTickOnServer(cachedIsClient);
Expand Down Expand Up @@ -1176,8 +1182,7 @@ private void SimulateFrameInPlace(ulong verifiedTick)
lateSimulateMarker.Dispose();
}

for (var i = 0; i < _systemsCount; i++)
_systems[i].PostSimulate();
PostSimulateAll();
for (var j = 0; j < _systemsCount; j++)
_systems[j].GetLatestUnityState();

Expand Down Expand Up @@ -1258,8 +1263,7 @@ private void SimulateFrame(ulong verifiedTick, bool saveState)
}
}

for (var i = 0; i < _systemsCount; i++)
_systems[i].PostSimulate();
PostSimulateAll();

for (var j = 0; j < _systemsCount; j++)
_systems[j].GetLatestUnityState();
Expand Down Expand Up @@ -1502,34 +1506,84 @@ internal GameObject InternalCreate(GameObject prefab, Vector3 position, Quaterni

internal void InternalDelete(PackedInt prefabId, GameObject instance)
{
int pid = prefabId;

if (!_predictedPrefabs || pid < 0 || pid >= _predictedPrefabs.prefabs.Count)
var deletingIds = BeginDeletingInstance(instance);
try
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
return;
}
int pid = prefabId;

var prefabsInfo = _predictedPrefabs.prefabs[pid];
if (!_predictedPrefabs || pid < 0 || pid >= _predictedPrefabs.prefabs.Count)
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
return;
}

if (!prefabsInfo.pooled)
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
return;
}
var prefabsInfo = _predictedPrefabs.prefabs[pid];

if (!prefabsInfo.pooled)
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
return;
}

if (_pools != null && _pools.TryGetPool(prefabsInfo.prefab, out var pool))
if (_pools != null && _pools.TryGetPool(prefabsInfo.prefab, out var pool))
{
UnregisterPooledInstance(instance);
pool.Delete(instance);
}
else
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
}
}
finally
{
UnregisterPooledInstance(instance);
pool.Delete(instance);
if (!isSimulating)
EndDeletingInstance(deletingIds);
}
else
}

private List<PredictedComponentID> BeginDeletingInstance(GameObject instance)
{
var deletingIds = new List<PredictedComponentID>();

if (!instance)
return deletingIds;

var identities = ListPool<PredictedIdentity>.Instantiate();
instance.GetComponentsInChildren(true, identities);

for (int i = 0; i < identities.Count; i++)
{
UnregisterInstance(instance, false, true);
UnityProxy.DestroyImmediateDirectly(instance);
var identity = identities[i];
var id = identity.id;
_deletingInstanceMap[id] = identity;
deletingIds.Add(id);
}

ListPool<PredictedIdentity>.Destroy(identities);
return deletingIds;
}

private void EndDeletingInstance(List<PredictedComponentID> deletingIds)
{
for (int i = 0; i < deletingIds.Count; i++)
_deletingInstanceMap.Remove(deletingIds[i]);
}

private void ClearDeletingInstanceMap()
{
_deletingInstanceMap.Clear();
}

private void PostSimulateAll()
{
for (var i = 0; i < _systemsCount; i++)
_systems[i].PostSimulate();

ClearDeletingInstanceMap();
}

public void SetOwnership(PredictedObjectID? root, PlayerID? player)
Expand Down
Loading