X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=3c380f9bb0a15ea2efba4516bc78d5f2b6bcefbd;hb=57b20a742f3db73dc84739d11ba35a16a27d5ab6;hp=b84bf3aaca6170f165147659879aa9e2971c8f28;hpb=7869ee331ead2e3f765af47eeca1566ed97faa19;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index b84bf3a..3c380f9 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -20,7 +20,7 @@ interface
 
 uses
   e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
-  g_phys, wadreader, BinEditor, g_panel, g_grid, md5, xprofiler;
+  g_phys, wadreader, BinEditor, g_panel, g_grid, g_sap, md5, xprofiler;
 
 type
   TMapInfo = record
@@ -136,6 +136,8 @@ var
 
   gdbg_map_use_grid_render: Boolean = true;
   gdbg_map_use_grid_coldet: Boolean = true;
+  gdbg_map_use_sap_draw: Boolean = true;
+  gdbg_map_use_sap_coldet: Boolean = false;
   profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
 
 implementation
@@ -145,7 +147,7 @@ uses
   GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, MAPREADER, g_triggers, g_player, MAPDEF,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
-  utils, sfs,
+  utils, sfs, binheap,
   ImagingTypes, Imaging, ImagingUtility,
   ImagingGif, ImagingNetworkGraphics;
 
@@ -196,18 +198,19 @@ var
   FlagPoints:    Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
   //DOMFlagPoints: Array of TFlagPoint;
   gMapGrid: TBodyGrid = nil;
+  gMapSAP: TSweepAndPrune = nil;
 
 
 procedure g_Map_ProfilersBegin ();
 begin
-  if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION');
+  if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION', g_profile_history_size);
   profMapCollision.mainBegin(g_profile_collision);
   // create sections
   if g_profile_collision then
   begin
-    profMapCollision.sectionBeginAccum('wall coldet');
+    profMapCollision.sectionBegin('wall coldet');
     profMapCollision.sectionEnd();
-    profMapCollision.sectionBeginAccum('liquid coldet');
+    profMapCollision.sectionBegin('liquid coldet');
     profMapCollision.sectionEnd();
   end;
 end;
@@ -984,12 +987,15 @@ var
     for idx := High(panels) downto 0 do
     begin
       gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
+      gMapSAP.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
     end;
   end;
 
 begin
   gMapGrid.Free();
   gMapGrid := nil;
+  gMapSAP.Free();
+  gMapSAP := nil;
 
   fixMinMax(gWalls);
   fixMinMax(gRenderBackgrounds);
@@ -1008,6 +1014,7 @@ begin
   end;
 
   gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1);
+  gMapSAP := TSweepAndPrune.Create();
 
   addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
   addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
@@ -1020,6 +1027,7 @@ begin
   addPanelsToGrid(gBlockMon, PANEL_BLOCKMON);
 
   gMapGrid.dumpStats();
+  gMapSAP.dumpStats();
 end;
 
 function g_Map_Load(Res: String): Boolean;
@@ -1056,6 +1064,8 @@ var
 begin
   gMapGrid.Free();
   gMapGrid := nil;
+  gMapSAP.Free();
+  gMapSAP := nil;
 
   Result := False;
   gMapInfo.Map := Res;
@@ -1917,7 +1927,14 @@ begin
 
   if gdbg_map_use_grid_render then
   begin
-    gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
+    if gdbg_map_use_sap_draw then
+    begin
+      gMapSAP.forEachInAABB(x0, y0, wdt, hgt, checker);
+    end
+    else
+    begin
+      gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
+    end;
     // sort and draw the list (we need to sort it, or rendering is fucked)
     while gDrawPanelList.count > 0 do
     begin
@@ -1956,7 +1973,14 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
   end;
 
 begin
-  gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
+  if gdbg_map_use_sap_draw then
+  begin
+    gMapSAP.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
+  end
+  else
+  begin
+    gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
+  end;
 end;
 
 
@@ -2218,7 +2242,14 @@ begin
   try
     if gdbg_map_use_grid_coldet then
     begin
-      result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+      if gdbg_map_use_sap_coldet then
+      begin
+        gMapSAP.forEachInAABB(X, Y, Width, Height, checker);
+      end
+      else
+      begin
+        result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+      end;
     end
     else
     begin
@@ -2280,15 +2311,22 @@ begin
   //TODO: detailed profile?
   if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
   try
-    if not gdbg_map_use_grid_coldet then
+    if gdbg_map_use_grid_coldet then
     begin
-      result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
+      texid := TEXTURE_NONE;
+      if gdbg_map_use_sap_coldet then
+      begin
+        gMapSAP.forEachInAABB(X, Y, Width, Height, checker);
+      end
+      else
+      begin
+        gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+      end;
+      result := texid;
     end
     else
     begin
-      texid := TEXTURE_NONE;
-      gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
-      result := texid;
+      result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
     end;
   finally
     if (profMapCollision <> nil) then profMapCollision.sectionEnd();