X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=b2e35c0eb0b3044abc5308cd98354f286651a9c8;hb=422b1bad780adc75cee9edc8ef16092f29181951;hp=53b4ae2d40986595ee8f6d9e8a6e221c3f3fa8bc;hpb=ec7e4d0515981f6f3503fc06552b73dfeaf8b3e6;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 53b4ae2..b2e35c0 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -63,10 +63,6 @@ function  g_Map_Exist(Res: String): Boolean;
 procedure g_Map_Free();
 procedure g_Map_Update();
 
-// build "potentially visible panels" set, so we can avoid looping over all level panels again and again
-procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
-procedure g_Map_ResetPVP ();
-// do not call this without calling `g_Map_BuildPVP()` or `g_Map_ResetPVP()` first!
 procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
 
 procedure g_Map_DrawBack(dx, dy: Integer);
@@ -93,8 +89,6 @@ function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
 procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
 procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
 
-// build "possibly lit panels" index, so we can avoid looping over all level panels again and again
-function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean; // returns `false` if no patels lit
 procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
 
 const
@@ -1742,11 +1736,7 @@ begin
 end;
 
 
-var
-  pvpset: array of TPanel = nil; // potentially lit panels
-  pvpb, pvpe: array [0..7] of Integer; // start/end (inclusive) of the correspoinding type panels in pvpset
-  pvpcount: Integer = -1; // to avoid constant reallocations
-
+{
 function pvpType (panelType: Word): Integer;
 begin
   case panelType of
@@ -1760,55 +1750,8 @@ begin
     else result := -1;
   end;
 end;
+}
 
-procedure g_Map_ResetPVP ();
-begin
-  pvpcount := -1; // special
-end;
-
-procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
-var
-  idx: Integer;
-  tpc: Integer;
-
-  procedure checkPanels (var panels: TPanelArray; stp: Integer);
-  var
-    idx, x, y, w, h: Integer;
-  begin
-    if panels = nil then exit;
-    tpc := tpc+Length(panels);
-    if (stp < 0) or (stp > 6) then exit;
-    pvpb[stp] := pvpcount;
-    for idx := 0 to High(panels) do
-    begin
-      w := panels[idx].Width;
-      h := panels[idx].Height;
-      if (w < 1) or (h < 1) then continue;
-      x := panels[idx].X;
-      y := panels[idx].Y;
-      if (x > maxx) or (y > maxy) then continue;
-      if (x+w <= minx) or (y+h <= miny) then continue;
-      if pvpcount = length(pvpset) then SetLength(pvpset, pvpcount+32768);
-      pvpset[pvpcount] := panels[idx];
-      Inc(pvpcount);
-    end;
-    pvpe[stp] := pvpcount-1;
-  end;
-
-begin
-  //e_WriteLog(Format('visible rect: (%d,%d)-(%d,%d)', [minx, miny, maxx, maxy]), MSG_NOTIFY);
-  pvpcount := 0;
-  for idx := 0 to High(pvpb) do begin pvpb[idx] := 0; pvpe[idx] := -1; end;
-  tpc := 0;
-  checkPanels(gWalls, 0);
-  checkPanels(gRenderBackgrounds, 1);
-  checkPanels(gRenderForegrounds, 2);
-  checkPanels(gWater, 3);
-  checkPanels(gAcid1, 4);
-  checkPanels(gAcid2, 5);
-  checkPanels(gSteps, 6);
-  //e_WriteLog(Format('total panels: %d; visible panels: %d', [tpc, pvpcount]), MSG_NOTIFY);
-end;
 
 procedure g_Map_DrawPanelsOld(PanelType: Word);
 
@@ -1818,24 +1761,10 @@ procedure g_Map_DrawPanelsOld(PanelType: Word);
   begin
     if (panels <> nil) and (stp >= 0) and (stp <= 6) then
     begin
-      if pvpcount < 0 then
-      begin
-        // alas, no visible set
-        for idx := 0 to High(panels) do
-        begin
-          if not (drawDoors xor panels[idx].Door) then panels[idx].Draw();
-        end;
-      end
-      else
+      // alas, no visible set
+      for idx := 0 to High(panels) do
       begin
