Fixed issues regarding thread safety

tippesi · Jan 5, 2025 · 201850d · 201850d
1 parent 76d9ca6
commit 201850d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/src/editor/ui/panels/VegetationGeneratorPanel.cpp b/src/editor/ui/panels/VegetationGeneratorPanel.cpp
@@ -46,6 +46,9 @@ namespace Atlas::Editor::UI {
     }
 
     void VegetationGeneratorPanel::RenderBiomeVegetationTypes(Ref<Terrain::Terrain>& terrain, TerrainGenerator& terrainGenerator) {
+
+        if (Singletons::blockingOperation->block)
+            return;
 
         const ImGuiTreeNodeFlags nodeFlags = ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_FramePadding
             | ImGuiTreeNodeFlags_AllowOverlap;
@@ -165,4 +168,4 @@ namespace Atlas::Editor::UI {
 
     }
 
-}
+}
diff --git a/src/engine/renderer/MainRenderer.cpp b/src/engine/renderer/MainRenderer.cpp
@@ -203,6 +203,8 @@ namespace Atlas {
 			commandList->BindBuffer(cloudShadowUniformBuffer, 1, 19);
 
 			ddgiRenderer.TraceAndUpdateProbes(target, scene, commandList);
+
+            JobSystem::WaitSpin(scene->renderState.fillMainRenderPassJob);
 
 			{
 				Graphics::Profiler::BeginQuery("Main render pass");

diff --git a/src/engine/scene/Scene.cpp b/src/engine/scene/Scene.cpp
@@ -389,10 +389,12 @@ namespace Atlas {
 
                 lightComponent.Update(transformComponent);
 
-                auto& mainCamera = GetMainCamera();
-                lightComponent.Update(mainCamera);
+                if (mainCameraEntity.IsValid()) {
+                    auto& mainCamera = GetMainCamera();
+                    lightComponent.Update(mainCamera);
 
-                renderState.FillShadowRenderPass(Entity(entity, &entityManager));
+                    renderState.FillShadowRenderPass(Entity(entity, &entityManager));
+                }
                 });
 
             JobSystem::Wait(lightJobGroup);

diff --git a/src/engine/terrain/TerrainManager.cpp b/src/engine/terrain/TerrainManager.cpp
@@ -6,7 +6,7 @@
 
 namespace Atlas::Terrain {
 
-    bool TerrainManager::enable = true;
+    std::atomic_bool TerrainManager::enable = true;
     JobGroup TerrainManager::loadTerrainCellGroup;
 
     void TerrainManager::Update() {
@@ -47,4 +47,4 @@ namespace Atlas::Terrain {
 
     }
 
-}
+}
diff --git a/src/engine/terrain/TerrainManager.h b/src/engine/terrain/TerrainManager.h
@@ -14,11 +14,11 @@ namespace Atlas::Terrain {
 
 		static void WaitForJobCompletion();
 
-		static bool enable;
+		static std::atomic_bool enable;
 
 	private:
 		static JobGroup loadTerrainCellGroup;
 
 	};
 
-}
+}