From 4ad405c7ea9945d0509107c0580ebefb0097ffc6 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Tue, 9 Jul 2024 00:21:29 +0200
Subject: [PATCH] Move GfxDebugger to Fast namespace (#642)

---
 src/CMakeLists.txt                             | 3 +++
 src/Context.cpp                                | 6 +++---
 src/Context.h                                  | 9 +++------
 src/{ => graphic/Fast3D}/debug/GfxDebugger.cpp | 5 ++---
 src/{ => graphic/Fast3D}/debug/GfxDebugger.h   | 5 ++---
 src/graphic/Fast3D/gfx_pc.cpp                  | 2 +-
 src/public/bridge/gfxdebuggerbridge.cpp        | 2 +-
 src/window/gui/GfxDebuggerWindow.cpp           | 2 +-
 8 files changed, 16 insertions(+), 18 deletions(-)
 rename src/{ => graphic/Fast3D}/debug/GfxDebugger.cpp (94%)
 rename src/{ => graphic/Fast3D}/debug/GfxDebugger.h (92%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1123683..5354dc4 100644
--- a/src/CMakeLists.txt
+++ b/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 ===================
 
diff --git a/src/Context.cpp b/src/Context.cpp
index db75423..ad4e1d6 100644
--- a/src/Context.cpp
+++ b/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;
 }
 
diff --git a/src/Context.h b/src/Context.h
index d93c34b..d2fe74c 100644
--- a/src/Context.h
+++ b/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;
diff --git a/src/debug/GfxDebugger.cpp b/src/graphic/Fast3D/debug/GfxDebugger.cpp
similarity index 94%
rename from src/debug/GfxDebugger.cpp
rename to src/graphic/Fast3D/debug/GfxDebugger.cpp
index 1600ba2..eab51fc 100644
--- a/src/debug/GfxDebugger.cpp
+++ b/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
diff --git a/src/debug/GfxDebugger.h b/src/graphic/Fast3D/debug/GfxDebugger.h
similarity index 92%
rename from src/debug/GfxDebugger.h
rename to src/graphic/Fast3D/debug/GfxDebugger.h
index 619dabe..f0b2389 100644
--- a/src/debug/GfxDebugger.h
+++ b/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
diff --git a/src/graphic/Fast3D/gfx_pc.cpp b/src/graphic/Fast3D/gfx_pc.cpp
index ac7d891..47a9eb0 100644
--- a/src/graphic/Fast3D/gfx_pc.cpp
+++ b/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>
diff --git a/src/public/bridge/gfxdebuggerbridge.cpp b/src/public/bridge/gfxdebuggerbridge.cpp
index 891c466..8528714 100644
--- a/src/public/bridge/gfxdebuggerbridge.cpp
+++ b/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();
diff --git a/src/window/gui/GfxDebuggerWindow.cpp b/src/window/gui/GfxDebuggerWindow.cpp
index 3e98c45..0555137 100644
--- a/src/window/gui/GfxDebuggerWindow.cpp
+++ b/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"