X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=0cf15d68e7496a62fe4389700811d9bd2dec47b1;hb=e796653d0ccd214192261ed1715dc68806758926;hp=0ac570dad8b00a296278d4e0163f19ee28785b72;hpb=548d5b03739e16f0cf8d1062ca65e26a2805fc78;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 0ac570d..0cf15d6 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -28,7 +28,7 @@ function  CreateGLWindow(Title: PChar): Boolean;
 procedure KillGLWindow();
 procedure PushExitEvent();
 function  ProcessMessage(): Boolean;
-procedure ProcessLoading();
+procedure ProcessLoading (forceUpdate: Boolean=false);
 procedure ReDrawWindow();
 procedure SwapBuffers();
 procedure Sleep(ms: LongWord);
@@ -40,6 +40,7 @@ var
   gwin_dump_extensions: Boolean = false;
   gwin_has_stencil: Boolean = false;
   gwin_k8_enable_light_experiments: Boolean = false;
+  g_dbg_aimline_on: Boolean = false;
 
 
 implementation
@@ -49,7 +50,7 @@ uses
   SDL2, GL, GLExt, e_graphics, e_log, g_main,
   g_console, SysUtils, 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, g_holmes;
+  g_map, g_gfx, g_monsters, g_holmes, xprofiler;
 
 var
   h_Wnd: PSDL_Window;
@@ -623,10 +624,15 @@ begin
   SDL_PushEvent(@ev);
 end;
 
-procedure ProcessLoading();
+
+var
+  prevLoadingUpdateTime: UInt64 = 0;
+
+procedure ProcessLoading (forceUpdate: Boolean=false);
 var
   ev: TSDL_Event;
   ID: DWORD;
+  stt: UInt64;
 begin
   FillChar(ev, SizeOf(ev), 0);
   //wNeedFree := False;
@@ -646,24 +652,48 @@ begin
 
   if not wMinimized then
   begin
-    if g_Texture_Get('INTER', ID) then
-      e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
+    if forceUpdate then
+    begin
+      prevLoadingUpdateTime := curTimeMilli();
+    end
     else
-      e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+    begin
+      stt := curTimeMilli();
+      if (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= 400) then
+      begin
+        prevLoadingUpdateTime := stt;
+        forceUpdate := true;
+      end;
+    end;
 
-    DrawLoadingStat();
-    SwapBuffers();
+    if forceUpdate then
+    begin
+      if g_Texture_Get('INTER', ID) then
+      begin
+        e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
+      end
+      else
+      begin
+        e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+      end;
+
+      DrawLoadingStat();
+      SwapBuffers();
 
-    ReShowCursor();
+      ReShowCursor();
+    end;
   end;
 
   e_SoundUpdate();
 
   if NetMode = NET_SERVER then
-    g_Net_Host_Update
+  begin
+    g_Net_Host_Update();
+  end
   else
-    if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
-      g_Net_Client_UpdateWhileLoading;
+  begin
+    if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
+  end;
   wLoadingProgress := False;
 end;
 
@@ -815,31 +845,58 @@ function SDLMain(): Integer;
 var
   idx: Integer;
   ltmp: Integer;
+  arg: AnsiString;
 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := True;
 {$ENDIF}
 
-  for idx := 1 to ParamCount do
+  idx := 1;
+  while (idx <= ParamCount) do
   begin
-    if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true;
-    if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
-    if ParamStr(idx) = '--jah' then g_profile_history_size := 100;
-    if ParamStr(idx) = '--no-particles' then gpart_dbg_enabled := false;
-    if ParamStr(idx) = '--no-los' then gmon_dbg_los_enabled := false;
-
-    if ParamStr(idx) = '--profile-render' then g_profile_frame_draw := true;
-    if ParamStr(idx) = '--profile-coldet' then g_profile_collision := true;
-    if ParamStr(idx) = '--profile-los' then g_profile_los := true;
+    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;
+
+    if arg = '--profile-render' then g_profile_frame_draw := true;
+    if arg = '--profile-coldet' then g_profile_collision := true;
+    if arg = '--profile-los' then g_profile_los := true;
+
+    if arg = '--no-part-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-part-physics' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+
+    {$IF DEFINED(D2F_DEBUG)}
+    if arg = '--aimline' then g_dbg_aimline_on := false;
+    {$ENDIF}
 
-    if ParamStr(idx) = '--no-part-phys' then gpart_dbg_phys_enabled := false;
-    if ParamStr(idx) = '--no-part-physics' then gpart_dbg_phys_enabled := false;
-    if ParamStr(idx) = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
-    if ParamStr(idx) = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
-    if ParamStr(idx) = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
-    if ParamStr(idx) = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+    if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+    if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        if not conParseFloat(g_holmes_ui_scale, ParamStr(idx)) then g_holmes_ui_scale := 1.0;
+        Inc(idx);
+      end;
+    end;
 
-    if ParamStr(idx) = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+    {$IF DEFINED(D2F_DEBUG)}
+    if (arg = '--game-scale') or (arg = '-game-scale') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        if not conParseFloat(g_dbg_scale, ParamStr(idx)) then g_dbg_scale := 1.0;
+        Inc(idx);
+      end;
+    end;
+    {$ENDIF}
   end;
 
   e_WriteLog('Initializing OpenGL', MSG_NOTIFY);