-        // wow, use visible set
-        if pvpb[stp] <= pvpe[stp] then
-        begin
-          for idx := pvpb[stp] to pvpe[stp] do
-          begin
-            if not (drawDoors xor pvpset[idx].Door) then pvpset[idx].Draw();
-          end;
-        end;
+        if not (drawDoors xor panels[idx].Door) then panels[idx].Draw();
       end;
     end;
   end;
@@ -1935,31 +1864,16 @@ procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
   begin
     if (panels <> nil) and (stp >= 0) and (stp <= 6) then
     begin
-      if pvpcount < 0 then
-      begin
-        // alas, no visible set
-        for idx := 0 to High(panels) do
-        begin
-          if not (drawDoors xor panels[idx].Door) then
-          begin
-            pan := panels[idx];
-            e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
-          end;
-        end;
-      end
-      else
+      // alas, no visible set
+      for idx := 0 to High(panels) do
       begin
-        // wow, use visible set
-        if pvpb[stp] <= pvpe[stp] then
+        if not (drawDoors xor panels[idx].Door) then
         begin
-          for idx := pvpb[stp] to pvpe[stp] do
-          begin
-            if not (drawDoors xor pvpset[idx].Door) then
-            begin
-              pan := pvpset[idx];
-              e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
-            end;
-          end;
+          pan := panels[idx];
+          if (pan.Width < 1) or (pan.Height < 1) then continue;
+          if (pan.X+pan.Width <= x0) or (pan.Y+pan.Height <= y0) then continue;
+          if (pan.X >= x0+wdt) or (pan.Y >= y0+hgt) then continue;
+          e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
         end;
       end;
     end;
@@ -1996,67 +1910,23 @@ begin
   end;
 end;
 
-var
-  plpset: array of Integer = nil; // potentially lit panels
-  plpcount: Integer; // to avoid constant reallocations
-
-function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean;
-var
-  idx: Integer;
-  panels: TPanelArray;
-begin
-  panels := gWalls;
-  plpcount := 0;
-  if (ltminx < ltmaxx) and (ltminy < ltmaxy) then
-  begin
-    if panels <> nil then
-    begin
-      for idx := 0 to High(panels) do
-      begin
-        if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
-        if (panels[idx].X+panels[idx].Width <= ltminx) then continue;
-        if (panels[idx].Y+panels[idx].Height <= ltminy) then continue;
-        if (panels[idx].X > ltmaxx) then continue;
-        if (panels[idx].Y > ltmaxy) then continue;
-        if plpcount = length(plpset) then SetLength(plpset, plpcount+32768);
-        plpset[plpcount] := idx;
-        Inc(plpcount);
-      end;
-      //e_WriteLog(Format('%d panels left out of %d', [plpcount, Length(panels)]), MSG_NOTIFY);
-    end;
-  end;
-  result := (plpcount > 0);
-end;
 
 procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
-
-  (* old
-  procedure drawPanels (var panels: TPanelArray);
+  function qq (obj: TObject; tag: Integer): Boolean;
   var
-    a: Integer;
+    pan: TPanel;
   begin
-    if panels <> nil then
-    begin
-      for a := 0 to High(panels) do
-      begin
-        panels[a].DrawShadowVolume(lightX, lightY, radius);
-      end;
-    end;
+    result := false; // don't stop, ever
+    if (tag <> PANEL_WALL) then exit; // only walls
+    pan := (obj as TPanel);
+    pan.DrawShadowVolume(lightX, lightY, radius);
   end;
-  *)
-var
-  idx: Integer;
+
 begin
-  (*
-  drawPanels(gWalls);
-  //drawPanels(gRenderForegrounds);
-  *)
-  for idx := 0 to plpcount-1 do
-  begin
-    gWalls[plpset[idx]].DrawShadowVolume(lightX, lightY, radius);
-  end;
+  gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, qq);
 end;
 
+
 procedure g_Map_DrawBack(dx, dy: Integer);
 begin
   if gDrawBackGround and (BackID <> DWORD(-1)) then