- fix euler conversion using rad instead of degrees

- clean up manager shutdown in application layer - enable grid by default for now
gscept · Nov 23, 2024 · 5cde9a5 · 5cde9a5
1 parent aaed699
commit 5cde9a5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/code/addons/audiofeature/managers/audiomanager.cc b/code/addons/audiofeature/managers/audiomanager.cc
@@ -172,6 +172,7 @@ AudioManager::OnActivate()
 {
     using namespace Game;
     using namespace Audio;
+    Game::Manager::OnActivate();
 
     Game::World* world = Game::GetWorld(WORLD_DEFAULT);
 

diff --git a/code/addons/graphicsfeature/graphicsfeatureunit.cc b/code/addons/graphicsfeature/graphicsfeatureunit.cc
@@ -365,6 +365,10 @@ GraphicsFeatureUnit::OnActivate()
 void
 GraphicsFeatureUnit::OnDeactivate()
 {
+    this->RemoveManager(this->cameraManager);
+    this->RemoveManager(this->graphicsManager);
+    this->cameraManager = nullptr;
+    this->graphicsManager = nullptr;
     Im3d::Im3dContext::Discard();
     Dynui::ImguiContext::Discard();
     StaticUI::StaticUIContext::Discard();

diff --git a/code/addons/graphicsfeature/managers/cameramanager.cc b/code/addons/graphicsfeature/managers/cameramanager.cc
@@ -141,8 +141,6 @@ CameraManager::OnDeactivate()
 {
     Manager::OnDeactivate();
     n_assert(CameraManager::HasInstance());
-    delete CameraManager::Singleton;
-    CameraManager::Singleton = nullptr;
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/addons/physicsfeature/managers/physicsmanager.cc b/code/addons/physicsfeature/managers/physicsmanager.cc
@@ -161,7 +161,7 @@ PhysicsManager::OnActivate()
 void
 PhysicsManager::OnDeactivate()
 {
-    Game::Manager::OnActivate();
+    Game::Manager::OnDeactivate();
 }
 
 //------------------------------------------------------------------------------

diff --git a/code/foundation/math/mat4.cc b/code/foundation/math/mat4.cc
@@ -316,7 +316,7 @@ vec3 aseuler(const mat4& m)
         x = z;
         z = t;
     }
-    return vec3(x, y, z);
+    return vec3(Math::rad2deg(x), Math::rad2deg(y), Math::rad2deg(z));
 }
 
 

diff --git a/toolkit/editor/editorfeature/editorfeatureunit.cc b/toolkit/editor/editorfeature/editorfeatureunit.cc
@@ -12,6 +12,7 @@
 #include "graphicsfeature/components/model.h"
 #include "graphicsfeature/components/decal.h"
 #include "graphicsfeature/components/lighting.h"
+#include "dynui/im3d/im3dcontext.h"
 
 // TEMP: Move this to editor game manager
 #include "game/world.h"
@@ -67,6 +68,10 @@ EditorFeatureUnit::OnActivate()
 
         this->AttachManager(Editor::UIManager::Create());
 
+        Im3d::Im3dContext::SetGridStatus(true);
+        Im3d::Im3dContext::SetGridSize(1.0f, 25);
+        Im3d::Im3dContext::SetGridColor(Math::vec4(0.2f, 0.2f, 0.2f, 0.8f));
+
         Editor::Start();
 
         // TODO: move this to a game manager that is created by the editor
-Original file line number
+Diff line change
@@ Expand Up / @@ -316,7 +316,7 @@ vec3 aseuler(const mat4& m) @@
             x = z;
             z = t;
         }
-        return vec3(x, y, z);
+        return vec3(Math::rad2deg(x), Math::rad2deg(y), Math::rad2deg(z));
     }
@@ Expand Down @@