Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

files.cmake

@@ -1442,6 +1442,8 @@ set(DUSK_FILES
         src/dusk/speedrun.cpp
         src/dusk/string.cpp
         src/dusk/stubs.cpp
+        include/dusk/texture_replacements.hpp
+        src/dusk/texture_replacements.cpp
         src/dusk/update_check.cpp
         src/dusk/update_check.hpp
         #src/dusk/m_Do_ext_dusk.cpp

include/dusk/texture_replacements.hpp

@@ -0,0 +1,12 @@
+#ifndef DUSK_TEXTURE_REPLACEMENTS_HPP
+#define DUSK_TEXTURE_REPLACEMENTS_HPP
+
+namespace dusk::texture_replacements {
+
+void reload();
+void set_enabled(bool enabled);
+void shutdown();
+
+}
+
+#endif

src/dusk/texture_replacements.cpp

@@ -0,0 +1,38 @@
+#include "dusk/texture_replacements.hpp"
+
+#include <aurora/texture.hpp>
+
+#include "dusk/logging.h"
+#include "dusk/main.h"
+#include "dusk/settings.h"
+
+namespace dusk::texture_replacements {
+namespace {
+aurora::texture::ReplacementGroup s_directoryGroup;
+}
+
+void reload() {
+    aurora::texture::unregister_replacements(s_directoryGroup);
+    s_directoryGroup.registrations.clear();
+
+    if (!getSettings().game.enableTextureReplacements) {
+        return;
+    }
+
+    const auto root = ConfigPath / "texture_replacements";
+    s_directoryGroup = aurora::texture::load_replacement_directory(root);
+    DuskLog.info("Texture replacement directory loaded: {} registration(s)",
+                 s_directoryGroup.registrations.size());
+}
+
+void set_enabled(bool enabled) {
+    getSettings().game.enableTextureReplacements.setValue(enabled);
+    reload();
+}
+
+void shutdown() {
+    aurora::texture::unregister_replacements(s_directoryGroup);
+    s_directoryGroup.registrations.clear();
+}
+
+}

src/dusk/ui/graphics_tuner.cpp

@@ -11,6 +11,7 @@
 
 #include "dusk/config.hpp"
 #include "dusk/settings.h"
+#include "dusk/texture_replacements.hpp"
 
 #include <algorithm>
 #include <string>
@@ -98,8 +99,7 @@ void set_value(GraphicsOption option, int value) {
         getSettings().game.bloomMultiplier.setValue(std::clamp(value, 0, 100) / 100.0f);
         break;
     case GraphicsOption::TextureReplacements:
-        getSettings().game.enableTextureReplacements.setValue(static_cast<bool>(value));
-        aurora_set_texture_replacements_enabled(static_cast<bool>(value));
+        texture_replacements::set_enabled(static_cast<bool>(value));
         break;
     }
 }

src/m_Do/m_Do_main.cpp

@@ -85,6 +85,7 @@
 #include "dusk/config.hpp"
 #include "dusk/speedrun.h"
 #include "dusk/settings.h"
+#include "dusk/texture_replacements.hpp"
 #include "dusk/io.hpp"
 #include "dusk/version.hpp"
 #include "dusk/discord_presence.hpp"
@@ -602,7 +603,6 @@ int game_main(int argc, char* argv[]) {
         config.allowJoystickBackgroundEvents = dusk::getSettings().game.allowBackgroundInput;
         config.pauseOnFocusLost = dusk::getSettings().game.pauseOnFocusLost;
         config.imGuiInitCallback = &aurora_imgui_init_callback;
-        config.allowTextureReplacements = dusk::getSettings().game.enableTextureReplacements;
         config.allowTextureDumps = false;
         auroraInfo = aurora_initialize(argc, argv, &config);
     }
@@ -652,6 +652,7 @@ int game_main(int argc, char* argv[]) {
         return 0;
     }
 
+    dusk::texture_replacements::reload();
     dusk::ui::initialize();
     dusk::ui::push_document(std::make_unique<dusk::ui::Overlay>(), true, true);
     dusk::ui::push_document(std::make_unique<dusk::ui::MenuBar>(), false);
@@ -800,6 +801,7 @@ int game_main(int argc, char* argv[]) {
     dusk::discord::shutdown();
 #endif
     dusk::ui::shutdown();
+    dusk::texture_replacements::shutdown();
     aurora_shutdown();
 
     return 0;