Merge remote-tracking branch 'refs/remotes/origin/main' into unhackify-widescreen

# Conflicts:
#	src/m_Do/m_Do_main.cpp
This commit is contained in:
Luke Street
2026-04-17 23:12:58 -06:00
36 changed files with 408 additions and 299 deletions
+13 -17
View File
@@ -42,7 +42,6 @@
#include "SSystem/SComponent/c_counter.h"
#include <cstring>
#include <chrono>
#include <filesystem>
#include <system_error>
#include <thread>
@@ -51,6 +50,7 @@
#include "dusk/crash_reporting.h"
#include "dusk/dusk.h"
#include "dusk/frame_interpolation.h"
#include "dusk/game_clock.h"
#include "dusk/gyro.h"
#include "dusk/imgui/ImGuiEngine.hpp"
#include "dusk/logging.h"
@@ -197,9 +197,7 @@ void main01(void) {
OSReport("Entering Main Loop (main01)...\n");
constexpr float kSimStepSeconds = 1.0 / 30.0;
auto previous_time = std::chrono::steady_clock::now();
float accumulator = kSimStepSeconds;
dusk::game_clock::ensure_initialized();
do {
// 1. Update Window Events
@@ -223,10 +221,7 @@ void main01(void) {
eventsDone:;
auto current_time = std::chrono::steady_clock::now();
float frame_seconds = std::chrono::duration<float>(current_time - previous_time).count();
previous_time = current_time;
accumulator += frame_seconds;
const dusk::game_clock::MainLoopPacer pacing = dusk::game_clock::advance_main_loop();
VIWaitForRetrace();
@@ -238,26 +233,27 @@ void main01(void) {
mDoGph_gInf_c::updateRenderSize();
if (dusk::getSettings().game.enableFrameInterpolation && !dusk::getTransientSettings().skipFrameRateLimit) {
dusk::frame_interp::notify_presentation_frame();
if (accumulator >= kSimStepSeconds) {
if (pacing.is_interpolating) {
if (pacing.do_sim_tick) {
dusk::frame_interp::set_ui_tick_pending(true);
mDoCPd_c::read();
dusk::gyro::read(kSimStepSeconds);
dusk::gyro::read(pacing.sim_pace);
fapGm_Execute();
mDoAud_Execute();
accumulator = 0.0f;
dusk::game_clock::reset_accumulator();
}
dusk::frame_interp::interpolate(static_cast<float>(accumulator / kSimStepSeconds));
dusk::frame_interp::interpolate(pacing.interpolation_step);
{
dusk::frame_interp::PresentationCameraScope presentation_camera;
cAPIGph_Painter();
}
dusk::frame_interp::set_ui_tick_pending(false);
} else {
accumulator = 0.0f;
dusk::frame_interp::set_ui_tick_pending(true);
// Game Inputs
mDoCPd_c::read();
dusk::gyro::read(frame_seconds);
dusk::gyro::read(pacing.presentation_dt_seconds);
// EXECUTE GAME LOGIC & RENDER
// This calls mDoGph_Painter -> JFWDisplay -> GX Functions