Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match GameWindow 100% #339

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Match GameWindow 100% #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 64 additions & 95 deletions src/GameWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ RenderResult GameWindow::Render()
LOOP_USING_GOTO_BECAUSE_WHY_NOT:
if (g_Supervisor.cfg.frameskipConfig <= this->curFrame)
{
if ((((g_Supervisor.cfg.opts >> GCOS_DISPLAY_MINIMUM_GRAPHICS) & 1) |
((g_Supervisor.cfg.opts >> GCOS_CLEAR_BACKBUFFER_ON_REFRESH) & 1)) != 0)
if (g_Supervisor.IsUnknown())
{
viewport.X = 0;
viewport.Y = 0;
Expand Down Expand Up @@ -73,111 +72,89 @@ RenderResult GameWindow::Render()
this->curFrame++;
}

if (g_Supervisor.cfg.windowed == false)
if (g_Supervisor.cfg.windowed != false || g_Supervisor.ShouldRunAt60Fps())
{
i32 bVar1;
if (!(((g_Supervisor.cfg.opts >> GCOS_FORCE_60FPS & 1) == 0) || (g_Supervisor.vsyncEnabled == 0)))
if (this->curFrame != 0)
{
bVar1 = true;
}
else
{
bVar1 = false;
}
if (!bVar1)
goto BREAK_BUT_WITHOUT_BREAK_BECAUSE_IM_USING_A_GOTO_BASED_LOOP;
}
if (this->curFrame != 0)
{
g_Supervisor.framerateMultiplier = 1.0;
timeBeginPeriod(1);
slowdown = timeGetTime();
if (slowdown < g_LastFrameTime)
{
g_LastFrameTime = slowdown;
}
local_34 = fabs(slowdown - g_LastFrameTime);
timeEndPeriod(1);
if (local_34 >= FRAME_TIME)
{
do
g_Supervisor.framerateMultiplier = 1.0;
timeBeginPeriod(1);
slowdown = timeGetTime();
if (slowdown < g_LastFrameTime)
{
g_LastFrameTime = slowdown;
}
local_34 = fabs(slowdown - g_LastFrameTime);
timeEndPeriod(1);
if (local_34 >= FRAME_TIME)
{
g_LastFrameTime += FRAME_TIME;
local_34 -= FRAME_TIME;
} while (local_34 >= FRAME_TIME);
do
{
g_LastFrameTime += FRAME_TIME;
local_34 -= FRAME_TIME;
} while (local_34 >= FRAME_TIME);

if (g_Supervisor.cfg.frameskipConfig < this->curFrame)
goto I_HAVE_NO_CLUE_WHY_BUT_I_MUST_JUMP_HERE;
goto LOOP_USING_GOTO_BECAUSE_WHY_NOT;
if (g_Supervisor.cfg.frameskipConfig < this->curFrame)
goto I_HAVE_NO_CLUE_WHY_BUT_I_MUST_JUMP_HERE;
goto LOOP_USING_GOTO_BECAUSE_WHY_NOT;
}
}
}

