renamespace (#520)

* renamespace * clang format * wii u fix * more wii u fixes * actually commit the thing * keep on fixin on * couple more * apparently that header is causing issues * clang format * fix build * ShipDK -> Ship * clang format * json resource in ship namespace
Kenix3 · Apr 28, 2024 · 6f978e0 · 6f978e0
1 parent a245aaf
commit 6f978e0
Show file tree

Hide file tree

Showing 234 changed files with 1,715 additions and 1,680 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -39,10 +39,10 @@ file(GLOB_RECURSE Source_Files__Controller RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 if (CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
     list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/controldevice/controller/mapping/keyboard/*")
     list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/controldevice/controller/mapping/sdl/*")
-    list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/deviceindex/LUSDeviceIndexToSDLDeviceIndexMapping.*")
+    list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/deviceindex/ShipDeviceIndexToSDLDeviceIndexMapping.*")
 else()
     list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/controldevice/controller/mapping/wiiu/*")
-    list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/deviceindex/LUSDeviceIndexToWiiUDeviceIndexMapping.*")
+    list(FILTER Source_Files__Controller EXCLUDE REGEX "controller/deviceindex/ShipDeviceIndexToWiiUDeviceIndexMapping.*")
 endif()
 
 source_group("controller" FILES ${Source_Files__Controller})

diff --git a/src/Context.cpp b/src/Context.cpp
@@ -19,7 +19,7 @@
 #include "port/wiiu/WiiUImpl.h"
 #endif
 
-namespace LUS {
+namespace Ship {
 std::weak_ptr<Context> Context::mContext;
 
 std::shared_ptr<Context> Context::GetInstance() {
@@ -211,7 +211,7 @@ void Context::InitResourceManager(const std::vector<std::string>& otrFiles,
 #if defined(__SWITCH__)
         printf("Main OTR file not found!\n");
 #elif defined(__WIIU__)
-        LUS::WiiU::ThrowMissingOTR(mMainPath.c_str());
+        Ship::WiiU::ThrowMissingOTR(mMainPath.c_str());
 #else
         SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OTR file not found",
                                  "Main OTR file not found. Please generate one", nullptr);
@@ -224,7 +224,7 @@ void Context::InitResourceManager(const std::vector<std::string>& otrFiles,
         return;
     }
 #ifdef __SWITCH__
-    LUS::Switch::Init(PostInitPhase);
+    Ship::Switch::Init(PostInitPhase);
 #endif
 }
 
@@ -258,7 +258,7 @@ void Context::InitGfxDebugger() {
         return;
     }
 
-    mGfxDebugger = std::make_shared<GfxDebugger>();
+    mGfxDebugger = std::make_shared<LUS::GfxDebugger>();
 }
 
 void Context::InitConsole() {
@@ -315,7 +315,7 @@ std::shared_ptr<Audio> Context::GetAudio() {
     return mAudio;
 }
 
-std::shared_ptr<GfxDebugger> Context::GetGfxDebugger() {
+std::shared_ptr<LUS::GfxDebugger> Context::GetGfxDebugger() {
     return mGfxDebugger;
 }
 
@@ -432,4 +432,4 @@ std::string Context::LocateFileAcrossAppDirs(const std::string path, std::string
     return "./" + std::string(path);
 }
 
-} // namespace LUS
+} // namespace Ship
diff --git a/src/Context.h b/src/Context.h
@@ -16,6 +16,9 @@
 
 namespace LUS {
 class GfxDebugger;
+}
+
+namespace Ship {
 
 class Context {
   public:
@@ -48,7 +51,7 @@ class Context {
     std::shared_ptr<Window> GetWindow();
     std::shared_ptr<Console> GetConsole();
     std::shared_ptr<Audio> GetAudio();
-    std::shared_ptr<GfxDebugger> GetGfxDebugger();
+    std::shared_ptr<LUS::GfxDebugger> GetGfxDebugger();
 
     std::string GetConfigFilePath();
     std::string GetName();
@@ -81,7 +84,7 @@ class Context {
     std::shared_ptr<Window> mWindow;
     std::shared_ptr<Console> mConsole;
     std::shared_ptr<Audio> mAudio;
-    std::shared_ptr<GfxDebugger> mGfxDebugger;
+    std::shared_ptr<LUS::GfxDebugger> mGfxDebugger;
 
     std::string mConfigFilePath;
     std::string mMainPath;
@@ -90,4 +93,4 @@ class Context {
     std::string mName;
     std::string mShortName;
 };
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/Audio.cpp b/src/audio/Audio.cpp
@@ -2,7 +2,7 @@
 
 #include "Context.h"
 
-namespace LUS {
+namespace Ship {
 Audio::Audio() {
 }
 
@@ -62,4 +62,4 @@ std::shared_ptr<std::vector<AudioBackend>> Audio::GetAvailableAudioBackends() {
     return mAvailableAudioBackends;
 }
 
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/Audio.h b/src/audio/Audio.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "audio/AudioPlayer.h"
 
-namespace LUS {
+namespace Ship {
 enum class AudioBackend { WASAPI, SDL };
 
 class Audio {
@@ -27,4 +27,4 @@ class Audio {
     AudioBackend mAudioBackend;
     std::shared_ptr<std::vector<AudioBackend>> mAvailableAudioBackends;
 };
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/AudioPlayer.cpp b/src/audio/AudioPlayer.cpp
@@ -1,7 +1,7 @@
 #include "AudioPlayer.h"
 #include "spdlog/spdlog.h"
 
-namespace LUS {
+namespace Ship {
 AudioPlayer::AudioPlayer() : mInitialized(false){};
 
 AudioPlayer::~AudioPlayer() {
@@ -16,4 +16,4 @@ bool AudioPlayer::Init(void) {
 bool AudioPlayer::IsInitialized(void) {
     return mInitialized;
 }
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/AudioPlayer.h b/src/audio/AudioPlayer.h
@@ -3,7 +3,7 @@
 #include "stddef.h"
 #include <string>
 
-namespace LUS {
+namespace Ship {
 class AudioPlayer {
 
   public:
@@ -27,7 +27,7 @@ class AudioPlayer {
   private:
     bool mInitialized;
 };
-} // namespace LUS
+} // namespace Ship
 
 #ifdef _WIN32
 #include "WasapiAudioPlayer.h"

diff --git a/src/audio/SDLAudioPlayer.cpp b/src/audio/SDLAudioPlayer.cpp
@@ -1,7 +1,7 @@
 #include "SDLAudioPlayer.h"
 #include <spdlog/spdlog.h>
 
-namespace LUS {
+namespace Ship {
 SDLAudioPlayer::SDLAudioPlayer() : AudioPlayer() {
 }
 
@@ -46,4 +46,4 @@ void SDLAudioPlayer::Play(const uint8_t* buf, size_t len) {
         SDL_QueueAudio(mDevice, buf, len);
     }
 }
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/SDLAudioPlayer.h b/src/audio/SDLAudioPlayer.h
@@ -2,7 +2,7 @@
 #include "AudioPlayer.h"
 #include <SDL2/SDL.h>
 
-namespace LUS {
+namespace Ship {
 class SDLAudioPlayer : public AudioPlayer {
   public:
     SDLAudioPlayer();
@@ -18,4 +18,4 @@ class SDLAudioPlayer : public AudioPlayer {
   private:
     SDL_AudioDeviceID mDevice;
 };
-} // namespace LUS
+} // namespace Ship
diff --git a/src/audio/WasapiAudioPlayer.cpp b/src/audio/WasapiAudioPlayer.cpp
@@ -15,7 +15,7 @@ const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
 const IID IID_IAudioClient = __uuidof(IAudioClient);
 const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
 
-namespace LUS {
+namespace Ship {
 WasapiAudioPlayer::WasapiAudioPlayer()
     : mRefCount(1), mBufferFrameCount(0), mInitialized(false), mStarted(false), AudioPlayer(){};
 
@@ -164,5 +164,5 @@ HRESULT STDMETHODCALLTYPE WasapiAudioPlayer::QueryInterface(REFIID riid, VOID**
     }
     return S_OK;
 }
-} // namespace LUS
+} // namespace Ship
 #endif
diff --git a/src/audio/WasapiAudioPlayer.h b/src/audio/WasapiAudioPlayer.h
@@ -9,7 +9,7 @@
 
 using namespace Microsoft::WRL;
 
-namespace LUS {
+namespace Ship {
 class WasapiAudioPlayer : public AudioPlayer, public IMMNotificationClient {
   public:
     WasapiAudioPlayer();
@@ -41,5 +41,5 @@ class WasapiAudioPlayer : public AudioPlayer, public IMMNotificationClient {
     bool mInitialized;
     bool mStarted;
 };
-} // namespace LUS
+} // namespace Ship
 #endif
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
@@ -13,7 +13,7 @@
 
 namespace fs = std::filesystem;
 
-namespace LUS {
+namespace Ship {
 Config::Config(std::string path) : mPath(std::move(path)), mIsNewInstance(false) {
     Reload();
 }
@@ -284,4 +284,4 @@ uint32_t ConfigVersionUpdater::GetVersion() {
     return mVersion;
 }
 
-} // namespace LUS
+} // namespace Ship
diff --git a/src/config/Config.h b/src/config/Config.h
@@ -7,7 +7,7 @@
 #include "audio/Audio.h"
 #include "window/Window.h"
 
-namespace LUS {
+namespace Ship {
 
 /**
  * @brief Abstract class representing a Config Version Updater, intended to express how to
@@ -98,4 +98,4 @@ class Config {
     bool mIsNewInstance;
     std::map<uint32_t, std::shared_ptr<ConfigVersionUpdater>> mVersionUpdaters;
 };
-} // namespace LUS
+} // namespace Ship
diff --git a/src/config/ConsoleVariable.cpp b/src/config/ConsoleVariable.cpp
@@ -6,7 +6,7 @@
 #include "config/Config.h"
 #include "Context.h"
 
-namespace LUS {
+namespace Ship {
 
 ConsoleVariable::ConsoleVariable() {
     Load();
@@ -165,13 +165,13 @@ void ConsoleVariable::RegisterColor24(const char* name, Color_RGB8 defaultValue)
 }
 
 void ConsoleVariable::ClearVariable(const char* name) {
-    std::shared_ptr<Config> conf = LUS::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
     mVariables.erase(name);
     conf->Erase(StringHelper::Sprintf("CVars.%s", name));
 }
 
 void ConsoleVariable::Save() {
-    std::shared_ptr<Config> conf = LUS::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
 
     for (const auto& variable : mVariables) {
         const std::string key = StringHelper::Sprintf("CVars.%s", variable.first.c_str());
@@ -208,7 +208,7 @@ void ConsoleVariable::Save() {
 }
 
 void ConsoleVariable::Load() {
-    std::shared_ptr<Config> conf = LUS::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
     conf->Reload();
 
     LoadFromPath("", conf->GetNestedJson()["CVars"].items());
@@ -265,7 +265,7 @@ void ConsoleVariable::LoadFromPath(
     }
 }
 void ConsoleVariable::LoadLegacy() {
-    auto conf = LUS::Context::GetPathRelativeToAppDirectory("cvars.cfg");
+    auto conf = Ship::Context::GetPathRelativeToAppDirectory("cvars.cfg");
     if (DiskFile::Exists(conf)) {
         const auto lines = DiskFile::ReadAllLines(conf);
 
@@ -312,4 +312,4 @@ void ConsoleVariable::LoadLegacy() {
         fs::remove(conf);
     }
 }
-} // namespace LUS
+} // namespace Ship
diff --git a/src/config/ConsoleVariable.h b/src/config/ConsoleVariable.h
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <string>
 
-namespace LUS {
+namespace Ship {
 typedef enum class ConsoleVariableType { Integer, Float, String, Color, Color24 } ConsoleVariableType;
 
 typedef struct CVar {
@@ -58,4 +58,4 @@ class ConsoleVariable {
   private:
     std::unordered_map<std::string, std::shared_ptr<CVar>> mVariables;
 };
-} // namespace LUS
+} // namespace Ship
diff --git a/src/controller/controldeck/ControlDeck.cpp b/src/controller/controldeck/ControlDeck.cpp
@@ -8,17 +8,17 @@
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 #include <imgui.h>
-#include "controller/deviceindex/LUSDeviceIndexMappingManager.h"
+#include "controller/deviceindex/ShipDeviceIndexMappingManager.h"
 
-namespace LUS {
+namespace Ship {
 
 ControlDeck::ControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks)
     : mPads(nullptr), mSinglePlayerMappingMode(false) {
     for (int32_t i = 0; i < MAXCONTROLLERS; i++) {
         mPorts.push_back(std::make_shared<ControlPort>(i, std::make_shared<Controller>(i, additionalBitmasks)));
     }
 
-    mDeviceIndexMappingManager = std::make_shared<LUSDeviceIndexMappingManager>();
+    mDeviceIndexMappingManager = std::make_shared<ShipDeviceIndexMappingManager>();
 }
 
 ControlDeck::ControlDeck() : ControlDeck(std::vector<CONTROLLERBUTTONS_T>()) {
@@ -41,7 +41,7 @@ void ControlDeck::Init(uint8_t* controllerBits) {
 #ifndef __WIIU__
     // if we don't have a config for controller 1, set default keyboard bindings
     if (!mPorts[0]->GetConnectedController()->HasConfig()) {
-        mPorts[0]->GetConnectedController()->AddDefaultMappings(LUSDeviceIndex::Keyboard);
+        mPorts[0]->GetConnectedController()->AddDefaultMappings(ShipDeviceIndex::Keyboard);
     }
 #endif
 
@@ -113,7 +113,7 @@ void ControlDeck::UnblockGameInput(int32_t blockId) {
     mGameInputBlockers.erase(blockId);
 }
 
-std::shared_ptr<LUSDeviceIndexMappingManager> ControlDeck::GetDeviceIndexMappingManager() {
+std::shared_ptr<ShipDeviceIndexMappingManager> ControlDeck::GetDeviceIndexMappingManager() {
     return mDeviceIndexMappingManager;
 }
 
@@ -124,4 +124,4 @@ void ControlDeck::SetSinglePlayerMappingMode(bool singlePlayer) {
 bool ControlDeck::IsSinglePlayerMappingMode() {
     return mSinglePlayerMappingMode;
 }
-} // namespace LUS
+} // namespace Ship
diff --git a/src/controller/controldeck/ControlDeck.h b/src/controller/controldeck/ControlDeck.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <config/Config.h>
 #include "controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h"
-#include "controller/deviceindex/LUSDeviceIndexMappingManager.h"
+#include "controller/deviceindex/ShipDeviceIndexMappingManager.h"
 
-namespace LUS {
+namespace Ship {
 
 class ControlDeck {
   public:
@@ -27,10 +27,10 @@ class ControlDeck {
     bool IsSinglePlayerMappingMode();
 
 #ifndef __WIIU__
-    bool ProcessKeyboardEvent(LUS::KbEventType eventType, LUS::KbScancode scancode);
+    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
 #endif
 
-    std::shared_ptr<LUSDeviceIndexMappingManager> GetDeviceIndexMappingManager();
+    std::shared_ptr<ShipDeviceIndexMappingManager> GetDeviceIndexMappingManager();
 
   private:
     std::vector<std::shared_ptr<ControlPort>> mPorts = {};
@@ -40,6 +40,6 @@ class ControlDeck {
 
     bool AllGameInputBlocked();
     std::unordered_map<int32_t, bool> mGameInputBlockers;
-    std::shared_ptr<LUSDeviceIndexMappingManager> mDeviceIndexMappingManager;
+    std::shared_ptr<ShipDeviceIndexMappingManager> mDeviceIndexMappingManager;
 };
-} // namespace LUS
+} // namespace Ship