Updated scene to do more multi threading

tippesi · Jan 4, 2025 · bb887b9 · bb887b9
1 parent 4fd12f7
commit bb887b9
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 111 deletions.
diff --git a/src/demo/App.cpp b/src/demo/App.cpp
@@ -276,8 +276,7 @@ void App::Update(float deltaTime) {
 
     }
 
-    scene->Timestep(deltaTime);
-    scene->Update();
+    scene->Update(deltaTime);
 
     CheckLoadScene();
 
@@ -913,8 +912,7 @@ bool App::LoadScene() {
     }
     else if (sceneSelection == FOREST) {
         auto otherScene = Atlas::Loader::ModelImporter::ImportScene("forest/forest.gltf", -glm::vec3(2048.0f), glm::vec3(2048.0f), 5, false, false, false, 2048);
-        otherScene->Timestep(1.0f);
-        otherScene->Update();
+        otherScene->Update(1.0f);
 
         CopyActors(otherScene);
 
@@ -931,8 +929,7 @@ bool App::LoadScene() {
     }
     else if (sceneSelection == EMERALDSQUARE) {
         auto otherScene = Atlas::Loader::ModelImporter::ImportScene("emeraldsquare/square.gltf", -glm::vec3(2048.0f), glm::vec3(2048.0f), 5, false, false, false, 2048);
-        otherScene->Timestep(1.0f);
-        otherScene->Update();
+        otherScene->Update(1.0f);
 
         CopyActors(otherScene);
 
@@ -1045,8 +1042,7 @@ bool App::LoadScene() {
         }
     }
 
-    scene->Timestep(1.0f);
-    scene->Update();
+    scene->Update(1.0f);
 
     Atlas::Clock::ResetAverage();
 

diff --git a/src/editor/DataCreator.cpp b/src/editor/DataCreator.cpp
@@ -122,8 +122,7 @@ namespace Atlas::Editor {
         scene->rayTracingWorld = CreateRef<RayTracing::RayTracingWorld>();
         scene->postProcessing.fsr2 = true;
 
-        scene->Timestep(1.0f);
-        scene->Update();
+        scene->Update(1.0f);
 
         min = glm::vec3(std::numeric_limits<float>::max());
         max = glm::vec3(-std::numeric_limits<float>::max());

diff --git a/src/editor/ui/panels/SceneHierarchyPanel.cpp b/src/editor/ui/panels/SceneHierarchyPanel.cpp
@@ -236,8 +236,8 @@ namespace Atlas::Editor::UI {
             }
 
             if (ImGui::BeginDragDropSource()) {
-                ImGui::SetDragDropPayload(typeid(Scene::Entity).name(), nullptr, 0);
-                ImGui::Text("Drag to other entity in hierarchy");
+                ImGui::SetDragDropPayload(typeid(Scene::Entity).name(), &entity, sizeof(Scene::Entity));
+                ImGui::Text("Drag to other entity in hierarchy or into content browser to create a prefab");
 
                 ImGui::EndDragDropSource();
             }

diff --git a/src/editor/ui/windows/SceneWindow.cpp b/src/editor/ui/windows/SceneWindow.cpp
@@ -44,8 +44,7 @@ namespace Atlas::Editor::UI {
 
         // If we're playing we can update here since we don't expect values to change from the UI side
         if (isPlaying) {
-            scene->Timestep(deltaTime);
-            scene->Update();
+            scene->Update(deltaTime);
         }
         else {
             auto& camera = cameraEntity.GetComponent<CameraComponent>();
@@ -184,8 +183,7 @@ namespace Atlas::Editor::UI {
             // Path tracing needs history while ray tracing
             scene->rayTracingWorld->includeObjectHistory = Singletons::config->pathTrace;
 
-            scene->Timestep(Clock::GetDelta());
-            scene->Update();
+            scene->Update(Clock::GetDelta());
 
             // Restore all previous camera main values
             for (auto entity : cameraSubset) {

diff --git a/src/engine/raytracing/RayTracingWorld.cpp b/src/engine/raytracing/RayTracingWorld.cpp
@@ -131,8 +131,6 @@ namespace Atlas {
 
             UpdateMaterials();
 
-            JobSystem::Wait(renderState->mainCameraSignal, JobPriority::High);
-
             vec3 cameraLocation;
             auto hasCamera = scene->HasMainCamera();
             if (hasCamera) {

diff --git a/src/engine/scene/Scene.cpp b/src/engine/scene/Scene.cpp
@@ -88,7 +88,7 @@ namespace Atlas {
 
         }
 
-        void Scene::Timestep(float deltaTime) {
+        void Scene::Update(float deltaTime) {
 
             this->deltaTime = deltaTime;
 
@@ -145,11 +145,16 @@ namespace Atlas {
             if (HasMainCamera()) {
                 auto& mainCamera = mainCameraEntity.GetComponent<CameraComponent>();
 
-                if (terrain.IsLoaded())
-                    terrain->Update(mainCamera);
+                if (terrain.IsLoaded()) {
+                    JobSystem::Execute(jobGroup, [&](JobData&) {
+                        terrain->Update(mainCamera);
+                    });
+                }
 
                 if (ocean) {
-                    ocean->Update(mainCamera, deltaTime);
+                    JobSystem::Execute(jobGroup, [&](JobData&) {
+                        ocean->Update(mainCamera, deltaTime);
+                    });
                 }
             }            
 
@@ -344,38 +349,43 @@ namespace Atlas {
                 meshComponent.inserted = true;
             }
 
-            // After everything we need to reset transform component changed and prepare the updated for next frame
-            JobSystem::ParallelFor(jobGroup, int32_t(transformComponentPool.GetCount()), 8, [&](JobData&, int32_t idx) {
-                auto& transformComponent = transformComponentPool.GetByIndex(idx);
+            // Don't do anything in parallel here, we don't expect to have many cameras
+            mainCameraEntity = Entity();
+            auto cameraSubset = entityManager.GetSubset<CameraComponent>();
+            // Attempt to find a main camera
+            for (auto entity : cameraSubset) {
+                auto& camera = cameraSubset.Get(entity);
 
-                if (transformComponent.updated) {
-                    transformComponent.changed = false;
-                    transformComponent.updated = false;
+                mat4 transformMatrix = mat4(1.0f);
+                auto transform = entityManager.TryGet<TransformComponent>(entity);
+                if (transform) {
+                    camera.parentTransform = transform->globalMatrix;
+                    transformMatrix = transform->globalMatrix;
                 }
-                });
 
-            // After everything we need to reset transform component changed and prepare the updated for next frame
-            JobSystem::ParallelFor(jobGroup, int32_t(hierarchyComponentPool.GetCount()), 4, [&](JobData&, int32_t idx) {
-                auto& hierarchyComponent = hierarchyComponentPool.GetByIndex(idx);
-
-                hierarchyComponent.updated = false;
-                });
+                camera.Update(transformMatrix);
 
-            JobSystem::Wait(jobGroup);
+                if (camera.isMain && !mainCameraEntity.IsValid()) {
+                    mainCameraEntity = { entity, &entityManager };
+                }
+            }
 
-            auto lightSubset = entityManager.GetSubset<LightComponent>();
-            for (auto entity : lightSubset) {
-                auto& lightComponent = lightSubset.Get(entity);
+            JobGroup lightJobGroup {JobPriority::High};
+            auto lightComponentPool = entityManager.GetPool<LightComponent>();
+            JobSystem::ParallelFor(lightJobGroup, int32_t(lightComponentPool.GetCount()), 4, [&](JobData&, int32_t idx) {
+                auto& lightComponent = lightComponentPool.GetByIndex(idx);
+                auto entity = lightComponentPool[idx];
 
+                // This will lead to threading issues if there are several main lights (which there shouldn't be!)
                 if (lightComponent.isMain && lightComponent.type == LightType::DirectionalLight)
                     mainLightEntity = Entity(entity, &entityManager);
 
                 auto transformComponent = transformComponentPool.TryGet(entity);
 
                 lightComponent.Update(transformComponent);
-            }
+                });
 
-            renderState.mainCameraSignal.Reset();
+            JobSystem::Wait(lightJobGroup);
 
 #ifdef AE_BINDLESS
             auto rayTracingSubset = GetSubset<MeshComponent, TransformComponent>();
@@ -396,85 +406,66 @@ namespace Atlas {
                 });          
 #endif
 
-            // Everything below assumes that entities themselves have a transform
-            // Without it they won't be transformed when they are in a hierarchy
-            auto cameraSubset = entityManager.GetSubset<CameraComponent, TransformComponent>();
-            for (auto entity : cameraSubset) {
-                const auto& [cameraComponent, transformComponent] = cameraSubset.Get(entity);
-
-                cameraComponent.parentTransform = transformComponent.globalMatrix;
-            }
-
-            auto textSubset = entityManager.GetSubset<TextComponent, TransformComponent>();
-            for (auto entity : textSubset) {
-                const auto& [textComponent, transformComponent] = textSubset.Get(entity);
-
-                textComponent.Update(transformComponent);
-            }
-
-            firstTimestep = false;
-
-        }
-
-        void Scene::Update() {
-
-            mainCameraEntity = Entity();
+            if (HasMainCamera()) {
+                auto& mainCamera = GetMainCamera();
 
-            auto cameraSubset = entityManager.GetSubset<CameraComponent>();
+                JobSystem::ParallelFor(lightJobGroup, int32_t(lightComponentPool.GetCount()), 4, [&](JobData&, int32_t idx) {
+                    auto& lightComponent = lightComponentPool.GetByIndex(idx);
+
+                    lightComponent.Update(mainCamera);
+                    });
 
-            // Attempt to find a main camera
-            for (auto entity : cameraSubset) {
-                auto& camera = cameraSubset.Get(entity);
+                auto audioSubset = entityManager.GetSubset<AudioComponent, TransformComponent>();
+                for (auto entity : audioSubset) {
+                    const auto& [audioComponent, transformComponent] = audioSubset.Get(entity);
 
-                mat4 transformMatrix = mat4(1.0f);
-                auto transform = entityManager.TryGet<TransformComponent>(entity);
-                if (transform) {
-                    transformMatrix = transform->globalMatrix;
+                    audioComponent.Update(deltaTime, transformComponent, mainCamera.GetLocation(),
+                        mainCamera.GetLastLocation(), mainCamera.right);
                 }
 
-                camera.Update(transformMatrix);
+                auto audioVolumeSubset = entityManager.GetSubset<AudioVolumeComponent, TransformComponent>();
+                for (auto entity : audioVolumeSubset) {
+                    const auto& [audioComponent, transformComponent] = audioVolumeSubset.Get(entity);
 
-                if (camera.isMain && !mainCameraEntity.IsValid()) {
-                    mainCameraEntity = { entity, &entityManager };
+                    audioComponent.Update(transformComponent, mainCamera.GetLocation());
                 }
-            }             
+            }
 
-            renderState.mainCameraSignal.Release();
+            // After everything we need to reset transform component changed and prepare the updated for next frame
+            JobSystem::ParallelFor(jobGroup, int32_t(transformComponentPool.GetCount()), 8, [&](JobData&, int32_t idx) {
+                auto& transformComponent = transformComponentPool.GetByIndex(idx);
 
-            AE_ASSERT(mainCameraEntity.IsValid() && "Couldn't find main camera component");
+                if (transformComponent.updated) {
+                    transformComponent.changed = false;
+                    transformComponent.updated = false;
+                }
+                });
 
-            if (!mainCameraEntity.IsValid())
-                return;
+            // After everything we need to reset transform component changed and prepare the updated for next frame
+            JobSystem::ParallelFor(jobGroup, int32_t(hierarchyComponentPool.GetCount()), 4, [&](JobData&, int32_t idx) {
+                auto& hierarchyComponent = hierarchyComponentPool.GetByIndex(idx);
 
-            auto& mainCamera = mainCameraEntity.GetComponent<CameraComponent>();
+                hierarchyComponent.updated = false;
+                });
 
-            auto audioSubset = entityManager.GetSubset<AudioComponent, TransformComponent>();
-            for (auto entity : audioSubset) {
-                const auto& [audioComponent, transformComponent] = audioSubset.Get(entity);
+            JobSystem::Wait(lightJobGroup);
 
-                audioComponent.Update(deltaTime, transformComponent, mainCamera.GetLocation(),
-                    mainCamera.GetLastLocation(), mainCamera.right);
-            }
+            renderState.FillRenderList();
+            renderState.CullAndSortLights();
 
-            auto audioVolumeSubset = entityManager.GetSubset<AudioVolumeComponent, TransformComponent>();
-            for (auto entity : audioVolumeSubset) {
-                const auto& [audioComponent, transformComponent] = audioVolumeSubset.Get(entity);
+            auto textSubset = entityManager.GetSubset<TextComponent, TransformComponent>();
+            for (auto entity : textSubset) {
+                const auto& [textComponent, transformComponent] = textSubset.Get(entity);
 
-                audioComponent.Update(transformComponent, mainCamera.GetLocation());
+                textComponent.Update(transformComponent);
             }
 
-            auto lightSubset = entityManager.GetSubset<LightComponent>();
-            for (auto entity : lightSubset) {
-                auto& lightComponent = lightSubset.Get(entity);
-
-                lightComponent.Update(mainCamera);
-            }
+            firstTimestep = false;
 
-            renderState.FillRenderList();
-            renderState.CullAndSortLights();
+            JobSystem::Wait(jobGroup);
 
         }
-
+        
         std::vector<ResourceHandle<Mesh::Mesh>> Scene::GetMeshes() {
 
             std::vector<ResourceHandle<Mesh::Mesh>> meshes;

diff --git a/src/engine/scene/Scene.h b/src/engine/scene/Scene.h
@@ -93,9 +93,7 @@ namespace Atlas {
 
             std::unordered_map<ECS::Entity, Entity> Merge(const Ref<Scene>& other);
 
-            void Timestep(float deltaTime);
-
-            void Update();
+            void Update(float deltaTime);
 
             std::vector<ResourceHandle<Mesh::Mesh>> GetMeshes();
 

diff --git a/src/engine/scene/SceneRenderState.cpp b/src/engine/scene/SceneRenderState.cpp
@@ -593,9 +593,6 @@ namespace Atlas::Scene {
 
     void SceneRenderState::WaitForAsyncWorkCompletion() {
 
-        // Assume scene work was done
-        mainCameraSignal.Release();
-
         JobSystem::Wait(bindlessBlasMapUpdateJob);
         JobSystem::Wait(bindlessTextureMapUpdateJob);
         JobSystem::Wait(bindlessOtherTextureMapUpdateJob);

diff --git a/src/engine/scene/SceneRenderState.h b/src/engine/scene/SceneRenderState.h
@@ -72,8 +72,6 @@ namespace Atlas::Scene {
         std::vector<Renderer::VolumetricLight> volumetricLights;
         std::vector<Renderer::Shadow> volumetricShadows;
 
-        JobSignal mainCameraSignal;
-
         JobGroup materialUpdateJob{ JobPriority::High };
         JobGroup rayTracingWorldUpdateJob{ JobPriority::High };
         JobGroup bindlessBlasMapUpdateJob{ JobPriority::High };

diff --git a/src/tests/App.cpp b/src/tests/App.cpp
@@ -180,8 +180,7 @@ void App::Update(float deltaTime) {
         camera.location += camera.right * moveCameraSpeed * cos(Atlas::Clock::Get());
     }
 
-    scene->Timestep(deltaTime);
-    scene->Update();
+    scene->Update(deltaTime);
 
     CheckLoadScene();
 
@@ -331,7 +330,7 @@ bool App::LoadScene() {
         meshCount++;
     }
 
-    scene->Timestep(1.0f);
+    scene->Update(1.0f);
 
     Atlas::Clock::ResetAverage();