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

include/d/actor/d_a_npc_henna.h

@@ -32,8 +32,7 @@ public:
     /* 0x620 */ s16 field_0x620;
     /* 0x624 */ mDoExt_McaMorf* mpMorf;
     /* 0x628 */ mDoExt_btkAnm* mpBtkAnms[3];
-    /* 0x634 */ mDoExt_btpAnm* mpBtpAnms[3];
-    /* 0x640 */ u8 field_0x640[0x654 - 0x640];
+    /* 0x634 */ mDoExt_btpAnm* mpBtpAnms[8];
     /* 0x654 */ s32 field_0x654;
     /* 0x658 */ s32 field_0x658;
     /* 0x65C */ s32 mAnmResIndex;

include/d/d_com_inf_game.h

@@ -4847,7 +4847,14 @@ inline void dComIfGd_drawXluListDark() {
 
 inline void dComIfGd_drawXluListInvisible() {
     ZoneScoped;
-    g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
+#ifdef TARGET_PC
+    // FIXME: Water rendering hack for frame interpolation
+    if (!dusk::getSettings().game.enableFrameInterpolation) {
+#endif
+        g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
+#ifdef TARGET_PC
+    }
+#endif
 }
 
 inline void dComIfGd_drawOpaListInvisible() {

include/dusk/frame_interpolation.h

@@ -0,0 +1,34 @@
+#ifndef DUSK_FRAME_INTERP_H
+#define DUSK_FRAME_INTERP_H
+
+#include <dolphin/mtx.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+namespace dusk {
+namespace frame_interp {
+
+void ensure_initialized();
+
+void begin_record();
+void end_record();
+void interpolate(float step);
+void notify_sim_tick_complete();
+uint32_t begin_presentation_ui_pass();
+uint32_t get_presentation_ui_advance_ticks();
+void end_presentation_ui_pass();
+
+void open_child(const void* key, int32_t id);
+void close_child();
+void record_final_mtx_raw(const Mtx* dest, const Mtx src);
+
+bool lookup_replacement(const void* source, Mtx out);
+bool lookup_concat_replacement(const void* lhs, const void* rhs, Mtx out);
+
+}  // namespace frame_interp
+}  // namespace dusk
+#endif
+
+#endif

include/dusk/settings.h

@@ -53,6 +53,7 @@ struct UserSettings {
         // Graphics
         ConfigVar<bool> enableBloom;
         ConfigVar<bool> useWaterProjectionOffset;
+        ConfigVar<bool> enableFrameInterpolation;
 
         // Audio
         ConfigVar<bool> noLowHpSound;

include/m_Do/m_Do_graphic.h

@@ -237,6 +237,7 @@ public:
     static void* getZbufferTex() { return mZbufferTex; }
     static void setFadeRate(f32 rate) { mFadeRate = rate; }
     static f32 getFadeRate() { return mFadeRate; }
+    static f32 getFadeSpeed() { return mFadeSpeed; }
     static bloom_c* getBloom() { return &m_bloom; }
     static GXColor& getFadeColor() { return mFadeColor; }
     static GXColor& getBackColor() { return mBackColor; }