Kenix3 · Kenix3 · Jun 2, 2024 · Jun 2, 2024
diff --git a/src/config/ConsoleVariable.cpp b/src/config/ConsoleVariable.cpp
@@ -165,7 +165,7 @@ void ConsoleVariable::RegisterColor24(const char* name, Color_RGB8 defaultValue)
 }
 
 void ConsoleVariable::ClearVariable(const char* name) {
-    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Context::GetInstance()->GetConfig();
     auto var = Get(name);
     if (var != nullptr) {
         bool color = var->Type == ConsoleVariableType::Color || var->Type == ConsoleVariableType::Color24;
@@ -192,7 +192,7 @@ void ConsoleVariable::ClearVariable(const char* name) {
 }
 
 void ConsoleVariable::ClearBlock(const char* name) {
-    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Context::GetInstance()->GetConfig();
     conf->EraseBlock(StringHelper::Sprintf("CVars.%s", name));
     Load();
 }
@@ -228,7 +228,7 @@ void ConsoleVariable::CopyVariable(const char* from, const char* to) {
 }
 
 void ConsoleVariable::Save() {
-    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Context::GetInstance()->GetConfig();
 
     for (const auto& variable : mVariables) {
         const std::string key = StringHelper::Sprintf("CVars.%s", variable.first.c_str());
@@ -264,7 +264,7 @@ void ConsoleVariable::Save() {
 }
 
 void ConsoleVariable::Load() {
-    std::shared_ptr<Config> conf = Ship::Context::GetInstance()->GetConfig();
+    std::shared_ptr<Config> conf = Context::GetInstance()->GetConfig();
     conf->Reload();
     if (!mVariables.empty()) {
         mVariables.clear();
@@ -324,7 +324,7 @@ void ConsoleVariable::LoadFromPath(
     }
 }
 void ConsoleVariable::LoadLegacy() {
-    auto conf = Ship::Context::GetPathRelativeToAppDirectory("cvars.cfg");
+    auto conf = Context::GetPathRelativeToAppDirectory("cvars.cfg");
     if (DiskFile::Exists(conf)) {
         const auto lines = DiskFile::ReadAllLines(conf);
 

diff --git a/src/controller/controldeck/ControlDeck.h b/src/controller/controldeck/ControlDeck.h
@@ -26,7 +26,7 @@ class ControlDeck {
     void SetSinglePlayerMappingMode(bool singlePlayer);
     bool IsSinglePlayerMappingMode();
 
-    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
+    bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);
 
     std::shared_ptr<ShipDeviceIndexMappingManager> GetDeviceIndexMappingManager();
 

diff --git a/src/controller/controldevice/controller/Controller.cpp b/src/controller/controldevice/controller/Controller.cpp
@@ -175,7 +175,7 @@ void Controller::ReadToPad(OSContPad* pad) {
     }
 }
 
-bool Controller::ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode) {
+bool Controller::ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode) {
     bool result = false;
     for (auto [bitmask, button] : GetAllButtons()) {
         result = button->ProcessKeyboardEvent(eventType, scancode) || result;

diff --git a/src/controller/controldevice/controller/Controller.h b/src/controller/controldevice/controller/Controller.h
@@ -48,7 +48,7 @@ class Controller : public ControlDevice {
     uint8_t GetPortIndex();
     std::vector<std::shared_ptr<ControllerMapping>> GetAllMappings();
 
-    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
+    bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);
 
     bool HasMappingsForShipDeviceIndex(ShipDeviceIndex lusIndex);
     void MoveMappingsToDifferentController(std::shared_ptr<Controller> newController, ShipDeviceIndex lusIndex);

diff --git a/src/controller/controldevice/controller/ControllerButton.cpp b/src/controller/controldevice/controller/ControllerButton.cpp
@@ -205,7 +205,7 @@ bool ControllerButton::AddOrEditButtonMappingFromRawPress(CONTROLLERBUTTONS_T bi
     return true;
 }
 
-bool ControllerButton::ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode) {
+bool ControllerButton::ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode) {
     if (mUseKeydownEventToCreateNewMapping && eventType == LUS_KB_EVENT_KEY_DOWN) {
         mKeyboardScancodeForNewMapping = scancode;
         return true;

diff --git a/src/controller/controldevice/controller/ControllerButton.h b/src/controller/controldevice/controller/ControllerButton.h
@@ -36,7 +36,7 @@ class ControllerButton {
 
     void UpdatePad(CONTROLLERBUTTONS_T& padButtons);
 
-    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
+    bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);
 
     bool HasMappingsForShipDeviceIndex(ShipDeviceIndex lusIndex);
 

diff --git a/src/controller/controldevice/controller/ControllerStick.cpp b/src/controller/controldevice/controller/ControllerStick.cpp
@@ -314,7 +314,7 @@ void ControllerStick::UpdatePad(int8_t& x, int8_t& y) {
     Process(x, y);
 }
 
-bool ControllerStick::ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode) {
+bool ControllerStick::ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode) {
     if (mUseKeydownEventToCreateNewMapping && eventType == LUS_KB_EVENT_KEY_DOWN) {
         mKeyboardScancodeForNewMapping = scancode;
         return true;

diff --git a/src/controller/controldevice/controller/ControllerStick.h b/src/controller/controldevice/controller/ControllerStick.h
@@ -51,7 +51,7 @@ class ControllerStick {
     uint8_t GetNotchSnapAngle();
     bool NotchSnapAngleIsDefault();
 
-    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
+    bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);
 
     bool HasMappingsForShipDeviceIndex(ShipDeviceIndex lusIndex);
     Stick LeftOrRightStick();

diff --git a/src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.cpp b/src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.cpp
@@ -16,7 +16,7 @@ std::string KeyboardKeyToAnyMapping::GetPhysicalInputName() {
     return Context::GetInstance()->GetWindow()->GetKeyName(mKeyboardScancode);
 }
 
-bool KeyboardKeyToAnyMapping::ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode) {
+bool KeyboardKeyToAnyMapping::ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode) {
     if (eventType == KbEventType::LUS_KB_EVENT_ALL_KEYS_UP) {
         mKeyPressed = false;
         return true;

diff --git a/src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.h b/src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.h
@@ -9,7 +9,7 @@ class KeyboardKeyToAnyMapping : virtual public ControllerInputMapping {
     KeyboardKeyToAnyMapping(KbScancode scancode);
     ~KeyboardKeyToAnyMapping();
     std::string GetPhysicalInputName() override;
-    bool ProcessKeyboardEvent(Ship::KbEventType eventType, Ship::KbScancode scancode);
+    bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);
     std::string GetPhysicalDeviceName() override;
     bool PhysicalDeviceIsConnected() override;
 

diff --git a/src/controller/controldevice/controller/mapping/sdl/SDLMapping.cpp b/src/controller/controldevice/controller/mapping/sdl/SDLMapping.cpp
@@ -14,7 +14,7 @@ SDLMapping::~SDLMapping() {
 
 bool SDLMapping::OpenController() {
     auto deviceIndexMapping = std::static_pointer_cast<ShipDeviceIndexToSDLDeviceIndexMapping>(
-        Ship::Context::GetInstance()
+        Context::GetInstance()
             ->GetControlDeck()
             ->GetDeviceIndexMappingManager()
             ->GetDeviceIndexMappingFromShipDeviceIndex(mShipDeviceIndex));
@@ -116,7 +116,7 @@ bool SDLMapping::UsesGameCubeLayout() {
 
 int32_t SDLMapping::GetSDLDeviceIndex() {
     auto deviceIndexMapping = std::static_pointer_cast<ShipDeviceIndexToSDLDeviceIndexMapping>(
-        Ship::Context::GetInstance()
+        Context::GetInstance()
             ->GetControlDeck()
             ->GetDeviceIndexMappingManager()
             ->GetDeviceIndexMappingFromShipDeviceIndex(mShipDeviceIndex));
@@ -130,7 +130,7 @@ int32_t SDLMapping::GetSDLDeviceIndex() {
 }
 
 std::string SDLMapping::GetSDLControllerName() {
-    return Ship::Context::GetInstance()
+    return Context::GetInstance()
         ->GetControlDeck()
         ->GetDeviceIndexMappingManager()
         ->GetSDLControllerNameFromShipDeviceIndex(mShipDeviceIndex);

diff --git a/src/controller/deviceindex/ShipDeviceIndexMappingManager.cpp b/src/controller/deviceindex/ShipDeviceIndexMappingManager.cpp
@@ -300,7 +300,7 @@ void ShipDeviceIndexMappingManager::HandlePhysicalDeviceConnect(int32_t sdlDevic
     }
 
     if (Context::GetInstance()->GetControlDeck()->IsSinglePlayerMappingMode()) {
-        std::set<Ship::ShipDeviceIndex> alreadyConnectedDevices;
+        std::set<ShipDeviceIndex> alreadyConnectedDevices;
         for (auto mapping : Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetAllMappings()) {
             auto sdlMapping = std::dynamic_pointer_cast<SDLMapping>(mapping);
             if (sdlMapping == nullptr) {

diff --git a/src/debug/CrashHandler.cpp b/src/debug/CrashHandler.cpp
@@ -138,7 +138,7 @@ void CrashHandler::PrintRegisters(ucontext_t* ctx) {
 }
 
 static void ErrorHandler(int sig, siginfo_t* sigInfo, void* data) {
-    std::shared_ptr<CrashHandler> crashHandler = Ship::Context::GetInstance()->GetCrashHandler();
+    std::shared_ptr<CrashHandler> crashHandler = Context::GetInstance()->GetCrashHandler();
     char intToCharBuffer[16];
 
     std::array<void*, 4096> arr;
@@ -189,15 +189,15 @@ static void ErrorHandler(int sig, siginfo_t* sigInfo, void* data) {
         snprintf(intToCharBuffer, sizeof(intToCharBuffer), "%i ", (int)i);
         WRITE_VAR_LINE(crashHandler, intToCharBuffer, functionName.c_str());
     }
-    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, (Ship::Context::GetInstance()->GetName() + " has crashed").c_str(),
-                             (Ship::Context::GetInstance()->GetName() +
-                              " has crashed. Please upload the logs to the support channel in discord.")
-                                 .c_str(),
-                             nullptr);
+    SDL_ShowSimpleMessageBox(
+        SDL_MESSAGEBOX_ERROR, (Context::GetInstance()->GetName() + " has crashed").c_str(),
+        (Context::GetInstance()->GetName() + " has crashed. Please upload the logs to the support channel in discord.")
+            .c_str(),
+        nullptr);
     free(symbols);
     crashHandler->PrintCommon();
 
-    Ship::Context::GetInstance()->GetLogger()->flush();
+    Context::GetInstance()->GetLogger()->flush();
     spdlog::shutdown();
     exit(1);
 }
@@ -385,23 +385,23 @@ void CrashHandler::PrintStack(CONTEXT* ctx) {
         }
     }
     PrintCommon();
-    Ship::Context::GetInstance()->GetLogger()->flush();
+    Context::GetInstance()->GetLogger()->flush();
     spdlog::shutdown();
 }
 
 extern "C" LONG WINAPI seh_filter(PEXCEPTION_POINTERS ex) {
     char exceptionString[20];
-    std::shared_ptr<CrashHandler> crashHandler = Ship::Context::GetInstance()->GetCrashHandler();
+    std::shared_ptr<CrashHandler> crashHandler = Context::GetInstance()->GetCrashHandler();
 
     snprintf(exceptionString, std::size(exceptionString), "0x%x", ex->ExceptionRecord->ExceptionCode);
 
     WRITE_VAR_LINE(crashHandler, "Exception: ", exceptionString);
     crashHandler->PrintStack(ex->ContextRecord);
-    MessageBoxA(nullptr,
-                (Ship::Context::GetInstance()->GetName() +
-                 " has crashed. Please upload the logs to the support channel in discord.")
-                    .c_str(),
-                "Crash", MB_OK | MB_ICONERROR);
+    MessageBoxA(
+        nullptr,
+        (Context::GetInstance()->GetName() + " has crashed. Please upload the logs to the support channel in discord.")
+            .c_str(),
+        "Crash", MB_OK | MB_ICONERROR);
 
     return EXCEPTION_EXECUTE_HANDLER;
 }

diff --git a/src/resource/File.h b/src/resource/File.h
@@ -27,9 +27,9 @@ struct ResourceInitData {
 
 struct File {
     std::shared_ptr<Archive> Parent;
-    std::shared_ptr<Ship::ResourceInitData> InitData;
+    std::shared_ptr<ResourceInitData> InitData;
     std::shared_ptr<std::vector<char>> Buffer;
-    std::variant<std::shared_ptr<tinyxml2::XMLDocument>, std::shared_ptr<Ship::BinaryReader>> Reader;
+    std::variant<std::shared_ptr<tinyxml2::XMLDocument>, std::shared_ptr<BinaryReader>> Reader;
     bool IsLoaded = false;
 };
 } // namespace Ship
diff --git a/src/resource/Resource.cpp b/src/resource/Resource.cpp
@@ -2,7 +2,7 @@
 #include <spdlog/spdlog.h>
 
 namespace Ship {
-IResource::IResource(std::shared_ptr<Ship::ResourceInitData> initData) : mInitData(initData) {
+IResource::IResource(std::shared_ptr<ResourceInitData> initData) : mInitData(initData) {
 }
 
 IResource::~IResource() {
@@ -17,7 +17,7 @@ void IResource::Dirty() {
     mIsDirty = true;
 }
 
-std::shared_ptr<Ship::ResourceInitData> IResource::GetInitData() {
+std::shared_ptr<ResourceInitData> IResource::GetInitData() {
     return mInitData;
 }
 } // namespace Ship
diff --git a/src/resource/Resource.h b/src/resource/Resource.h
@@ -9,18 +9,18 @@ class IResource {
   public:
     inline static const std::string gAltAssetPrefix = "alt/";
 
-    IResource(std::shared_ptr<Ship::ResourceInitData> initData);
+    IResource(std::shared_ptr<ResourceInitData> initData);
     virtual ~IResource();
 
     virtual void* GetRawPointer() = 0;
     virtual size_t GetPointerSize() = 0;
 
     bool IsDirty();
     void Dirty();
-    std::shared_ptr<Ship::ResourceInitData> GetInitData();
+    std::shared_ptr<ResourceInitData> GetInitData();
 
   private:
-    std::shared_ptr<Ship::ResourceInitData> mInitData;
+    std::shared_ptr<ResourceInitData> mInitData;
     bool mIsDirty = false;
 };
 

diff --git a/src/resource/ResourceFactory.h b/src/resource/ResourceFactory.h
@@ -7,9 +7,9 @@
 namespace Ship {
 class ResourceFactory {
   public:
-    virtual std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) = 0;
+    virtual std::shared_ptr<IResource> ReadResource(std::shared_ptr<File> file) = 0;
 
   protected:
-    virtual bool FileHasValidFormatAndReader(std::shared_ptr<Ship::File> file) = 0;
+    virtual bool FileHasValidFormatAndReader(std::shared_ptr<File> file) = 0;
 };
 } // namespace Ship
diff --git a/src/resource/ResourceFactoryBinary.cpp b/src/resource/ResourceFactoryBinary.cpp
@@ -3,13 +3,13 @@
 #include "spdlog/spdlog.h"
 
 namespace Ship {
-bool ResourceFactoryBinary::FileHasValidFormatAndReader(std::shared_ptr<Ship::File> file) {
+bool ResourceFactoryBinary::FileHasValidFormatAndReader(std::shared_ptr<File> file) {
     if (file->InitData->Format != RESOURCE_FORMAT_BINARY) {
         SPDLOG_ERROR("resource file format does not match factory format.");
         return false;
     }
 
-    if (!std::holds_alternative<std::shared_ptr<Ship::BinaryReader>>(file->Reader)) {
+    if (!std::holds_alternative<std::shared_ptr<BinaryReader>>(file->Reader)) {
         SPDLOG_ERROR("Failed to load resource: File has Reader ({} - {})", file->InitData->Type, file->InitData->Path);
         return false;
     }

diff --git a/src/resource/ResourceFactoryBinary.h b/src/resource/ResourceFactoryBinary.h
@@ -5,6 +5,6 @@
 namespace Ship {
 class ResourceFactoryBinary : public ResourceFactory {
   protected:
-    bool FileHasValidFormatAndReader(std::shared_ptr<Ship::File> file) override;
+    bool FileHasValidFormatAndReader(std::shared_ptr<File> file) override;
 };
 } // namespace Ship
diff --git a/src/resource/ResourceFactoryXML.cpp b/src/resource/ResourceFactoryXML.cpp
@@ -2,7 +2,7 @@
 #include "spdlog/spdlog.h"
 
 namespace Ship {
-bool ResourceFactoryXML::FileHasValidFormatAndReader(std::shared_ptr<Ship::File> file) {
+bool ResourceFactoryXML::FileHasValidFormatAndReader(std::shared_ptr<File> file) {
     if (file->InitData->Format != RESOURCE_FORMAT_XML) {
         SPDLOG_ERROR("resource file format does not match factory format.");
         return false;

diff --git a/src/resource/ResourceFactoryXML.h b/src/resource/ResourceFactoryXML.h
@@ -5,6 +5,6 @@
 namespace Ship {
 class ResourceFactoryXML : public ResourceFactory {
   protected:
-    bool FileHasValidFormatAndReader(std::shared_ptr<Ship::File> file) override;
+    bool FileHasValidFormatAndReader(std::shared_ptr<File> file) override;
 };
 } // namespace Ship
diff --git a/src/resource/ResourceLoader.cpp b/src/resource/ResourceLoader.cpp
@@ -18,8 +18,8 @@ ResourceLoader::~ResourceLoader() {
 }
 
 void ResourceLoader::RegisterGlobalResourceFactories() {
-    RegisterResourceFactory(std::make_shared<Ship::ResourceFactoryBinaryJsonV0>(), RESOURCE_FORMAT_BINARY, "Json",
-                            static_cast<uint32_t>(Ship::ResourceType::Json), 0);
+    RegisterResourceFactory(std::make_shared<ResourceFactoryBinaryJsonV0>(), RESOURCE_FORMAT_BINARY, "Json",
+                            static_cast<uint32_t>(ResourceType::Json), 0);
 }
 
 bool ResourceLoader::RegisterResourceFactory(std::shared_ptr<ResourceFactory> factory, uint32_t format,
@@ -76,7 +76,7 @@ std::shared_ptr<ResourceFactory> ResourceLoader::GetFactory(uint32_t format, std
     return GetFactory(format, mResourceTypes[typeName], version);
 }
 
-std::shared_ptr<Ship::IResource> ResourceLoader::LoadResource(std::shared_ptr<Ship::File> fileToLoad) {
+std::shared_ptr<IResource> ResourceLoader::LoadResource(std::shared_ptr<File> fileToLoad) {
     if (fileToLoad == nullptr) {
         SPDLOG_ERROR("Failed to load resource: File not loaded");
         return nullptr;

diff --git a/src/resource/ResourceLoader.h b/src/resource/ResourceLoader.h
@@ -32,7 +32,7 @@ class ResourceLoader {
     ResourceLoader();
     ~ResourceLoader();
 
-    std::shared_ptr<Ship::IResource> LoadResource(std::shared_ptr<Ship::File> fileToLoad);
+    std::shared_ptr<IResource> LoadResource(std::shared_ptr<File> fileToLoad);
     bool RegisterResourceFactory(std::shared_ptr<ResourceFactory> factory, uint32_t format, std::string typeName,
                                  uint32_t type, uint32_t version);