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

Merge branch 'Tryibion-inject-scene-load-children'

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-25 09:24:16 +02:00
parent 148f03205f ad2d4a2626
commit dbd5566ee0
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Engine/Level/Level.cpp
View File

@@ -930,6 +930,9 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
// Fire event // Fire event
CallSceneEvent(SceneEventType::OnSceneLoading, scene, sceneId); CallSceneEvent(SceneEventType::OnSceneLoading, scene, sceneId);
// Get any injected children of the scene.
Array<Actor*> injectedSceneChildren = scene->Children;
// Loaded scene objects list // Loaded scene objects list
CollectionPoolCache<ActorsCache::SceneObjectsListType>::ScopeCache sceneObjects = ActorsCache::SceneObjectsListCache.Get(); CollectionPoolCache<ActorsCache::SceneObjectsListType>::ScopeCache sceneObjects = ActorsCache::SceneObjectsListCache.Get();
const int32 dataCount = (int32)data.Size(); const int32 dataCount = (int32)data.Size();
@@ -1031,6 +1034,20 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
// /\ all above this has to be done on multiple threads at once // /\ all above this has to be done on multiple threads at once
// \/ all below this has to be done on an any thread // \/ all below this has to be done on an any thread
// Add injected children of scene (via OnSceneLoading) into sceneObjects to be initialized
for (auto child : injectedSceneChildren)
{
Array<SceneObject*> injectedSceneObjects;
injectedSceneObjects.Add(child);
SceneQuery::GetAllSceneObjects(child, injectedSceneObjects);
for (auto o : injectedSceneObjects)
{
if (!o->IsRegistered())
o->RegisterObject();
sceneObjects->Add(o);
}
}
// Synchronize prefab instances (prefab may have objects removed or reordered so deserialized instances need to synchronize with it) // Synchronize prefab instances (prefab may have objects removed or reordered so deserialized instances need to synchronize with it)
// TODO: resave and force sync scenes during game cooking so this step could be skipped in game // TODO: resave and force sync scenes during game cooking so this step could be skipped in game
SceneObjectsFactory::SynchronizePrefabInstances(context, prefabSyncData); SceneObjectsFactory::SynchronizePrefabInstances(context, prefabSyncData);
@@ -1047,7 +1064,7 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
PROFILE_CPU_NAMED("Initialize"); PROFILE_CPU_NAMED("Initialize");
SceneObject** objects = sceneObjects->Get(); SceneObject** objects = sceneObjects->Get();
for (int32 i = 0; i < dataCount; i++) for (int32 i = 0; i < sceneObjects->Count(); i++)
{ {
SceneObject* obj = objects[i]; SceneObject* obj = objects[i];
if (obj) if (obj)