X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=bfd4377830c271bc278fe5480357782093cec5f7;hb=d0936017ccb8a078d1b03f55478af284bb015bbc;hp=f623e8a69eca02f4924c5717b5a70a4569919679;hpb=0e101bd452c40da601236aaa2dd4106be47ddce1;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index f623e8a..bfd4377 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,93 +37,113 @@ uses {$IFDEF ENABLE_HOLMES} g_holmes, sdlcarcass, fui_ctls, {$ENDIF} - SysUtils, Classes, MAPDEF, Math, - e_graphics, e_log, e_texture, g_main, - g_console, e_input, g_options, g_game, + SysUtils, Classes, MAPDEF, Math, r_graphics, + r_window, e_log, r_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; - - -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; - wMaximized: Boolean = false; - wLoadingProgress: Boolean = false; wLoadingQuit: Boolean = false; -procedure ResetTimer (); +procedure Update (); begin - wNeedTimeReset := true; + // remember old mobj positions, prepare for update + g_Game_PreUpdate(); + // server: receive client commands for new frame + // client: receive game state changes from server + if (NetMode = NET_SERVER) then g_Net_Host_Update() + else if (NetMode = NET_CLIENT) then g_Net_Client_Update(); + // think + g_Game_Update(); + // server: send any accumulated outgoing data to clients + if NetMode = NET_SERVER then g_Net_Flush(); end; -{$IFNDEF HEADLESS} -var - prevLoadingUpdateTime: UInt64 = 0; -{$ENDIF} -procedure ProcessLoading (forceUpdate: Boolean=false); +procedure Draw (); +begin + r_Game_Draw(); +end; + + +procedure Init(); var -{$IFNDEF HEADLESS} -// ev: TSDL_Event; - stt: UInt64; -{$ENDIF} + NoSound: Boolean; 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; + Randomize; -{$IFNDEF HEADLESS} - if not wMinimized then +{$IFDEF HEADLESS} + {$IFDEF USE_SDLMIXER} + NoSound := False; // hope env has set SDL_AUDIODRIVER to dummy + {$ELSE} + NoSound := True; // FMOD backend will sort it out + {$ENDIF} +{$ELSE} + NoSound := False; +{$ENDIF} + + g_Touch_Init; + +(* + if (e_JoysticksAvailable > 0) then + e_WriteLog('Input: Joysticks available.', TMsgType.Notify) + else + e_WriteLog('Input: No Joysticks.', TMsgType.Notify); +*) + + if (not gNoSound) then begin - if not forceUpdate then - begin - stt := getTimeMilli(); - forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs); - end; + e_WriteLog('Initializing sound system', TMsgType.Notify); + e_InitSoundSystem(NoSound); + end; - if forceUpdate then - begin - DrawMenuBackground('INTER'); - e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + e_WriteLog('Init game', TMsgType.Notify); + g_Game_Init(); - DrawLoadingStat(); - g_Console_Draw(True); - sys_Repaint; - prevLoadingUpdateTime := getTimeMilli(); - end; +// FillChar(charbuff, sizeof(charbuff), ' '); +end; + +procedure Release(); +begin + e_WriteLog('Releasing engine', TMsgType.Notify); + e_ReleaseEngine(); + + e_WriteLog('Releasing input', TMsgType.Notify); + e_ReleaseInput(); + + if not gNoSound then + begin + e_WriteLog('Releasing sound', TMsgType.Notify); + e_ReleaseSoundSystem(); end; +end; + +procedure ResetTimer (); +begin + wNeedTimeReset := true; +end; + +procedure ProcessLoading (forceUpdate: Boolean=false); +begin + if sys_HandleInput() = True then + Exit; + +{$IFNDEF HEADLESS} + 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; - - wLoadingProgress := false; + g_Net_Host_Update() + else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then + g_Net_Client_UpdateWhileLoading(); end; @@ -141,6 +160,7 @@ begin if wNeedTimeReset then begin + Frame := 0; Time_Delta := 28; wNeedTimeReset := false; end; @@ -153,20 +173,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,18 +193,24 @@ begin // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ if flag then - begin Time_Old := Time - (Time_Delta mod 28); - if (not wMinimized) then - begin - Draw; - sys_Repaint - end + + // 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 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 else - begin - sys_Delay(1) // release time slice, so we won't eat 100% CPU - end; + sys_Delay(1); e_SoundUpdate(); end; @@ -203,9 +218,6 @@ end; function SDLMain (): Integer; var idx: Integer; - {$IF not DEFINED(HEADLESS)} - ltmp: Integer; - {$ENDIF} arg: AnsiString; mdfo: TStream; {$IFDEF ENABLE_HOLMES} @@ -213,24 +225,12 @@ var valres: Word; {$ENDIF} 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; 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; @@ -306,11 +306,24 @@ 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; + r_Window_Initialize; + Init; Time_Old := sys_GetTicks(); + g_Net_InitLowLevel(); + // Êîìàíäíàÿ ñòðîêà if (ParamCount > 0) then g_Game_Process_Params(); @@ -324,7 +337,11 @@ begin // main loop while not ProcessMessage() do begin end; + g_Net_Slist_ShutdownAll(); + Release(); + + g_Net_DeinitLowLevel(); result := 0; end;