X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=4e84b5d53eb9823a4b5234c44a38cbbc99ca9077;hb=b5f0859173cc97002614f9c39da49e719b3571cb;hp=6491048c5f94e6406461aea3bdc99c8403fa4671;hpb=a4da798da0df5a8d54bdfe1d9563e1b254b697e7;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 6491048..4e84b5d 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -25,7 +25,6 @@ procedure ResetTimer (); 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; @@ -38,23 +37,18 @@ uses {$IFDEF ENABLE_HOLMES} g_holmes, sdlcarcass, fui_ctls, {$ENDIF} -{$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, MAPDEF, Math, - e_graphics, e_log, e_texture, g_main, - g_console, e_input, g_options, g_game, + r_window, e_log, g_main, + g_console, r_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; - - -const - ProgressUpdateMSecs = 35; //1;//100; + g_touch, g_gui, g_system, g_netmaster; var Time, Time_Delta, Time_Old: Int64; + Frame: Int64; flag: Boolean; wNeedTimeReset: Boolean = false; - wMinimized: Boolean = false; wLoadingQuit: Boolean = false; procedure ResetTimer (); @@ -62,52 +56,21 @@ begin wNeedTimeReset := true; end; -{$IFNDEF HEADLESS} -var - prevLoadingUpdateTime: UInt64 = 0; -{$ENDIF} - procedure ProcessLoading (forceUpdate: Boolean=false); -{$IFNDEF HEADLESS} -var - stt: UInt64; -{$ENDIF} begin if sys_HandleInput() = True then Exit; {$IFNDEF HEADLESS} - if not wMinimized then - begin - if not forceUpdate then - begin - stt := getTimeMilli(); - forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs); - end; - - if forceUpdate then - begin - DrawMenuBackground('INTER'); - e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); - - DrawLoadingStat(); - g_Console_Draw(True); - sys_Repaint; - prevLoadingUpdateTime := getTimeMilli(); - end; - end; + r_Window_DrawLoading(forceUpdate); {$ENDIF} 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; + g_Net_Host_Update() + else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then + g_Net_Client_UpdateWhileLoading(); end; @@ -124,6 +87,7 @@ begin if wNeedTimeReset then begin + Frame := 0; Time_Delta := 28; wNeedTimeReset := false; end; @@ -136,20 +100,9 @@ begin 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(); @@ -167,62 +120,26 @@ begin // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ if flag then - begin Time_Old := Time - (Time_Delta mod 28); - if (not wMinimized) then - begin - Draw; - sys_Repaint - end - end - else - begin - sys_Delay(1) // release time slice, so we won't eat 100% CPU - end; - e_SoundUpdate(); -end; + // don't wait if VSync is on, GL already probably waits enough + if gLerpActors then + flag := (Time - Frame >= gFrameTime) or gVSync; -function GLExtensionList (): SSArray; - 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 - begin - while (s[i] <> #0) and (s[i] <> ' ') do Inc(i); - SetLength(result, num + 1); - result[num] := Copy(s, j, i - j); - while (s[i] <> #0) and (s[i] = ' ') do Inc(i); - j := i; - Inc(num) - end - end -end; - -function GLExtensionSupported (ext: AnsiString): Boolean; - var i, len: GLint; exts: SSArray; -begin - result := false; - exts := GLExtensionList(); - if exts <> nil then + if flag then begin - i := 0; len := Length(exts); - while (i < len) and (exts[i] <> ext) do Inc(i); - result := i < len + 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; + Frame := Time end -end; + else + sys_Delay(1); -procedure PrintGLSupportedExtensions; -begin - e_LogWritefln('GL Vendor: %s', [glGetString(GL_VENDOR)]); - e_LogWritefln('GL Renderer: %s', [glGetString(GL_RENDERER)]); - e_LogWritefln('GL Version: %s', [glGetString(GL_VERSION)]); - e_LogWritefln('GL Shaders: %s', [glGetString(GL_SHADING_LANGUAGE_VERSION)]); - e_LogWritefln('GL Extensions: %s', [glGetString(GL_EXTENSIONS)]); + e_SoundUpdate(); end; function SDLMain (): Integer; @@ -235,16 +152,12 @@ var valres: Word; {$ENDIF} begin -{$IFDEF HEADLESS} - e_NoGraphics := true; -{$ENDIF} idx := 1; while (idx <= ParamCount) do 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; @@ -320,16 +233,18 @@ begin 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} - PrintGLSupportedExtensions; - glLegacyNPOT := GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'); -{$ELSE} - glLegacyNPOT := False; -{$ENDIF} - e_logWritefln('NPOT textures: %s', [glLegacyNPOT]); - gwin_dump_extensions := false; + r_Window_Initialize; Init; Time_Old := sys_GetTicks(); @@ -349,6 +264,8 @@ begin // main loop while not ProcessMessage() do begin end; + g_Net_Slist_ShutdownAll(); + Release(); g_Net_DeinitLowLevel();