Show Loading when world is built

lolleko · Jul 10, 2020 · e2400df · e2400df
1 parent a84630b
commit e2400df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/include/game/components/ui_context.h b/include/game/components/ui_context.h
@@ -40,6 +40,7 @@ struct UIContext
     // Menu Control flow
     bool bMenuActive = true;
     bool bGameConfigActive = false;
+    bool bShowLoading = false;
 
     // Game config
     int worldSize = 0;  // 0 = Small, 1 = Medium, 2 = Large

diff --git a/include/game/systems/menu_system.h b/include/game/systems/menu_system.h
@@ -89,7 +89,7 @@ void updateMenuSystem(entt::registry& mainRegistry)
 
     if (app->getWorldName() == uiContext.editorWorldName)
     {
-        
+
     }
 
     // Update world state with ui state
@@ -128,6 +128,7 @@ void updateMenuSystem(entt::registry& mainRegistry)
     {
         uiContext.bShouldGenerateTerrain = false;
 
+        uiContext.bShowLoading = true;
         if (uiContext.selectedBiomeType == 0)
         {
             VSTerrainGeneration::buildStandard(world);
@@ -140,6 +141,7 @@ void updateMenuSystem(entt::registry& mainRegistry)
         {
             VSTerrainGeneration::buildDesert(world);
         }
+        uiContext.bShowLoading = false;
 
         if (!uiContext.bEditorActive)
         {
@@ -149,7 +151,7 @@ void updateMenuSystem(entt::registry& mainRegistry)
 
     if (uiContext.bShouldResetEditor && !world->getChunkManager()->shouldReinitializeChunks())
     {
-        uiContext.bShouldResetEditor = false;
         VSTerrainGeneration::buildEditorPlane(world);
+        uiContext.bShouldResetEditor = false;
     }
 }
diff --git a/source/core/vs_rtscameracontroller.cpp b/source/core/vs_rtscameracontroller.cpp
@@ -23,7 +23,7 @@ VSRTSCameraController::VSRTSCameraController(
     targetPosition = cam->getPosition();
     cam->setPitchYaw(targetPitch, targetYaw);
     movementSpeed = 100.F;
-    lastYScrollOffset = radius;
+    lastYScrollOffset = 0.F;
 }
 
 void VSRTSCameraController::updateCamera(bool handleMouseEvents)

diff --git a/source/game/voxelscape.cpp b/source/game/voxelscape.cpp
@@ -128,6 +128,10 @@ void Voxelscape::renderUI()
     {
         renderEditorGUI(uiContext);
     }
+    else if (uiContext.bShowLoading)
+    {
+        renderLoading(uiContext);
+    }
     else if (uiContext.bMenuActive)
     {
         renderMainMenu(uiContext);
@@ -136,10 +140,6 @@ void Voxelscape::renderUI()
     {
         renderGameConfigGUI(uiContext);
     }
-    else if (uiContext.bShouldUpdateChunks)
-    {
-        renderLoading(uiContext);
-    }
     else
     {
         renderGameGUI(uiContext);