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

Add support for allocator type in Dictionary

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-08 00:33:51 +02:00
parent f5e5686853
commit 4765e1af12
17 changed files with 170 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Level/Actor.h
View File

@@ -868,7 +868,7 @@ public:
/// <param name="data">The input data.</param>
/// <param name="idsMapping">The serialized objects Ids mapping. Can be used to convert the spawned objects ids and references to them.</param>
/// <returns>The output actors.</returns>
API_FUNCTION() static Array<Actor*> FromBytes(const Span<byte>& data, const Dictionary<Guid, Guid>& idsMapping);
API_FUNCTION() static Array<Actor*> FromBytes(const Span<byte>& data, const Dictionary<Guid, Guid, HeapAllocation>& idsMapping);
/// <summary>
/// Tries the get serialized objects ids from the raw bytes.

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

@@ -83,7 +83,7 @@ DECLARE_SCRIPTING_TYPE_NO_SPAWN(PrefabManager);
/// <param name="objectsCache">The options output objects cache that can be filled with prefab object id mapping to deserialized object (actor or script).</param>
/// <param name="withSynchronization">True if perform prefab changes synchronization for the spawned objects. It will check if need to add new objects due to nested prefab modifications.</param>
/// <returns>The created actor (root) or null if failed.</returns>
static Actor* SpawnPrefab(Prefab* prefab, Actor* parent, Dictionary<Guid, const void*>* objectsCache, bool withSynchronization = false);
static Actor* SpawnPrefab(Prefab* prefab, Actor* parent, Dictionary<Guid, const void*, HeapAllocation>* objectsCache, bool withSynchronization = false);
#if USE_EDITOR
@@ -118,7 +118,7 @@ DECLARE_SCRIPTING_TYPE_NO_SPAWN(PrefabManager);
/// <summary>
/// The prefabs references mapping table. Maps the prefab asset id to the collection of the root actors of the prefab instances.
/// </summary>
static Dictionary<Guid, Array<Actor*, HeapAllocation>> PrefabsReferences;
static Dictionary<Guid, Array<Actor*, HeapAllocation>, HeapAllocation> PrefabsReferences;
/// <summary>
/// Locks PrefabsReferences to be used in a multi threaded environment.

2
Source/Engine/Level/SceneObject.h
View File

@@ -39,7 +39,7 @@ public:
/// <summary>
/// The actors collection lookup type (id -> actor).
/// </summary>
typedef Dictionary<Guid, Actor*> ActorsLookup;
typedef Dictionary<Guid, Actor*, HeapAllocation> ActorsLookup;
#define DECLARE_SCENE_OBJECT(type) \
DECLARE_SCRIPTING_TYPE(type)

2
Source/Engine/Level/SceneObjectsFactory.h
View File

@@ -11,7 +11,7 @@ class SceneObjectsFactory
{
public:
typedef Dictionary<Actor*, const rapidjson_flax::Value*> ActorToRemovedObjectsDataLookup;
typedef Dictionary<Actor*, const rapidjson_flax::Value*, HeapAllocation> ActorToRemovedObjectsDataLookup;
public: