GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SImplify capacity presetting for Dictionary to handle memory slack scale internally as suers care about items count only

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-16 17:42:01 +01:00
parent 6111f67e33
commit 1497acef58
9 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Engine/Level/Prefabs/Prefab.Apply.cpp
View File

@@ -256,7 +256,7 @@ void PrefabInstanceData::SerializePrefabInstances(PrefabInstancesData& prefabIns
}
// Build acceleration table
instance.PrefabInstanceIdToDataIndex.EnsureCapacity(sceneObjects->Count() * 4);
instance.PrefabInstanceIdToDataIndex.EnsureCapacity(sceneObjects->Count());
for (int32 i = 0; i < sceneObjects->Count(); i++)
{
SceneObject* obj = sceneObjects.Value->At(i);
@@ -296,7 +296,7 @@ bool PrefabInstanceData::SynchronizePrefabInstances(PrefabInstancesData& prefabI
SceneQuery::GetAllSerializableSceneObjects(instance.TargetActor, *sceneObjects.Value);
int32 existingObjectsCount = sceneObjects->Count();
modifier->IdsMapping.EnsureCapacity((existingObjectsCount + newPrefabObjectIds.Count()) * 4);
modifier->IdsMapping.EnsureCapacity((existingObjectsCount + newPrefabObjectIds.Count()));
// Map prefab objects to the prefab instance objects
for (int32 i = 0; i < existingObjectsCount; i++)
@@ -561,7 +561,7 @@ bool PrefabInstanceData::SynchronizePrefabInstances(PrefabInstancesData& prefabI
// Build cache data
IdToDataLookupType prefabObjectIdToDiffData;
prefabObjectIdToDiffData.EnsureCapacity(defaultInstanceData.Size() * 3);
prefabObjectIdToDiffData.EnsureCapacity(defaultInstanceData.Size());
for (int32 i = 0; i < sceneObjects->Count(); i++)
{
SceneObject* obj = sceneObjects.Value->At(i);
@@ -760,8 +760,8 @@ bool Prefab::ApplyAllInternal(Actor* targetActor, bool linkTargetActorObjectToPr
rapidjson_flax::Document diffDataDocument;
Dictionary<Guid, int32> diffPrefabObjectIdToDataIndex; // Maps Prefab Object Id -> Actor Data index in diffDataDocument json array (for actors/scripts to modify prefab)
Dictionary<Guid, int32> newPrefabInstanceIdToDataIndex; // Maps Prefab Instance Id -> Actor Data index in diffDataDocument json array (for new actors/scripts to add to prefab), maps to -1 for scripts
diffPrefabObjectIdToDataIndex.EnsureCapacity(ObjectsCount * 4);
newPrefabInstanceIdToDataIndex.EnsureCapacity(ObjectsCount * 4);
diffPrefabObjectIdToDataIndex.EnsureCapacity(ObjectsCount);
newPrefabInstanceIdToDataIndex.EnsureCapacity(ObjectsCount);
{
// Parse json to DOM document
{
@@ -813,7 +813,7 @@ bool Prefab::ApplyAllInternal(Actor* targetActor, bool linkTargetActorObjectToPr
// Change object ids to match the prefab objects ids (helps with linking references in scripts)
Dictionary<Guid, Guid> objectInstanceIdToPrefabObjectId;
objectInstanceIdToPrefabObjectId.EnsureCapacity(ObjectsCount * 3);
objectInstanceIdToPrefabObjectId.EnsureCapacity(ObjectsCount);
i = 0;
for (auto it = array.Begin(); it != array.End(); ++it, i++)
{
@@ -843,7 +843,7 @@ bool Prefab::ApplyAllInternal(Actor* targetActor, bool linkTargetActorObjectToPr
Scripting::ObjectsLookupIdMapping.Set(&modifier.Value->IdsMapping);
// Generate new IDs for the added objects (objects in prefab has to have a unique Ids, other than the targetActor instance objects to prevent Id collisions)
newPrefabInstanceIdToPrefabObjectId.EnsureCapacity(newPrefabInstanceIdToDataIndex.Count() * 4);
newPrefabInstanceIdToPrefabObjectId.EnsureCapacity(newPrefabInstanceIdToDataIndex.Count());
for (auto i = newPrefabInstanceIdToDataIndex.Begin(); i.IsNotEnd(); ++i)
{
const auto prefabObjectId = Guid::New();
@@ -1175,9 +1175,9 @@ bool Prefab::UpdateInternal(const Array<SceneObject*>& defaultInstanceObjects, r
const int32 objectsCount = Data->GetArray().Size();
if (objectsCount <= 0)
return true;
ObjectsIds.EnsureCapacity(objectsCount * 2);
ObjectsIds.EnsureCapacity(objectsCount);
NestedPrefabs.EnsureCapacity(objectsCount);
ObjectsDataCache.EnsureCapacity(objectsCount * 3);
ObjectsDataCache.EnsureCapacity(objectsCount);
const auto& data = *Data;
for (int32 objectIndex = 0; objectIndex < objectsCount; objectIndex++)
{
@@ -1197,7 +1197,7 @@ bool Prefab::UpdateInternal(const Array<SceneObject*>& defaultInstanceObjects, r
{
if (prefabId == _id)
{
LOG(Error, "Circural reference in prefab.");
LOG(Error, "Circular reference in prefab.");
continue;
}

6
Source/Engine/Level/Prefabs/Prefab.cpp
View File

@@ -128,8 +128,8 @@ Asset::LoadResult Prefab::loadAsset()
}
// Allocate memory for objects
ObjectsIds.EnsureCapacity(objectsCount * 2);
ObjectsDataCache.EnsureCapacity(objectsCount * 3);
ObjectsIds.EnsureCapacity(objectsCount);
ObjectsDataCache.EnsureCapacity(objectsCount);
// Find serialized object ids (actors and scripts), they are used later for IDs mapping on prefab spawning via PrefabManager
const auto& data = *Data;
@@ -157,7 +157,7 @@ Asset::LoadResult Prefab::loadAsset()
{
if (prefabId == _id)
{
LOG(Error, "Circural reference in prefab.");
LOG(Error, "Circular reference in prefab.");
return LoadResult::InvalidData;
}

4
Source/Engine/Level/Prefabs/PrefabManager.cpp
View File

@@ -111,8 +111,8 @@ Actor* PrefabManager::SpawnPrefab(Prefab* prefab, const Transform& transform, Ac
sceneObjects->Resize(dataCount);
CollectionPoolCache<ISerializeModifier, Cache::ISerializeModifierClearCallback>::ScopeCache modifier = Cache::ISerializeModifier.Get();
modifier->EngineBuild = prefab->DataEngineBuild;
modifier->IdsMapping.EnsureCapacity(prefab->ObjectsIds.Count() * 4);
for (int32 i = 0; i < prefab->ObjectsIds.Count(); i++)
modifier->IdsMapping.EnsureCapacity(prefab->ObjectsIds.Count());
{
modifier->IdsMapping.Add(prefab->ObjectsIds[i], Guid::New());
}
@@ -352,7 +352,7 @@ bool PrefabManager::CreatePrefab(Actor* targetActor, const StringView& outputPat
// Randomize the objects ids (prevent overlapping of the prefab instance objects ids and the prefab objects ids)
Dictionary<Guid, Guid> objectInstanceIdToPrefabObjectId;
objectInstanceIdToPrefabObjectId.EnsureCapacity(sceneObjects->Count() * 3);
objectInstanceIdToPrefabObjectId.EnsureCapacity(sceneObjects->Count());
if (targetActor->HasParent())
{
// Unlink from parent actor