Experimental interpolation (#309)

* Experimental 60 fps

* Fix compile error

* Fix compile error

* Fix compile error

Author: Emill

libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp

@@ -190,8 +190,12 @@ static int game_framebuffer_msaa_resolved;
 
 uint32_t gfx_msaa_level = 1;
 
+static bool has_drawn_imgui_menu;
+
 static bool dropped_frame;
 
+static const std::unordered_map<Mtx *, MtxF> *current_mtx_replacements;
+
 static float buf_vbo[MAX_BUFFERED * (32 * 3)]; // 3 vertices in a triangle and 32 floats per vtx
 static size_t buf_vbo_len;
 static size_t buf_vbo_num_tris;
@@ -916,20 +920,31 @@ static void gfx_matrix_mul(float res[4][4], const float a[4][4], const float b[4
 
 static void gfx_sp_matrix(uint8_t parameters, const int32_t *addr) {
     float matrix[4][4];
+
+    if (auto it = current_mtx_replacements->find((Mtx *)addr); it != current_mtx_replacements->end()) {
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j++) {
+                float v = it->second.mf[i][j];
+                int as_int = (int)(v * 65536.0f);
+                matrix[i][j] = as_int * (1.0f / 65536.0f);
+            }
+        }
+    } else {
 #ifndef GBI_FLOATS
-    // Original GBI where fixed point matrices are used
-    for (int i = 0; i < 4; i++) {
-        for (int j = 0; j < 4; j += 2) {
-            int32_t int_part = addr[i * 2 + j / 2];
-            uint32_t frac_part = addr[8 + i * 2 + j / 2];
-            matrix[i][j] = (int32_t)((int_part & 0xffff0000) | (frac_part >> 16)) / 65536.0f;
-            matrix[i][j + 1] = (int32_t)((int_part << 16) | (frac_part & 0xffff)) / 65536.0f;
+        // Original GBI where fixed point matrices are used
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j += 2) {
+                int32_t int_part = addr[i * 2 + j / 2];
+                uint32_t frac_part = addr[8 + i * 2 + j / 2];
+                matrix[i][j] = (int32_t)((int_part & 0xffff0000) | (frac_part >> 16)) / 65536.0f;
+                matrix[i][j + 1] = (int32_t)((int_part << 16) | (frac_part & 0xffff)) / 65536.0f;
+            }
         }
-    }
 #else
-    // For a modified GBI where fixed point values are replaced with floats
-    memcpy(matrix, addr, sizeof(matrix));
+        // For a modified GBI where fixed point values are replaced with floats
+        memcpy(matrix, addr, sizeof(matrix));
 #endif
+    }
 
     if (parameters & G_MTX_PROJECTION) {
         if (parameters & G_MTX_LOAD) {
@@ -2708,6 +2723,7 @@ void gfx_start_frame(void) {
     gfx_wapi->handle_events();
     gfx_wapi->get_dimensions(&gfx_current_window_dimensions.width, &gfx_current_window_dimensions.height);
     SohImGui::DrawMainMenuAndCalculateGameSize();
+    has_drawn_imgui_menu = true;
     if (gfx_current_dimensions.height == 0) {
         // Avoid division by zero
         gfx_current_dimensions.height = 1;
@@ -2746,7 +2762,7 @@ void gfx_start_frame(void) {
     fbActive = 0;
 }
 
-void gfx_run(Gfx *commands) {
+void gfx_run(Gfx *commands, const std::unordered_map<Mtx *, MtxF>& mtx_replacements) {
     gfx_sp_reset();
 
     //puts("New frame");
@@ -2755,12 +2771,21 @@ void gfx_run(Gfx *commands) {
 
     if (!gfx_wapi->start_frame()) {
         dropped_frame = true;
-        SohImGui::DrawFramebufferAndGameInput();
-        SohImGui::CancelFrame();
+        if (has_drawn_imgui_menu) {
+            SohImGui::DrawFramebufferAndGameInput();
+            SohImGui::CancelFrame();
+            has_drawn_imgui_menu = false;
+        }
         return;
     }
     dropped_frame = false;
 
+    if (!has_drawn_imgui_menu) {
+        SohImGui::DrawMainMenuAndCalculateGameSize();
+    }
+
+    current_mtx_replacements = &mtx_replacements;
+
     double t0 = gfx_wapi->get_time();
     gfx_rapi->update_framebuffer_parameters(0, gfx_current_window_dimensions.width, gfx_current_window_dimensions.height, 1, false, true, true, !game_renders_to_framebuffer);
     gfx_rapi->start_frame();
@@ -2792,6 +2817,7 @@ void gfx_run(Gfx *commands) {
     //printf("Process %f %f\n", t1, t1 - t0);
     gfx_rapi->end_frame();
     gfx_wapi->swap_buffers_begin();
+    has_drawn_imgui_menu = false;
 }
 
 void gfx_end_frame(void) {

libultraship/libultraship/Lib/Fast3D/gfx_pc.h

@@ -6,6 +6,8 @@
 #include <unordered_map>
 #include <list>
 
+#include "U64/PR/ultra64/types.h"
+
 struct GfxRenderingAPI;
 struct GfxWindowManagerAPI;
 
@@ -52,26 +54,24 @@ struct TextureCacheValue {
 #endif
 };
 
-#ifdef __cplusplus
 extern "C" {
-#endif
+
 extern struct GfxDimensions gfx_current_window_dimensions; // The dimensions of the window
 extern struct GfxDimensions gfx_current_dimensions; // The dimensions of the draw area the game draws to, before scaling (if applicable)
 extern struct XYWidthHeight gfx_current_game_window_viewport; // The area of the window the game is drawn to, (0, 0) is top-left corner
 extern uint32_t gfx_msaa_level;
 
+}
+
 void gfx_init(struct GfxWindowManagerAPI* wapi, struct GfxRenderingAPI* rapi, const char* game_name, bool start_in_fullscreen);
 struct GfxRenderingAPI* gfx_get_current_rendering_api(void);
 void gfx_start_frame(void);
-void gfx_run(Gfx* commands);
+void gfx_run(Gfx* commands, const std::unordered_map<Mtx*, MtxF>& mtx_replacements);
 void gfx_end_frame(void);
 void gfx_set_framedivisor(int);
 void gfx_texture_cache_clear();
-int gfx_create_framebuffer(uint32_t width, uint32_t height);
+extern "C" int gfx_create_framebuffer(uint32_t width, uint32_t height);
 void gfx_get_pixel_depth_prepare(float x, float y);
 uint16_t gfx_get_pixel_depth(float x, float y);
 
-#ifdef __cplusplus
-}
-#endif
 #endif

libultraship/libultraship/SohImGuiImpl.cpp

@@ -681,6 +681,7 @@ namespace SohImGui {
 
                 EXPERIMENTAL();
 
+                EnhancementCheckbox("60 fps interpolation", "g60FPS");
                 EnhancementCheckbox("Disable LOD", "gDisableLOD");
 
                 ImGui::EndMenu();

libultraship/libultraship/Window.cpp

@@ -282,8 +282,12 @@ namespace Ship {
         gfx_start_frame();
     }
 
-    void Window::RunCommands(Gfx* Commands) {
-        gfx_run(Commands);
+    void Window::RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements) {
+        for (const auto& m : mtx_replacements) {
+            gfx_run(Commands, m);
+            gfx_end_frame();
+        }
+        gfx_run(Commands, {});
         gfx_end_frame();
     }
 

libultraship/libultraship/Window.h

@@ -19,7 +19,7 @@ namespace Ship {
 			void MainLoop(void (*MainFunction)(void));
 			void Init();
 			void StartFrame();
-			void RunCommands(Gfx* Commands);
+			void RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements);
 			void SetFrameDivisor(int divisor);
 			void GetPixelDepthPrepare(float x, float y);
 			uint16_t GetPixelDepth(float x, float y);

soh/include/macros.h

@@ -138,6 +138,8 @@ extern GraphicsContext* __gfxCtx;
 #ifndef NDEBUG
 #define OPEN_DISPS(gfxCtx, file, line) \
     { \
+        void FrameInterpolation_RecordOpenChild(const void* a, int b); \
+        FrameInterpolation_RecordOpenChild(file, line); \
         GraphicsContext* __gfxCtx; \
         Gfx* dispRefs[4]; \
         __gfxCtx = gfxCtx; \
@@ -146,18 +148,24 @@ extern GraphicsContext* __gfxCtx;
 #else
 #define OPEN_DISPS(gfxCtx, file, line) \
     { \
+        void FrameInterpolation_RecordOpenChild(const void* a, int b); \
+        FrameInterpolation_RecordOpenChild(file, line); \
         GraphicsContext* __gfxCtx; \
         __gfxCtx = gfxCtx; \
         (void)__gfxCtx;
 #endif
 
 #ifndef NDEBUG
 #define CLOSE_DISPS(gfxCtx, file, line) \
+    {void FrameInterpolation_RecordCloseChild(void); \
+    FrameInterpolation_RecordCloseChild();} \
     Graph_CloseDisps(dispRefs, gfxCtx, file, line); \
     } \
     (void)0
 #else
 #define CLOSE_DISPS(gfxCtx, file, line) \
+    {void FrameInterpolation_RecordCloseChild(void); \
+    FrameInterpolation_RecordCloseChild();} \
     (void)0; \
     } \
     (void)0

soh/include/z64effect.h

@@ -225,6 +225,7 @@ typedef struct EffectSs {
     /* 0x5C */ s16 life; // -1 means this entry is free
     /* 0x5E */ u8 priority; // Lower value means higher priority
     /* 0x5F */ u8 type;
+    u32 epoch;
 } EffectSs; // size = 0x60
 
 typedef struct {

soh/soh.vcxproj

@@ -173,6 +173,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="soh\frame_interpolation.cpp" />
     <ClCompile Include="soh\Enhancements\bootcommands.c" />
     <ClCompile Include="soh\Enhancements\debugconsole.cpp" />
     <ClCompile Include="soh\Enhancements\debugger\colViewer.cpp" />
@@ -878,6 +879,7 @@
     <ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="soh\frame_interpolation.h" />
     <ClInclude Include="include\alloca.h" />
     <ClInclude Include="include\bgm.h" />
     <ClInclude Include="include\color.h" />

soh/soh.vcxproj.filters

@@ -2186,6 +2186,8 @@
     </ClCompile>
     <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp">
       <Filter>Source Files\soh\Enhancements\debugger</Filter>
+    <ClCompile Include="soh\frame_interpolation.cpp">
+      <Filter>Source Files\soh</Filter>
     </ClCompile>
     <ClCompile Include="src\code\z_cheap_proc.c">
       <Filter>Source Files</Filter>
@@ -3748,6 +3750,8 @@
     </ClInclude>
     <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h">
       <Filter>Header Files\soh\Enhancements\debugger</Filter>
+    <ClInclude Include="soh\frame_interpolation.h">
+      <Filter>Header Files\soh</Filter>
     </ClInclude>
     <ClInclude Include="soh\Enhancements\savestates.h">
       <Filter>Source Files\soh\Enhancements</Filter>

soh/soh/Enhancements/debugger/colViewer.cpp

@@ -1,6 +1,7 @@
 #include "colViewer.h"
 #include "../libultraship/SohImGuiImpl.h"
 #include "ImGuiHelpers.h"
+#include "../../frame_interpolation.h"
 
 #include <vector>
 #include <string>