Merge branch 'main' of https://github.com/TakaRikka/dusk

src/d/actor/d_a_movie_player.cpp

@@ -4473,7 +4473,9 @@ int daMP_c::daMP_c_Get_arg_movieNo() {
 int daMP_c::daMP_c_Init() {
     JUT_ASSERT(9469, m_myObj == NULL);
 
+#if !TARGET_PC // We don't properly simulate retrace interval so this doesn't work.
     mDoGph_gInf_c::setFrameRate(1);
+#endif
     daMP_Fail_alloc = FALSE;
 
     int demoNo = daMP_c_Get_arg_demoNo();

src/d/d_file_select.cpp

@@ -1193,7 +1193,13 @@ void dFile_select_c::menuSelect() {
 
 // Handles copy / start / delete actions depending on which menu is selected from menuSelect
 void dFile_select_c::menuSelectStart() {
-    mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
+    #if TARGET_PC
+    if (!dusk::getSettings().game.hideTvSettingsScreen || mSelectMenuNum != 1) {
+        mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
+    }
+    #else
+        mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
+    #endif
 
     if (mSelectMenuNum == 1) {
         dComIfGs_setCardToMemory((u8*)mSaveData, mSelectNum);

src/d/d_gameover.cpp

@@ -432,7 +432,14 @@ void dDlst_GameOverScrnDraw_c::draw() {
         img_white.a = 255;
 
         mpBackImg->setBlackWhite(img_black, img_white);
+
+        #if TARGET_PC
+        mpBackImg->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                        mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false,
+                        false);
+        #else
         mpBackImg->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, false, false, false);
+        #endif
     } else {
         JUtility::TColor img_black;
         JUtility::TColor img_white;
@@ -447,7 +454,13 @@ void dDlst_GameOverScrnDraw_c::draw() {
         img_white.b = l_HIO.mWhite.b;
         img_white.a = l_HIO.mWhite.a;
 
+        #if TARGET_PC
+        mpBackImg->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
+                        mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false,
+                        false);
+        #else
         mpBackImg->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, false, false, false);
+        #endif
 
         static f32 offset[8] = {-138.0f, -96.0f, -56.0f, -18.0f, 42.0f, 75.0f, 110.0f, 143.0f};
 

src/d/d_menu_collect.cpp

@@ -590,6 +590,15 @@ void dMenu_Collect2D_c::screenSet() {
     field_0x184[4][2] = 0x196;
     field_0x184[5][2] = 0x195;
     field_0x184[6][2] = 0;
+#if TARGET_PC // Since we allow changing wallet sizes, do something more robust.
+    if (dComIfGs_getWalletSize() == WALLET) {
+        field_0x184[0][3] = 0x199;
+    } else if (dComIfGs_getWalletSize() == BIG_WALLET) {
+        field_0x184[0][3] = 0x19a;
+    } else {
+        field_0x184[0][3] = 0x19b;
+    }
+#else
     if (dComIfGs_getRupeeMax() == WALLET_MAX) {
         field_0x184[0][3] = 0x199;
     } else if (dComIfGs_getRupeeMax() == BIG_WALLET_MAX) {
@@ -597,6 +606,7 @@ void dMenu_Collect2D_c::screenSet() {
     } else {
         field_0x184[0][3] = 0x19b;
     }
+#endif
     if (dComIfGs_getArrowMax() == QUIVER_MAX) {
         field_0x184[1][3] = 0x1b9;
     } else if (dComIfGs_getArrowMax() == BIG_QUIVER_MAX) {
@@ -757,7 +767,11 @@ void dMenu_Collect2D_c::screenSet() {
     setItemNameString(mCursorX, mCursorY);
     cursorPosSet();
     setArrowMaxNum(dComIfGs_getArrowMax());
+#if TARGET_PC
+    setWalletSizeNum(dComIfGs_getWalletSize());
+#else
     setWalletMaxNum(dComIfGs_getRupeeMax());
+#endif
     setSmellType();
     setHeartPiece();
     setPohMaxNum(dComIfGs_getPohSpiritNum());
@@ -1242,6 +1256,27 @@ void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) {
     }
 }
 
+#if TARGET_PC
+void dMenu_Collect2D_c::setWalletSizeNum(u16 i_walletSize) {
+    switch (i_walletSize) {
+    case WALLET:
+        mpScreen->search(MULTI_CHAR('item_1_0'))->show();
+        mpScreen->search(MULTI_CHAR('item_1_1'))->hide();
+        mpScreen->search(MULTI_CHAR('item_1_2'))->hide();
+        break;
+    case BIG_WALLET:
+        mpScreen->search(MULTI_CHAR('item_1_0'))->hide();
+        mpScreen->search(MULTI_CHAR('item_1_1'))->show();
+        mpScreen->search(MULTI_CHAR('item_1_2'))->hide();
+        break;
+    case GIANT_WALLET:
+        mpScreen->search(MULTI_CHAR('item_1_0'))->hide();
+        mpScreen->search(MULTI_CHAR('item_1_1'))->hide();
+        mpScreen->search(MULTI_CHAR('item_1_2'))->show();
+        break;
+    }
+}
+#else
 void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) {
     switch (i_walletSize) {
     case 300:
@@ -1261,6 +1296,7 @@ void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) {
         break;
     }
 }
+#endif
 
 void dMenu_Collect2D_c::setSmellType() {
     static const u64 smell_tag[5] = {

src/d/d_meter_HIO.cpp

@@ -2292,6 +2292,7 @@ void dMeter_drawHIO_c::updateOnWide() {
     g_drawHIO = {}; // this might be a bad idea
 
     g_drawHIO.mMainHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMainHUDButtonsPosX);
+    g_drawHIO.mRingHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRingHUDButtonsPosX);
     g_drawHIO.mRupeeKeyPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRupeeKeyPosX);
     g_drawHIO.mButtonCrossOFFPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossOFFPosX);
     g_drawHIO.mButtonCrossONPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossONPosX);

src/d/d_meter_map.cpp

@@ -596,7 +596,8 @@ void dMeterMap_c::_draw() {
 #if TARGET_PC
     // Optimization: don't draw map if it's off-screen/invisible.
     // Especially useful in debug builds on Hyrule field etc., it's slow!
-    if ((!mMapIsInside && mSlidePositionOffset == getDispPosOutSide_OffsetX()) || mMapAlpha == 0) {
+    // That +3 is an arbitrary bias to avoid rounding issues causing this to fail.
+    if ((!mMapIsInside && mSlidePositionOffset <= getDispPosOutSide_OffsetX() + 3) || mMapAlpha == 0) {
         return;
     }
 #endif

src/dusk/audio/DuskAudioSystem.cpp

@@ -76,6 +76,12 @@ void dusk::audio::SetMasterVolume(const f32 value) {
     MasterVolume = value;
 }
 
+void dusk::audio::SetEnableReverb(const bool value) {
+    JASCriticalSection section;
+
+    EnableReverb = value;
+}
+
 void SDLCALL GetNewAudio(
     void*,
     SDL_AudioStream*,

src/dusk/imgui/ImGuiConfig.hpp

@@ -5,36 +5,48 @@
 #include "imgui.h"
 
 namespace dusk::config {
-    inline void ImGuiCheckbox(const char* title, ConfigVar<bool>& var) {
+    inline bool ImGuiCheckbox(const char* title, ConfigVar<bool>& var) {
         bool copy = var.getValue();
         if (ImGui::Checkbox(title, &copy)) {
             var.setValue(copy);
             Save();
+            return true;
         }
+
+        return false;
     }
 
-    static void ImGuiSliderFloat(const char* label, ConfigVar<float>& var, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0) {
+    static bool ImGuiSliderFloat(const char* label, ConfigVar<float>& var, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0) {
         float val = var;
         if (ImGui::SliderFloat(label, &val, v_min, v_max, format, flags)) {
             var.setValue(val);
             Save();
+            return true;
         }
+
+        return false;
     }
 
-    static void ImGuiSliderInt(const char* label, ConfigVar<int>& var, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0) {
+    static bool ImGuiSliderInt(const char* label, ConfigVar<int>& var, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0) {
         int val = var;
         if (ImGui::SliderInt(label, &val, v_min, v_max, format, flags)) {
             var.setValue(val);
             Save();
+            return true;
         }
+
+        return false;
     }
 
-    static void ImGuiMenuItem(const char* label, const char* shortcut, ConfigVar<bool>& p_selected, bool enabled = true) {
+    static bool ImGuiMenuItem(const char* label, const char* shortcut, ConfigVar<bool>& p_selected, bool enabled = true) {
         bool copy = p_selected.getValue();
         if (ImGui::MenuItem(label, shortcut, &copy, enabled)) {
             p_selected.setValue(copy);
             Save();
+            return true;
         }
+
+        return false;
     }
 }
 

src/dusk/imgui/ImGuiConsole.cpp

@@ -7,14 +7,16 @@
 
 #include "fmt/format.h"
 #include "imgui.h"
-#include "aurora/gfx.h"
 #include <imgui_internal.h>
 
 #include "ImGuiConsole.hpp"
 
 #include "JSystem/JUtility/JUTGamePad.h"
+#include "SDL3/SDL_mouse.h"
 #include "dusk/config.hpp"
 #include "dusk/settings.h"
+#include "dusk/audio/DuskAudioSystem.h"
+#include "dusk/dusk.h"
 
 #if _WIN32
 #define NOMINMAX
@@ -178,13 +180,31 @@ namespace dusk {
 
     ImGuiConsole::ImGuiConsole() {}
 
+    void ImGuiConsole::InitSettings() {
+        bool lockAspect = getSettings().video.lockAspectRatio;
+        if (lockAspect) {
+            VILockAspectRatio(defaultAspectRatioW, defaultAspectRatioH);
+        } else {
+            VIUnlockAspectRatio();
+        }
+
+        dusk::audio::SetMasterVolume(getSettings().audio.masterVolume / 100.0f);
+        dusk::audio::SetEnableReverb(getSettings().audio.enableReverb);
+    }
+
+    void ImGuiConsole::UpdateSettings() {
+        getTransientSettings().skipFrameRateLimit = getSettings().game.enableTurboKeybind && ImGui::IsKeyDown(ImGuiKey_Tab);
+    }
+
     void ImGuiConsole::PreDraw() {
         if (!m_isLaunchInitialized) {
+            InitSettings();
+
             m_toasts.emplace_back("Press F1 to toggle menu"s, 5.f);
             m_isLaunchInitialized = true;
         }
 
-        getTransientSettings().skipFrameRateLimit = getSettings().game.enableTurboKeybind && ImGui::IsKeyDown(ImGuiKey_Tab);
+        UpdateSettings();
         
         if ((ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) &&
             ImGui::IsKeyPressed(ImGuiKey_R))
@@ -198,9 +218,14 @@ namespace dusk {
 
         if (CheckMenuViewToggle(ImGuiKey_F1, m_isHidden)) {
             ShowToasts();
+            ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange;
+            SDL_HideCursor();
             return;
         }
 
+        ImGui::GetIO().ConfigFlags &= ~ImGuiConfigFlags_NoMouseCursorChange;
+        // Imgui will re-show cursor.
+
         // TODO: we need to be able to render the menu bar & any overlays separately
         // The code currently ties them all together, so hiding the menu hides all windows
 

src/dusk/imgui/ImGuiConsole.hpp

@@ -14,6 +14,8 @@ namespace dusk {
 class ImGuiConsole {
 public:
     ImGuiConsole();
+    void InitSettings();
+    void UpdateSettings();
     void PreDraw();
     void PostDraw();
 

src/dusk/imgui/ImGuiMenuGame.cpp

@@ -7,8 +7,9 @@
 #include <imgui_internal.h>
 
 #include "JSystem/JUtility/JUTGamePad.h"
-#include "dusk/audio/DuskDsp.hpp"
 #include "dusk/audio/DuskAudioSystem.h"
+#include "dusk/audio/DuskDsp.hpp"
+#include "dusk/dusk.h"
 #include "dusk/hotkeys.h"
 #include "dusk/settings.h"
 #include "m_Do/m_Do_controller_pad.h"
@@ -38,13 +39,6 @@ namespace dusk {
                     ToggleFullscreen();
                 }
 
-                bool vsync = getSettings().video.enableVsync;
-                if (ImGui::Checkbox("Enable Vsync", &vsync)) {
-                    getSettings().video.enableVsync.setValue(vsync);
-                    aurora_enable_vsync(vsync);
-                    config::Save();
-                }
-
                 if (ImGui::MenuItem("Default Window Size")) {
                     getSettings().video.enableFullscreen.setValue(false);
                     VISetWindowFullscreen(false);
@@ -52,13 +46,38 @@ namespace dusk {
                     VICenterWindow();
                 }
 
+                bool vsync = getSettings().video.enableVsync;
+                if (ImGui::Checkbox("Enable Vsync", &vsync)) {
+                    getSettings().video.enableVsync.setValue(vsync);
+                    aurora_enable_vsync(vsync);
+                    config::Save();
+                }
+
+                bool lockAspect = getSettings().video.lockAspectRatio;
+                if (ImGui::Checkbox("Force 4:3 Aspect Ratio", &lockAspect)) {
+                    getSettings().video.lockAspectRatio.setValue(lockAspect);
+
+                    if (lockAspect) {
+                        VILockAspectRatio(defaultAspectRatioW, defaultAspectRatioH);
+                    } else {
+                        VIUnlockAspectRatio();
+                    }
+
+                    config::Save();
+                }
+
                 ImGui::EndMenu();
             }
 
             if (ImGui::BeginMenu("Audio")) {
                 ImGui::Text("Master Volume");
-                config::ImGuiSliderInt("##masterVolume", getSettings().audio.masterVolume, 0, 100);
-                config::ImGuiCheckbox("Enable Reverb", getSettings().audio.enableReverb);
+                if (config::ImGuiSliderInt("##masterVolume", getSettings().audio.masterVolume, 0, 100)) {
+                    dusk::audio::SetMasterVolume(getSettings().audio.masterVolume / 100.0f);
+                }
+
+                if (config::ImGuiCheckbox("Enable Reverb", getSettings().audio.enableReverb)) {
+                    dusk::audio::SetEnableReverb(getSettings().audio.enableReverb);
+                }
                 /*
                 // TODO: Implement additional settings
                 ImGui::Text("Main Music Volume");
@@ -78,9 +97,6 @@ namespace dusk {
                 }
                 */
 
-                audio::SetMasterVolume(getSettings().audio.masterVolume / 100.0f);
-                audio::EnableReverb = getSettings().audio.enableReverb;
-
                 ImGui::EndMenu();
             }
 

src/dusk/imgui/ImGuiMenuTools.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_horse.h"
 #include "d/d_com_inf_game.h"
+#include "dusk/dusk.h"
 #include "m_Do/m_Do_main.h"
 
 namespace dusk {
@@ -109,31 +110,31 @@ namespace dusk {
             }
             hasPrevious = true;
 
-            AuroraStats const* stats = aurora_get_stats();
+            const auto& stats = lastFrameAuroraStats;
 
             ImGuiStringViewText(
-                fmt::format(FMT_STRING("Queued pipelines:  {}\n"), stats->queuedPipelines));
+                fmt::format(FMT_STRING("Queued pipelines:  {}\n"), stats.queuedPipelines));
             ImGuiStringViewText(
-                fmt::format(FMT_STRING("Done pipelines:    {}\n"), stats->createdPipelines));
+                fmt::format(FMT_STRING("Done pipelines:    {}\n"), stats.createdPipelines));
             ImGuiStringViewText(
-                fmt::format(FMT_STRING("Draw call count:   {}\n"), stats->drawCallCount));
+                fmt::format(FMT_STRING("Draw call count:   {}\n"), stats.drawCallCount));
             ImGuiStringViewText(fmt::format(FMT_STRING("Merged draw calls: {}\n"),
-                stats->mergedDrawCallCount));
+                stats.mergedDrawCallCount));
             ImGuiStringViewText(fmt::format(FMT_STRING("Vertex size:       {}\n"),
-                BytesToString(stats->lastVertSize)));
+                BytesToString(stats.lastVertSize)));
             ImGuiStringViewText(fmt::format(FMT_STRING("Uniform size:      {}\n"),
-                BytesToString(stats->lastUniformSize)));
+                BytesToString(stats.lastUniformSize)));
             ImGuiStringViewText(fmt::format(FMT_STRING("Index size:        {}\n"),
-                BytesToString(stats->lastIndexSize)));
+                BytesToString(stats.lastIndexSize)));
             ImGuiStringViewText(fmt::format(FMT_STRING("Storage size:      {}\n"),
-                BytesToString(stats->lastStorageSize)));
+                BytesToString(stats.lastStorageSize)));
             ImGuiStringViewText(fmt::format(FMT_STRING("Tex upload size:   {}\n"),
-                BytesToString(stats->lastTextureUploadSize)));
+                BytesToString(stats.lastTextureUploadSize)));
             ImGuiStringViewText(fmt::format(
                 FMT_STRING("Total:             {}\n"),
-                BytesToString(stats->lastVertSize + stats->lastUniformSize +
-                    stats->lastIndexSize + stats->lastStorageSize +
-                    stats->lastTextureUploadSize)));
+                BytesToString(stats.lastVertSize + stats.lastUniformSize +
+                    stats.lastIndexSize + stats.lastStorageSize +
+                    stats.lastTextureUploadSize)));
 
             // TODO: persist to config
             ShowCornerContextMenu(m_debugOverlayCorner, m_cameraOverlayCorner);

