move dropped frame handling to port side

HarbourMasters · Jan 9, 2025 · da0ccef · da0ccef
1 parent cb4f0cf
commit da0ccef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/libultraship b/libultraship
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -1360,20 +1360,31 @@ extern "C" void Graph_StartFrame() {
         CVarClear(CVAR_NEW_FILE_DROPPED);
         CVarClear(CVAR_DROPPED_FILE);
     }
-
-    // OTRGlobals::Instance->context->GetWindow()->StartFrame();
 }
 
 void RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements) {
     auto wnd = OTRGlobals::Instance->context->GetWindow();
     auto gui = wnd->GetGui();
 
+    // Process window events for resize, mouse, keyboard events
+    wnd->HandleEvents();
+
     for (const auto& m : mtx_replacements) {
+        // Skip dropped frames
+        if (!wnd->IsFrameReady()) {
+            continue;
+        }
+
+        // Setup of the backend frames and draw initial Window and GUI menus
         gui->StartDraw();
+        // Setup game framebuffers to match available window space
         wnd->StartFrame();
+        // Execute the games gfx commands
         gfx_run(Commands, m);
+        // Renders the game frame buffer to the final window and finishes the GUI
         gui->EndDraw();
-        gfx_end_frame();
+        // Finialize swap buffers
+        wnd->EndFrame();
     }
 }
+9 −0		src/graphic/Fast3D/Fast3dWindow.cpp
+2 −0		src/graphic/Fast3D/Fast3dWindow.h
+2 −2		src/graphic/Fast3D/gfx_dxgi.cpp
+12 −19		src/graphic/Fast3D/gfx_pc.cpp
+2 −0		src/graphic/Fast3D/gfx_pc.h
+2 −2		src/graphic/Fast3D/gfx_sdl2.cpp
+1 −1		src/graphic/Fast3D/gfx_window_manager_api.h
+2 −0		src/window/Window.h