diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 3ea192bd998ede79b04215dec5bb09251afb2ab4..0649801b4c86fe66fc1fb5e3ec59dd5e59e35e09 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
function SDLMain (): Integer;
procedure ResetTimer ();
-procedure ProcessLoading (forceUpdate: Boolean=false);
+procedure ProcessLoading (forceUpdate: Boolean = False);
var
- gwin_dump_extensions: Boolean = false;
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
g_dbg_aimline_on: Boolean = false;
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, xprofiler,
- g_touch, g_gui, g_system;
+ g_touch, g_gui, g_system, g_netmaster;
const
var
Time, Time_Delta, Time_Old: Int64;
+ Frame: Int64;
flag: Boolean;
wNeedTimeReset: Boolean = false;
wMinimized: Boolean = false;
prevLoadingUpdateTime: UInt64 = 0;
{$ENDIF}
-procedure ProcessLoading (forceUpdate: Boolean=false);
+procedure ProcessLoading (forceUpdate: Boolean);
{$IFNDEF HEADLESS}
var
stt: UInt64;
if forceUpdate then
begin
+ e_SetRendertarget(True);
+ e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
+
DrawMenuBackground('INTER');
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-
DrawLoadingStat();
g_Console_Draw(True);
+
+ e_SetRendertarget(False);
+ e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
+ e_BlitFramebuffer(gWinSizeX, gWinSizeY);
+
sys_Repaint;
prevLoadingUpdateTime := getTimeMilli();
end;
e_SoundUpdate();
- if NetMode = NET_SERVER then
- begin
- g_Net_Host_Update();
- end
- else
- begin
- if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
- end;
+ // TODO: At the moment, I left here only host network processing, because the client code must
+ // handle network events on its own. Otherwise separate network cases that use different calls to
+ // enet_host_service() WILL lose their packets (for example, resource downloading). So they have
+ // to handle everything by themselves. But in general, this MUST be removed completely, since
+ // updating the window should never affect the network. Use single enet_host_service(), period.
+ if NetMode = NET_SERVER
+ then g_Net_Host_Update();
end;
if wNeedTimeReset then
begin
+ Frame := 0;
Time_Delta := 28;
wNeedTimeReset := false;
end;
begin
flag := true;
for i := 1 to t do
- begin
- if (NetMode = NET_SERVER) then g_Net_Host_Update()
- 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();
-
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ
if flag then
- begin
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 gPause or (not gLerpActors) or (gState = STATE_FOLD) then
+ gLerpFactor := 1.0
+ else
+ gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
Draw;
sys_Repaint
- end
+ end;
+ Frame := Time
end
else
- begin
- sys_Delay(1) // release time slice, so we won't eat 100% CPU
- end;
+ sys_Delay(1);
e_SoundUpdate();
end;
function GLExtensionList (): SSArray;
- var s: PChar; i, j, num: GLint;
+var
+ s: PChar;
+ i, j, num: GLint;
begin
result := nil;
s := glGetString(GL_EXTENSIONS);
if s <> nil then
begin
- num := 0; i := 0; j := 0;
- while s[i] <> #0 do
+ num := 0;
+ i := 0;
+ j := 0;
+ while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
+ while (s[i] <> #0) do
begin
while (s[i] <> #0) and (s[i] <> ' ') do Inc(i);
- SetLength(result, num + 1);
- result[num] := Copy(s, j, i - j);
+ SetLength(result, num+1);
+ result[num] := Copy(s, j+1, i-j);
while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
j := i;
- Inc(num)
- end
- end
+ Inc(num);
+ end;
+ end;
end;
function GLExtensionSupported (ext: AnsiString): Boolean;
- var i, len: GLint; exts: SSArray;
+var
+ exts: SSArray;
+ e: AnsiString;
begin
result := false;
exts := GLExtensionList();
- if exts <> nil then
+ for e in exts do
begin
- i := 0; len := Length(exts);
- while (i < len) and (exts[i] <> ext) do Inc(i);
- result := i < len
- end
+ //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext));
+ if (strEquCI1251(e, ext)) then begin result := true; exit; end;
+ end;
end;
procedure PrintGLSupportedExtensions;
begin
arg := ParamStr(idx);
Inc(idx);
- if arg = '--opengl-dump-exts' then gwin_dump_extensions := true;
- //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
if arg = '--jah' then g_profile_history_size := 100;
if arg = '--no-particles' then gpart_dbg_enabled := false;
if arg = '--no-los' then gmon_dbg_los_enabled := false;
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;
-{$IFDEF USE_SYSSTUB}
+{$IFNDEF USE_SYSSTUB}
PrintGLSupportedExtensions;
- glLegacyNPOT := GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot');
+ glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
{$ELSE}
glLegacyNPOT := False;
+ glRenderToFBO := False;
{$ENDIF}
- e_logWritefln('NPOT textures: %s', [glLegacyNPOT]);
- gwin_dump_extensions := false;
+ if glNPOTOverride and glLegacyNPOT then
+ begin
+ glLegacyNPOT := true;
+ e_logWriteln('NPOT texture emulation: FORCED');
+ end
+ else
+ begin
+ if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
+ else e_logWriteln('NPOT texture emulation: disabled');
+ end;
Init;
Time_Old := sys_GetTicks();
+ g_Net_InitLowLevel();
+
// Êîìàíäíàÿ ñòðîêà
if (ParamCount > 0) then g_Game_Process_Params();
// main loop
while not ProcessMessage() do begin end;
+ g_Net_Slist_ShutdownAll();
+
Release();
+
+ g_Net_DeinitLowLevel();
result := 0;
end;