src/dusk/settings.cpp

@@ -7,6 +7,7 @@ UserSettings g_userSettings = {
     .video = {
         .enableFullscreen {"video.enableFullscreen", false},
         .enableVsync {"video.enableVsync", true},
+        .lockAspectRatio {"video.lockAspectRatio", false},
     },
 
     .audio = {
@@ -66,6 +67,7 @@ void registerSettings() {
     // Video
     Register(g_userSettings.video.enableFullscreen);
     Register(g_userSettings.video.enableVsync);
+    Register(g_userSettings.video.lockAspectRatio);
 
     // Audio
     Register(g_userSettings.audio.masterVolume);

src/m_Do/m_Do_machine.cpp

@@ -1010,3 +1010,9 @@ int mDoMch_Create() {
 
     return 1;
 }
+
+#if TARGET_PC
+void mDoMch_Destroy() {
+    JFWSystem::shutdown();
+}
+#endif

src/m_Do/m_Do_main.cpp

@@ -110,6 +110,7 @@ s32 LOAD_COPYDATE(void*) {
 }
 
 AuroraInfo auroraInfo;
+AuroraStats dusk::lastFrameAuroraStats;
 const char* configPath;
 
 void main01(void) {
@@ -182,6 +183,7 @@ void main01(void) {
         VIWaitForRetrace();
 
 #if TARGET_PC
+        dusk::lastFrameAuroraStats = *aurora_get_stats();
         if (!aurora_begin_frame()) {
             DuskLog.debug("aurora_begin_frame returned false, skipping draw this frame");
             continue;
@@ -323,8 +325,8 @@ int game_main(int argc, char* argv[]) {
     config.startFullscreen = dusk::getSettings().video.enableFullscreen;
     config.windowPosX = -1;
     config.windowPosY = -1;
-    config.windowWidth = FB_WIDTH * 2;
-    config.windowHeight = FB_HEIGHT * 2;
+    config.windowWidth = defaultWindowWidth * 2;
+    config.windowHeight = defaultWindowHeight * 2;
     config.desiredBackend = ParseAuroraBackend(parsed_arg_options["backend"].as<std::string>());
     config.logCallback = &aurora_log_callback;
     config.logLevel = (AuroraLogLevel)parsed_arg_options["log-level"].as<uint8_t>();
@@ -366,6 +368,8 @@ int game_main(int argc, char* argv[]) {
     fflush(stdout);
     fflush(stderr);
 
+    mDoMch_Destroy();
+
     // Notifies all CVs and causes threads to exit
     OSResetSystem(OS_RESET_SHUTDOWN, 0, 0);