X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=954790bd8f1b80b87bcbca38c9ecbec16f5630e1;hb=83ba12ea2028427bb2e8c1c362294e04c1d55008;hp=f623e8a69eca02f4924c5717b5a70a4569919679;hpb=0e101bd452c40da601236aaa2dd4106be47ddce1;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index f623e8a..954790b 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -38,12 +38,13 @@ 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, + 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; + g_touch, g_gui, g_system, g_netmaster; const @@ -51,11 +52,10 @@ const var Time, Time_Delta, Time_Old: Int64; + Frame: Int64; flag: Boolean; wNeedTimeReset: Boolean = false; wMinimized: Boolean = false; - wMaximized: Boolean = false; - wLoadingProgress: Boolean = false; wLoadingQuit: Boolean = false; procedure ResetTimer (); @@ -69,27 +69,13 @@ var {$ENDIF} procedure ProcessLoading (forceUpdate: Boolean=false); -var {$IFNDEF HEADLESS} -// ev: TSDL_Event; +var stt: UInt64; {$ENDIF} begin -// FillChar(ev, sizeof(ev), 0); - wLoadingProgress := true; - -// while (SDL_PollEvent(@ev) > 0) do -// begin -// EventHandler(ev); -// if (ev.type_ = SDL_QUITEV) then break; -// end; - //e_PollJoysticks(); - -// if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then -// begin -// wLoadingProgress := false; -// exit; -// end; + if sys_HandleInput() = True then + Exit; {$IFNDEF HEADLESS} if not wMinimized then @@ -102,11 +88,18 @@ begin 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); + r_Console_Draw(True); + + e_SetRendertarget(False); + e_SetViewPort(0, 0, gWinSizeX, gWinSizeY); + e_BlitFramebuffer(gWinSizeX, gWinSizeY); + sys_Repaint; prevLoadingUpdateTime := getTimeMilli(); end; @@ -123,8 +116,6 @@ begin begin if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading(); end; - - wLoadingProgress := false; end; @@ -141,6 +132,7 @@ begin if wNeedTimeReset then begin + Frame := 0; Time_Delta := 28; wNeedTimeReset := false; end; @@ -153,20 +145,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(); @@ -184,28 +165,82 @@ begin // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ 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 + sys_Delay(1); + + e_SoundUpdate(); +end; + +function GLExtensionList (): SSArray; +var + s: PChar; + i, j, num: GLint; +begin + result := nil; + s := glGetString(GL_EXTENSIONS); + if s <> nil then begin - sys_Delay(1) // release time slice, so we won't eat 100% CPU + 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+1, i-j); + while (s[i] <> #0) and (s[i] = ' ') do Inc(i); + j := i; + Inc(num); + end; end; +end; - e_SoundUpdate(); +function GLExtensionSupported (ext: AnsiString): Boolean; +var + exts: SSArray; + e: AnsiString; +begin + result := false; + exts := GLExtensionList(); + for e in exts do + begin + //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext)); + if (strEquCI1251(e, ext)) then begin result := true; exit; end; + end; +end; + +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)]); end; function SDLMain (): Integer; var idx: Integer; - {$IF not DEFINED(HEADLESS)} - ltmp: Integer; - {$ENDIF} arg: AnsiString; mdfo: TStream; {$IFDEF ENABLE_HOLMES} @@ -215,14 +250,6 @@ var begin {$IFDEF HEADLESS} e_NoGraphics := true; -{$ELSE} - {$IFDEF ENABLE_HOLMES} - if (not g_holmes_imfunctional) then - begin - uiInitialize(); - uiContext.font := 'win14'; - end; - {$ENDIF} {$ENDIF} idx := 1; @@ -306,11 +333,41 @@ 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 := 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 + 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; + gwin_dump_extensions := false; + Init; Time_Old := sys_GetTicks(); + g_Net_InitLowLevel(); + // Êîìàíäíàÿ ñòðîêà if (ParamCount > 0) then g_Game_Process_Params(); @@ -324,7 +381,11 @@ begin // main loop while not ProcessMessage() do begin end; + g_Net_Slist_ShutdownAll(); + Release(); + + g_Net_DeinitLowLevel(); result := 0; end;