Move GfxDebugger to Fast namespace (#642)

src/CMakeLists.txt

@@ -135,6 +135,7 @@ target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Re
 #=================== Graphic ===================
 
 file(GLOB Source_Files__Graphic RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "graphic/Fast3D/*.h" "graphic/Fast3D/*.cpp" "graphic/Fast3D/*.c")
+file(GLOB Source_Files__Graphic_Debug RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "graphic/Fast3D/debug/*.h" "graphic/Fast3D/debug/*.cpp" "graphic/Fast3D/debug/*.c")
 
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(FILTER Source_Files__Graphic EXCLUDE REGEX "graphic/Fast3D/gfx_dxgi*")
@@ -151,7 +152,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
 endif()
 
 source_group("graphic" FILES ${Source_Files__Graphic})
+source_group("graphic_debug" FILES ${Source_Files__Graphic_Debug})
 target_sources(libultraship PRIVATE ${Source_Files__Graphic})
+target_sources(libultraship PRIVATE ${Source_Files__Graphic_Debug})
 
 #=================== Packages & Includes ===================
 

src/Context.cpp

@@ -5,7 +5,7 @@
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include "install_config.h"
-#include "debug/GfxDebugger.h"
+#include "graphic/Fast3D/debug/GfxDebugger.h"
 #include "graphic/Fast3D/Fast3dWindow.h"
 
 #ifdef _WIN32
@@ -241,7 +241,7 @@ void Context::InitGfxDebugger() {
         return;
     }
 
-    mGfxDebugger = std::make_shared<LUS::GfxDebugger>();
+    mGfxDebugger = std::make_shared<Fast::GfxDebugger>();
 }
 
 void Context::InitConsole() {
@@ -298,7 +298,7 @@ std::shared_ptr<Audio> Context::GetAudio() {
     return mAudio;
 }
 
-std::shared_ptr<LUS::GfxDebugger> Context::GetGfxDebugger() {
+std::shared_ptr<Fast::GfxDebugger> Context::GetGfxDebugger() {
     return mGfxDebugger;
 }
 

src/Context.h

@@ -14,10 +14,7 @@
 #include "window/Window.h"
 #include "config/ConsoleVariable.h"
 #include "debug/Console.h"
-
-namespace LUS {
-class GfxDebugger;
-}
+#include "graphic/Fast3D/debug/GfxDebugger.h"
 
 namespace Ship {
 
@@ -52,7 +49,7 @@ class Context {
     std::shared_ptr<Window> GetWindow();
     std::shared_ptr<Console> GetConsole();
     std::shared_ptr<Audio> GetAudio();
-    std::shared_ptr<LUS::GfxDebugger> GetGfxDebugger();
+    std::shared_ptr<Fast::GfxDebugger> GetGfxDebugger();
 
     std::string GetConfigFilePath();
     std::string GetName();
@@ -85,7 +82,7 @@ class Context {
     std::shared_ptr<Window> mWindow;
     std::shared_ptr<Console> mConsole;
     std::shared_ptr<Audio> mAudio;
-    std::shared_ptr<LUS::GfxDebugger> mGfxDebugger;
+    std::shared_ptr<Fast::GfxDebugger> mGfxDebugger;
 
     std::string mConfigFilePath;
     std::string mMainPath;

src/graphic/Fast3D/debug/GfxDebugger.cpp

@@ -1,7 +1,6 @@
 #include "GfxDebugger.h"
-#include <spdlog/fmt/fmt.h>
 
-namespace LUS {
+namespace Fast {
 
 void GfxDebugger::ResumeGame() {
     mIsDebugging = false;
@@ -51,4 +50,4 @@ bool GfxDebugger::HasBreakPoint(const std::vector<const F3DGfx*>& path) const {
     return true;
 }
 
-} // namespace LUS
+} // namespace Fast

src/graphic/Fast3D/debug/GfxDebugger.h

@@ -1,11 +1,10 @@
 #pragma once
 
-#include <string>
 #include <vector>
 
 union F3DGfx;
 
-namespace LUS {
+namespace Fast {
 
 class GfxDebugger {
   public:
@@ -32,4 +31,4 @@ class GfxDebugger {
     std::vector<const F3DGfx*> mBreakPoint = {};
 };
 
-} // namespace LUS
+} // namespace Fast

src/graphic/Fast3D/gfx_pc.cpp

@@ -19,7 +19,7 @@
 #ifndef _LANGUAGE_C
 #define _LANGUAGE_C
 #endif
-#include "debug/GfxDebugger.h"
+#include "graphic/Fast3D/debug/GfxDebugger.h"
 #include "libultraship/libultra/types.h"
 //#include "libultraship/libultra/gs2dex.h"
 #include <string>

src/public/bridge/gfxdebuggerbridge.cpp

@@ -1,6 +1,6 @@
 #include "gfxdebuggerbridge.h"
 #include "Context.h"
-#include "debug/GfxDebugger.h"
+#include "graphic/Fast3D/debug/GfxDebugger.h"
 
 void GfxDebuggerRequestDebugging(void) {
     Ship::Context::GetInstance()->GetGfxDebugger()->RequestDebugging();

src/window/gui/GfxDebuggerWindow.cpp

@@ -2,7 +2,7 @@
 #include <imgui.h>
 #include <spdlog/spdlog.h>
 #include "Context.h"
-#include "debug/GfxDebugger.h"
+#include "graphic/Fast3D/debug/GfxDebugger.h"
 #include <stack>
 #include <spdlog/fmt/fmt.h>
 #include "libultraship/bridge.h"