X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=2d3fb588db863d074a7e3ae0f7c16c3ae954100e;hb=5aa51582e429a852142d419b1e3c23d93d31bc0b;hp=14819e284ce75d894275691a2df17ee83f2f15a9;hpb=d8e15c7dbfcaf848ae7db165289b7ee9c687133c;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 14819e2..2d3fb58 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -311,7 +311,9 @@ var
   P2MoveButton: Byte = 0;
 
   g_profile_frame_update: Boolean = false;
-  g_profile_frame_draw: Boolean = true;
+  g_profile_frame_draw: Boolean = false;
+  g_profile_collision: Boolean = false;
+  g_profile_history_size: Integer = 1000;
 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
@@ -460,17 +462,27 @@ end;
 *)
 
 
-procedure drawProfiles (x, y: Integer; prof: TProfiler);
+function calcProfilesHeight (prof: TProfiler): Integer;
+begin
+  result := 0;
+  if (prof = nil) then exit;
+  if (length(prof.bars) = 0) then exit;
+  result := length(prof.bars)*(16+2);
+end;
+
+// returns width
+function drawProfiles (x, y: Integer; prof: TProfiler): Integer;
 var
   wdt, hgt: Integer;
   yy: Integer;
-  ii, idx: Integer;
+  ii: Integer;
 begin
+  result := 0;
   if (prof = nil) then exit;
   // gScreenWidth
   if (length(prof.bars) = 0) then exit;
   wdt := 192;
-  hgt := length(prof.bars)*(16+2);
+  hgt := calcProfilesHeight(prof);
   if (x < 0) then x := gScreenWidth-(wdt-1)+x;
   if (y < 0) then y := gScreenHeight-(hgt-1)+y;
   // background
@@ -483,6 +495,7 @@ begin
     e_TextureFontPrintEx(x+2+4*prof.bars[ii].level, yy, Format('%s: %d', [prof.bars[ii].name, prof.bars[ii].value]), gStdFont, 255, 255, 0, 1, false);
     Inc(yy, 16+2);
   end;
+  result := wdt;
 end;
 
 
@@ -2737,7 +2750,7 @@ begin
     Exit;
   end;
 
-  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('MAP RENDER');
+  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('MAP RENDER', g_profile_history_size);
   profileFrameDraw.mainBegin(g_profile_frame_draw);
 
   gPlayerDrawn := p;
@@ -2997,6 +3010,14 @@ begin
   p.DrawGUI();
 end;
 
+procedure drawProfilers ();
+var
+  px: Integer = -1;
+begin
+  if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw);
+  if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision);
+end;
+
 procedure g_Game_Draw();
 var
   ID: DWORD;
@@ -3319,7 +3340,7 @@ begin
                      Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
                      gStdFont);
 
-  if g_profile_frame_draw then drawProfiles(-1, -1, profileFrameDraw); //drawProfiles(-1, -1, 'MAP RENDER');
+  drawProfilers();
 end;
 
 procedure g_Game_Quit();
@@ -4985,19 +5006,75 @@ end;
 procedure ProfilerCommands (P: SArray);
 var
   cmd: string;
+
+  function getBool (idx: Integer): Integer;
+  begin
+    if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end;
+    result := 0;
+    if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
+  end;
+
 begin
   //if not gDebugMode then exit;
   cmd := LowerCase(P[0]);
+
   if cmd = 'dpp' then
   begin
     g_profile_frame_draw := not g_profile_frame_draw;
     exit;
   end;
+
   if cmd = 'dpu' then
   begin
     g_profile_frame_update := not g_profile_frame_update;
     exit;
   end;
+
+  if cmd = 'dpc' then
+  begin
+    g_profile_collision := not g_profile_collision;
+    exit;
+  end;
+
+  if cmd = 'r_gridrender' then
+  begin
+    case getBool(1) of
+      -1: begin end;
+       0: gdbg_map_use_grid_render := false;
+       1: gdbg_map_use_grid_render := true;
+    end;
+    if gdbg_map_use_grid_render then g_Console_Add('grid rendering: tan') else g_Console_Add('grid rendering: ona');
+    exit;
+  end;
+
+  if cmd = 'dbg_coldet_grid' then
+  begin
+    case getBool(1) of
+      -1: begin end;
+       0: gdbg_map_use_grid_coldet := false;
+       1: gdbg_map_use_grid_coldet := true;
+    end;
+    if gdbg_map_use_grid_coldet then g_Console_Add('grid coldet: tan') else g_Console_Add('grid coldet: ona');
+    exit;
+  end;
+
+  if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then
+  begin
+    gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree');
+    if gdbg_map_use_tree_coldet then g_Console_Add('coldet: tree') else g_Console_Add('coldet: grid');
+    exit;
+  end;
+
+  if (cmd = 't_dump_node_queries') then
+  begin
+    case getBool(1) of
+      -1: begin end;
+       0: gdbg_map_dump_coldet_tree_queries := false;
+       1: gdbg_map_dump_coldet_tree_queries := true;
+    end;
+    if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona');
+    exit;
+  end;
 end;
 
 procedure DebugCommands(P: SArray);
@@ -6822,6 +6899,12 @@ var
 begin
   Parse_Params(pars);
 
+  s := Find_Param_Value(pars, '--profile-frame');
+  if (s <> '') then g_profile_frame_draw := true;
+
+  s := Find_Param_Value(pars, '--profile-coldet');
+  if (s <> '') then g_profile_collision := true;
+
 // Debug mode:
   s := Find_Param_Value(pars, '--debug');
   if (s <> '') then
@@ -6847,6 +6930,12 @@ begin
     Exit;
   end;
 
+  s := LowerCase(Find_Param_Value(pars, '-dbg-mainwad'));
+  if (s <> '') then
+  begin
+    gDefaultMegawadStart := s;
+  end;
+
 // Start map when game loads:
   map := LowerCase(Find_Param_Value(pars, '-map'));
   if isWadPath(map) then