diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index afc23e2b1b22a6e22f4adcd9e89cfa154495e10b..c4d1b0fb73a7984ce18686733833b6189abbac3e 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
var
Time, Time_Delta, Time_Old: Int64;
var
Time, Time_Delta, Time_Old: Int64;
+ Frame: Int64;
flag: Boolean;
wNeedTimeReset: Boolean = false;
wMinimized: Boolean = false;
flag: Boolean;
wNeedTimeReset: Boolean = false;
wMinimized: Boolean = false;
if forceUpdate then
begin
if forceUpdate then
begin
+ e_SetRendertarget(True);
+ e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
+
DrawMenuBackground('INTER');
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
DrawMenuBackground('INTER');
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-
DrawLoadingStat();
g_Console_Draw(True);
DrawLoadingStat();
g_Console_Draw(True);
+
+ e_SetRendertarget(False);
+ e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
+ e_BlitFramebuffer(gWinSizeX, gWinSizeY);
+
sys_Repaint;
prevLoadingUpdateTime := getTimeMilli();
end;
sys_Repaint;
prevLoadingUpdateTime := getTimeMilli();
end;
if wNeedTimeReset then
begin
if wNeedTimeReset then
begin
+ Frame := 0;
Time_Delta := 28;
wNeedTimeReset := false;
end;
Time_Delta := 28;
wNeedTimeReset := false;
end;
else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
Update();
end;
else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
Update();
end;
- end
- else
- begin
- if (NetMode = NET_SERVER) then g_Net_Host_Update()
- else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
end;
if NetMode = NET_SERVER then g_Net_Flush();
end;
if NetMode = NET_SERVER then g_Net_Flush();
// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ
if flag then
// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ
if flag then
- begin
Time_Old := Time - (Time_Delta mod 28);
Time_Old := Time - (Time_Delta mod 28);
+
+ // don't wait if VSync is on, GL already probably waits enough
+ if gLerpActors then
+ flag := (Time - Frame >= gFrameTime) or gVSync;
+
+ if flag then
+ begin
if (not wMinimized) then
begin
if (not wMinimized) then
begin
+ if gPause or not gLerpActors then
+ gLerpFactor := 1.0
+ else
+ gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
Draw;
sys_Repaint
Draw;
sys_Repaint
- end
+ end;
+ Frame := Time
end
else
end
else
- begin
- sys_Delay(1) // release time slice, so we won't eat 100% CPU
- end;
+ sys_Delay(1);
e_SoundUpdate();
end;
e_SoundUpdate();
end;
mdfo.Free();
Halt(0);
end;
mdfo.Free();
Halt(0);
end;
+
+ if (arg = '--pixel-scale') or (arg = '-pixel-scale') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ if not conParseFloat(r_pixel_scale, ParamStr(idx)) then r_pixel_scale := 1.0;
+ Inc(idx);
+ end;
+ end;
end;
{$IFNDEF USE_SYSSTUB}
end;
{$IFNDEF USE_SYSSTUB}
glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
{$ELSE}
glLegacyNPOT := False;
glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
{$ELSE}
glLegacyNPOT := False;
+ glRenderToFBO := False;
{$ENDIF}
if glNPOTOverride and glLegacyNPOT then
begin
{$ENDIF}
if glNPOTOverride and glLegacyNPOT then
begin