Fix editor crash

lolleko · Jul 9, 2020 · eb9a758 · eb9a758
1 parent 9601140
commit eb9a758
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/include/game/systems/editor_system.h b/include/game/systems/editor_system.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <entt/entt.hpp>
+#include "core/vs_debug_draw.h"
 #include "game/components/inputs.h"
 #include "game/components/ui_context.h"
 #include "game/components/world_context.h"
@@ -32,7 +33,7 @@ void updateEditorSystem(entt::registry& mainRegistry)
         else if (inputs.middleButtonState == InputState::JustUp)
         {
             worldContext.world->getChunkManager()->setBlock(
-                mouseLocation - 0.05F * inputs.mousTrace.hitNormal, 0);
+                mouseLocation - 0.05F * inputs.mouseTrace.hitNormal, 0);
         }
     }
 }

diff --git a/include/game/systems/menu_system.h b/include/game/systems/menu_system.h
@@ -141,4 +141,10 @@ void updateMenuSystem(entt::registry& mainRegistry)
             uiContext.minimap.bShouldUpdate = true;
         }
     }
+
+    if (uiContext.bShouldResetEditor && !world->getChunkManager()->shouldReinitializeChunks())
+    {
+        uiContext.bShouldResetEditor = false;
+        VSTerrainGeneration::buildEditorPlane(world);
+    }
 }
diff --git a/include/world/generator/vs_terrain.h b/include/world/generator/vs_terrain.h
@@ -9,6 +9,7 @@ namespace VSTerrainGeneration
     void buildDesert(VSWorld* world);
     void buildMountains(VSWorld* world);
     void buildStandard(VSWorld* world);
+    void buildEditorPlane(VSWorld* world);
 
     void treeAt(VSWorld* world, int x, int y, int z);
     void cactusAt(VSWorld* world, int x, int y, int z);

diff --git a/source/game/voxelscape.cpp b/source/game/voxelscape.cpp
@@ -16,6 +16,7 @@
 #include "game/systems/placement_system.h"
 #include "game/systems/resource_system.h"
 #include "game/systems/minimap_system.h"
+#include "game/systems/editor_system.h"
 
 #include "game/building_loader.h"
 
@@ -48,7 +49,7 @@ void Voxelscape::initializeGame(VSApp* inApp)
     inApp->addWorld(uiContext.gameWorldName, gameWorld);
 
     VSWorld* editorWorld = new VSWorld();
-    editorWorld->getCamera()->setPosition(glm::vec3(-50.F, -5.F, -50.F));
+    editorWorld->getCamera()->setPosition(glm::vec3(-50.F, 50.F, -50.F));
     editorWorld->getCamera()->setPitchYaw(-10.F, 45.F);
     inApp->addWorld(uiContext.editorWorldName, editorWorld);
 
@@ -114,7 +115,8 @@ void Voxelscape::update(float deltaSeconds)
     }
     else if (getApp()->getWorldName() == uiContext.editorWorldName)
     {
-        // TODO updateEditorSystem()
+        updateInputSystem(mainRegistry);
+        updateEditorSystem(mainRegistry);
     }
 }
 

diff --git a/source/world/generator/vs_terrain.cpp b/source/world/generator/vs_terrain.cpp
@@ -14,8 +14,7 @@ namespace VSTerrainGeneration
         auto chunkManager = world->getChunkManager();
         glm::ivec3 worldSize = chunkManager->getWorldSize();
         glm::ivec3 worldSizeHalf = worldSize / 2;
-        VSHeightmap flatHM =
-            VSHeightmap(worldSize.y / 4, 3, 0.005F, worldSize.y / 4, 2.F, 0.5F);
+        VSHeightmap flatHM = VSHeightmap(worldSize.y / 4, 3, 0.005F, worldSize.y / 4, 2.F, 0.5F);
         VSHeightmap mountainHM =
             VSHeightmap(worldSize.y / 2, 2, 0.02F, worldSize.y / 2, 2.F, 0.125F);
 
@@ -186,6 +185,21 @@ namespace VSTerrainGeneration
         }
     }
 
+    void buildEditorPlane(VSWorld* world)
+    {
+        auto chunkManager = world->getChunkManager();
+        glm::ivec3 worldSize = chunkManager->getWorldSize();
+        glm::ivec3 worldSizeHalf = worldSize / 2;
+
+        for (int x = -worldSizeHalf.x; x < worldSizeHalf.x; x++)
+        {
+            for (int z = -worldSizeHalf.z; z < worldSizeHalf.z; z++)
+            {
+                chunkManager->setBlock({x, 0, z}, 1);
+            }
+        }
+    }
+
     void treeAt(VSWorld* world, int x, int y, int z)
     {
         auto chunkManager = world->getChunkManager();