HarbourMasters · NEstelami · Mar 13, 2025 · Mar 14, 2025 · Mar 14, 2025 · Mar 14, 2025
diff --git a/libultraship b/libultraship
diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp
@@ -324,6 +324,11 @@ extern "C" uint32_t Ship_GetInterpolationFPS() {
     return OTRGlobals::Instance->GetInterpolationFPS();
 }
 
+// Numer of interpolated frames
+extern "C" uint32_t Ship_GetInterpolationFrameCount() {
+    return ceil((float)Ship_GetInterpolationFPS() / 20.0f);
+}
+
 struct ExtensionEntry {
     std::string path;
     std::string ext;
@@ -928,8 +933,11 @@ void RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>
     // Process window events for resize, mouse, keyboard events
     wnd->HandleEvents();
 
+    gInterpolationIndex = 0;
+
     for (const auto& m : mtx_replacements) {
         wnd->DrawAndRunGraphicsCommands(Commands, m);
+        gInterpolationIndex++;
     }
 }
 

diff --git a/mm/2s2h/BenPort.h b/mm/2s2h/BenPort.h
@@ -137,6 +137,7 @@ void Controller_UnblockGameInput();
 void Overlay_DisplayText(float duration, const char* text);
 void Overlay_DisplayText_Seconds(int seconds, const char* text);
 uint32_t Ship_GetInterpolationFPS();
+uint32_t Ship_GetInterpolationFrameCount();
 
 void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement);
 void Gfx_UnregisterBlendedTexture(const char* name);
+4 −0		CMakeLists.txt
+2 −0		cmake/cvars.cmake
+4 −13		cmake/dependencies/common.cmake
+61 −0		cmake/dependencies/git-patch.cmake
+14 −0		cmake/dependencies/windows-vcpkg.cmake
+0 −15		cmake/dependencies/windows.cmake
+14 −0		include/libultraship/libultra/gbi.h
+8 −0		src/audio/AudioPlayer.cpp
+6 −0		src/audio/AudioPlayer.h
+3 −3		src/audio/SDLAudioPlayer.cpp
+1 −0		src/audio/SDLAudioPlayer.h
+36 −15		src/audio/WasapiAudioPlayer.cpp
+1 −0		src/audio/WasapiAudioPlayer.h
+13 −0		src/config/Config.cpp
+1 −0		src/config/Config.h
+55 −15		src/graphic/Fast3D/gfx_dxgi.cpp
+1 −0		src/graphic/Fast3D/gfx_dxgi.h
+70 −28		src/graphic/Fast3D/gfx_pc.cpp
+7 −4		src/graphic/Fast3D/gfx_pc.h
+6 −6		src/graphic/Fast3D/gfx_sdl2.cpp
+3 −0		src/graphic/Fast3D/lus_gbi.h
+19 −0		src/public/bridge/audiobridge.cpp
+4 −0		src/public/bridge/audiobridge.h
+0 −1		src/resource/File.h
+18 −2		src/resource/factory/DisplayListFactory.cpp
+1 −1		src/resource/factory/ShaderFactory.cpp