Fixed crash from non-editor-mode calls to editor controller

Author: jonjondev

examples/game/src/entities/Player.cpp

@@ -9,10 +9,8 @@
 #include "Player.h"
 
 #include <core/Statics.h>
-#include <core/Ticker.h>
 #include <core/physics/CollisionSystem.h>
 #include <core/scene/SceneFile.h>
-#include <utils/Logging.h>
 #include <window/Input.h>
 
 #include "../ServiceLocator.h"

examples/game/src/main.cpp

@@ -9,7 +9,6 @@
 #include <core/ResourceSystem.h>
 #include <core/Statics.h>
 #include <core/Ticker.h>
-#include <core/entity/EntitySystem.h>
 #include <core/physics/CollisionSystem.h>
 #include <core/scene/SceneSystem.h>
 #include <render/renderer/Renderer.h>
@@ -107,9 +106,6 @@ int main(int argc, char* argv[])
 
         float aspect = window.AspectRatio();
 
-        //        float panelWidth = window.GetWidth();
-        //        float panelHeight = 50.f;
-
         camera3d.SetAspectRatio(aspect);
         camera2d.Update(0.f, window.GetWidth(), 0.f, window.GetHeight(), 0.1f, 1000.f);
 

examples/game/src/tools/DevConsole.cpp

@@ -26,7 +26,7 @@ void DevConsole::OnUpdate()
         // Toggle the console
         isActive = !isActive;
         if (!isActive) inputText = "";
-        ServiceLocator::GetEditorController()->SetIsHandlingInput(!isActive);
+        if (isEditorMode) ServiceLocator::GetEditorController()->SetIsHandlingInput(!isActive);
         return;
     }
 
@@ -154,14 +154,12 @@ void DevConsole::OnDraw2D()
     Siege::Window* window = ServiceLocator::GetWindow();
 
     // Draw the console to the screen
-    // Siege::Statics::Render().DrawRectangle2D(0, 0, window->GetWidth(), 40,
-    // Siege::IColour::Black);
     ServiceLocator::GetRenderer()->DrawQuad({0.f, -1.f},
                                             {((float) window->GetWidth()) / 2, 25.f},
                                             Siege::IColour::Black,
                                             0,
                                             1);
-    ServiceLocator::GetRenderer()->DrawText2D("~ " + inputText,
+    ServiceLocator::GetRenderer()->DrawText2D("> " + inputText,
                                               ServiceLocator::GetRenderResources()->GetFont(),
                                               {10.f, 10.f},
                                               {20.f, 20.f},