BREAK_BUT_WITHOUT_BREAK_BECAUSE_IM_USING_A_GOTO_BASED_LOOP:
if (g_Supervisor.cfg.windowed == false)
if (g_Supervisor.cfg.windowed == false && !g_Supervisor.ShouldRunAt60Fps())
{
i32 bVar2;
if (!(((g_Supervisor.cfg.opts >> GCOS_FORCE_60FPS & 1) == 0) || (g_Supervisor.vsyncEnabled == 0)))
{
bVar2 = true;
}
else

if (g_Supervisor.cfg.frameskipConfig >= this->curFrame)
{
bVar2 = false;
Present();
goto LOOP_USING_GOTO_BECAUSE_WHY_NOT;
}
if (!bVar2)
{
if (g_Supervisor.cfg.frameskipConfig >= this->curFrame)
{
Present();
goto LOOP_USING_GOTO_BECAUSE_WHY_NOT;
}

I_HAVE_NO_CLUE_WHY_BUT_I_MUST_JUMP_HERE:
Present();
if (g_Supervisor.framerateMultiplier == 0.f)
I_HAVE_NO_CLUE_WHY_BUT_I_MUST_JUMP_HERE:
Present();
if (g_Supervisor.framerateMultiplier == 0.f)
{
if (2 <= g_TickCountToEffectiveFramerate)
{
if (2 <= g_TickCountToEffectiveFramerate)
timeBeginPeriod(1);
curtime = timeGetTime();
if (curtime < g_Supervisor.lastFrameTime)
{
timeBeginPeriod(1);
curtime = timeGetTime();
if (curtime < g_Supervisor.lastFrameTime)
{
g_Supervisor.lastFrameTime = curtime;
}
delta = curtime - g_Supervisor.lastFrameTime;
delta = (delta * 60.) / 2. / 1000.;
delta /= (g_Supervisor.cfg.frameskipConfig + 1);
if (delta >= .865)
{
delta = 1.0;
}
else if (delta >= .6)
{
delta = 0.8;
}
else
{
delta = 0.5;
}
g_Supervisor.effectiveFramerateMultiplier = delta;
g_Supervisor.lastFrameTime = curtime;
timeEndPeriod(1);
g_TickCountToEffectiveFramerate = 0;
}
delta = curtime - g_Supervisor.lastFrameTime;
delta = (delta * 60.) / 2. / 1000.;
delta /= (g_Supervisor.cfg.frameskipConfig + 1);
if (delta >= .865)
{
delta = 1.0;
}
else if (delta >= .6)
{
delta = 0.8;
}
else
{
delta = 0.5;
}
g_Supervisor.effectiveFramerateMultiplier = delta;
g_Supervisor.lastFrameTime = curtime;
timeEndPeriod(1);
g_TickCountToEffectiveFramerate = 0;
}
else
{
g_Supervisor.effectiveFramerateMultiplier = g_Supervisor.framerateMultiplier;
}
this->curFrame = 0;
g_TickCountToEffectiveFramerate = g_TickCountToEffectiveFramerate + 1;
}
else
{
g_Supervisor.effectiveFramerateMultiplier = g_Supervisor.framerateMultiplier;
}
this->curFrame = 0;
g_TickCountToEffectiveFramerate = g_TickCountToEffectiveFramerate + 1;
}
return RENDER_RESULT_KEEP_RUNNING;
}

void GameWindow::Present(void)
void GameWindow::Present()
{
i32 unused;
if (g_Supervisor.d3dDevice->Present(NULL, NULL, NULL, NULL) < 0)
{
g_AnmManager->ReleaseSurfaces();
Expand Down Expand Up @@ -468,16 +445,8 @@ i32 GameWindow::InitD3dRendering(void)
GameErrorContext::Log(&g_GameErrorContext, TH_ERR_NO_SUPPORT_FOR_D3DTEXOPCAPS_ADD);
g_Supervisor.cfg.opts = g_Supervisor.cfg.opts | (1 << GCOS_USE_D3D_HW_TEXTURE_BLENDING);
}
u32 should_run_at_60_fps;
if ((((g_Supervisor.cfg.opts >> GCOS_FORCE_60FPS) & 1) != 0) && (g_Supervisor.vsyncEnabled != 0))
{
should_run_at_60_fps = true;
}
else
{
should_run_at_60_fps = false;
}
if (should_run_at_60_fps && ((g_Supervisor.d3dCaps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) == 0))
if (g_Supervisor.ShouldRunAt60Fps() &&
((g_Supervisor.d3dCaps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) == 0))
{
GameErrorContext::Log(&g_GameErrorContext, TH_ERR_CANT_FORCE_60FPS_NO_ASYNC_FLIP);
g_Supervisor.cfg.opts = g_Supervisor.cfg.opts & ~(1 << GCOS_FORCE_60FPS);
Expand Down
5 changes: 5 additions & 0 deletions src/Supervisor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ struct Supervisor
this->cfg.opts >> GCOS_DISPLAY_MINIMUM_GRAPHICS & 1;
}

u32 ShouldRunAt60Fps()
{
return (this->cfg.opts >> GCOS_FORCE_60FPS & 1) && this->vsyncEnabled;
}

HINSTANCE hInstance;
PDIRECT3D8 d3dIface;
PDIRECT3DDEVICE8 d3dDevice;
Expand Down