X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_grid.pas;h=5b2f8b135d27583c5a849aaec6ab3e46f5d4ef7e;hb=31fadda69508ddb1f225a2a471c1be888148ffac;hp=aeeba590205eed25b63aaf4ecab8fcd708609222;hpb=77c061c38307f943fd2c8ded5cf8ae503d46bb04;p=d2df-sdl.git

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index aeeba59..5b2f8b1 100644
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -13,18 +13,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
+// universal spatial grid
 {$INCLUDE ../shared/a_modes.inc}
+{$DEFINE grid_use_buckets}
 unit g_grid;
 
 interface
 
-uses e_log;
-
 const
   GridDefaultTileSize = 32;
+  GridCellBucketSize = 8; // WARNING! can't be less than 2!
 
 type
-  GridQueryCB = function (obj: TObject; tag: Integer): Boolean is nested; // return `true` to stop
+  TGridQueryCB = function (obj: TObject; objx, objy, objw, objh: Integer; tag: Integer): Boolean is nested; // return `true` to stop
 
 type
   TBodyGrid = class;
@@ -59,7 +60,11 @@ type
 
   PGridCell = ^TGridCell;
   TGridCell = record
+    {$IFDEF grid_use_buckets}
+    bodies: array [0..GridCellBucketSize-1] of Integer; // -1: end of list
+    {$ELSE}
     body: Integer;
+    {$ENDIF}
     next: Integer; // in this cell; index in mCells
   end;
 
@@ -73,7 +78,7 @@ type
     mGrid: array of Integer; // mWidth*mHeight, index in mCells
     mCells: array of TGridCell; // cell pool
     mFreeCell: Integer; // first free cell index or -1
-    mLastQuery: Integer;
+    mLastQuery: DWord;
     mUsedCells: Integer;
     mProxies: array of TBodyProxyRec;
     mProxyFree: TBodyProxy; // free
@@ -103,63 +108,21 @@ type
     procedure resizeBody (body: TBodyProxy; sx, sy: Integer);
     procedure moveResizeBody (body: TBodyProxy; dx, dy, sx, sy: Integer);
 
-    function forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB): Boolean;
+    function forEachInAABB (x, y, w, h: Integer; cb: TGridQueryCB; tagmask: Integer=-1): Boolean;
 
-    function getProxyForBody (aObj: TObject; x, y, w, h: Integer): TBodyProxy;
+    //function getProxyForBody (aObj: TObject; x, y, w, h: Integer): TBodyProxy;
 
     procedure dumpStats ();
   end;
 
 
-type
-  TBinaryHeapLessFn = function (a, b: TObject): Boolean;
-
-  TBinaryHeapObj = class(TObject)
-  private
-    elem: array of TObject;
-    elemUsed: Integer;
-    lessfn: TBinaryHeapLessFn;
-
-  private
-    procedure heapify (root: Integer);
-
-  public
-    constructor Create (alessfn: TBinaryHeapLessFn);
-    destructor Destroy (); override;
-
-    procedure clear ();
-
-    procedure insert (val: TObject);
-
-    function front (): TObject;
-    procedure popFront ();
-
-    property count: Integer read elemUsed;
-  end;
-
-
 implementation
 
 uses
-  SysUtils;
+  SysUtils, e_log;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-(*
-constructor TBodyProxy.Create (aGrid: TBodyGrid; aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
-begin
-  mGrid := aGrid;
-  setup(aX, aY, aWidth, aHeight, aObj, aTag);
-end;
-
-
-destructor TBodyProxy.Destroy ();
-begin
-  inherited;
-end;
-*)
-
-
 procedure TBodyProxyRec.setup (aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
 begin
   mX := aX;
@@ -194,7 +157,11 @@ begin
   // init free list
   for idx := 0 to High(mCells) do
   begin
+    {$IFDEF grid_use_buckets}
+    mCells[idx].bodies[0] := -1;
+    {$ELSE}
     mCells[idx].body := -1;
+    {$ENDIF}
     mCells[idx].next := idx+1;
   end;
   mCells[High(mCells)].next := -1; // last cell
@@ -213,8 +180,6 @@ end;
 
 
 destructor TBodyGrid.Destroy ();
-var
-  px: TBodyProxy;
 begin
   mCells := nil;
   mGrid := nil;
@@ -254,7 +219,11 @@ begin
     SetLength(mCells, mFreeCell+32768); // arbitrary number
     for idx := mFreeCell to High(mCells) do
     begin
+      {$IFDEF grid_use_buckets}
+      mCells[idx].bodies[0] := -1;
+      {$ELSE}
       mCells[idx].body := -1;
+      {$ENDIF}
       mCells[idx].next := idx+1;
     end;
     mCells[High(mCells)].next := -1; // last cell
@@ -271,8 +240,8 @@ procedure TBodyGrid.freeCell (idx: Integer);
 begin
   if (idx >= 0) and (idx < High(mCells)) then
   begin
-    if mCells[idx].body = -1 then exit; // the thing that should not be
-    mCells[idx].body := -1;
+    //if mCells[idx].body = -1 then exit; // the thing that should not be
+    //mCells[idx].body := -1;
     mCells[idx].next := mFreeCell;
     mFreeCell := idx;
     Dec(mUsedCells);
@@ -349,14 +318,44 @@ procedure TBodyGrid.insert (body: TBodyProxy);
   function inserter (grida: Integer): Boolean;
   var
     cidx: Integer;
+    pc: PInteger;
+    {$IFDEF grid_use_buckets}
+    pi: PGridCell;
+    f: Integer;
+    {$ENDIF}
   begin
     result := false; // never stop
     // add body to the given grid cell
+    pc := @mGrid[grida];
+    {$IFDEF grid_use_buckets}
+    if (pc^ <> -1) then
+    begin
+      pi := @mCells[pc^];
+      f := 0;
+      for f := 0 to High(TGridCell.bodies) do
+      begin
+        if (pi.bodies[f] = -1) then
+        begin
+          // can add here
+          pi.bodies[f] := body;
+          if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
+          exit;
+        end;
+      end;
+    end;
+    // either no room, or no cell at all
+    cidx := allocCell();
+    mCells[cidx].bodies[0] := body;
+    mCells[cidx].bodies[1] := -1;
+    mCells[cidx].next := pc^;
+    pc^ := cidx;
+    {$ELSE}
     cidx := allocCell();
     //e_WriteLog(Format('  01: allocated cell for grid coords (%d,%d), body coords:(%d,%d): #%d', [gx, gy, dx, dy, cidx]), MSG_NOTIFY);
     mCells[cidx].body := body;
-    mCells[cidx].next := mGrid[grida];
-    mGrid[grida] := cidx;
+    mCells[cidx].next := pc^;
+    pc^ := cidx;
+    {$ENDIF}
   end;
 
 var
@@ -371,6 +370,7 @@ end;
 // absolutely not tested
 procedure TBodyGrid.remove (body: TBodyProxy);
 
+(*
   function remover (grida: Integer): Boolean;
   var
     pidx, idx, tmp: Integer;
@@ -398,10 +398,14 @@ procedure TBodyGrid.remove (body: TBodyProxy);
 
 var
   px: PBodyProxyRec;
+*)
 begin
+(*
   if (body < 0) or (body > High(mProxies)) then exit; // just in case
   px := @mProxies[body];
   forGridRect(px.mX, px.mY, px.mWidth, px.mHeight, remover);
+*)
+  raise Exception.Create('TBodyGrid.remove: not yet, sorry');
 end;
 
 
@@ -446,27 +450,47 @@ begin
 end;
 
 
-function TBodyGrid.forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB): Boolean;
+function TBodyGrid.forEachInAABB (x, y, w, h: Integer; cb: TGridQueryCB; tagmask: Integer=-1): Boolean;
   function iterator (grida: Integer): Boolean;
   var
     idx: Integer;
     px: PBodyProxyRec;
+    {$IFDEF grid_use_buckets}
+    pi: PGridCell;
+    f: Integer;
+    {$ENDIF}
   begin
     result := false;
     idx := mGrid[grida];
     while (idx >= 0) do
     begin
+      {$IFDEF grid_use_buckets}
+      pi := @mCells[idx];
+      for f := 0 to High(TGridCell.bodies) do
+      begin
+        if (pi.bodies[f] = -1) then break;
+        px := @mProxies[pi.bodies[f]];
+        if (px.mQueryMark <> mLastQuery) and ((px.mTag and tagmask) <> 0) then
+        begin
+          //e_WriteLog(Format('  query #%d body hit: (%d,%d)-(%dx%d) tag:%d', [mLastQuery, mCells[idx].body.mX, mCells[idx].body.mY, mCells[idx].body.mWidth, mCells[idx].body.mHeight, mCells[idx].body.mTag]), MSG_NOTIFY);
+          px.mQueryMark := mLastQuery;
+          if (cb(px.mObj, px.mX, px.mY, px.mWidth, px.mHeight, px.mTag)) then begin result := true; exit; end;
+        end;
+      end;
+      idx := pi.next;
+      {$ELSE}
       if (mCells[idx].body <> -1) then
       begin
         px := @mProxies[mCells[idx].body];
-        if (px.mQueryMark <> mLastQuery) then
+        if (px.mQueryMark <> mLastQuery) and ((px.mTag and tagmask) <> 0) then
         begin
           //e_WriteLog(Format('  query #%d body hit: (%d,%d)-(%dx%d) tag:%d', [mLastQuery, mCells[idx].body.mX, mCells[idx].body.mY, mCells[idx].body.mWidth, mCells[idx].body.mHeight, mCells[idx].body.mTag]), MSG_NOTIFY);
           px.mQueryMark := mLastQuery;
-          if (cb(px.mObj, px.mTag)) then begin result := true; exit; end;
+          if (cb(px.mObj, px.mX, px.mY, px.mWidth, px.mHeight, px.mTag)) then begin result := true; exit; end;
         end;
       end;
       idx := mCells[idx].next;
+      {$ENDIF}
     end;
   end;
 
@@ -490,6 +514,7 @@ begin
 end;
 
 
+(*
 function TBodyGrid.getProxyForBody (aObj: TObject; x, y, w, h: Integer): TBodyProxy;
 var
   res: TBodyProxy = -1;
@@ -518,85 +543,7 @@ begin
   forGridRect(x, y, w, h, iterator);
   result := res;
 end;
-
-
-// ////////////////////////////////////////////////////////////////////////// //
-constructor TBinaryHeapObj.Create (alessfn: TBinaryHeapLessFn);
-begin
-  if not assigned(alessfn) then raise Exception.Create('wutafuck?!');
-  lessfn := alessfn;
-  SetLength(elem, 8192); // 'cause why not?
-  elemUsed := 0;
-end;
-
-
-destructor TBinaryHeapObj.Destroy ();
-begin
-  inherited;
-end;
-
-
-procedure TBinaryHeapObj.clear ();
-begin
-  elemUsed := 0;
-end;
-
-
-procedure TBinaryHeapObj.heapify (root: Integer);
-var
-  smallest, right: Integer;
-  tmp: TObject;
-begin
-  while true do
-  begin
-    smallest := 2*root+1; // left child
-    if (smallest >= elemUsed) then break; // anyway
-    right := smallest+1; // right child
-    if not lessfn(elem[smallest], elem[root]) then smallest := root;
-    if (right < elemUsed) and (lessfn(elem[right], elem[smallest])) then smallest := right;
-    if (smallest = root) then break;
-    // swap
-    tmp := elem[root];
-    elem[root] := elem[smallest];
-    elem[smallest] := tmp;
-    root := smallest;
-  end;
-end;
-
-
-procedure TBinaryHeapObj.insert (val: TObject);
-var
-  i, par: Integer;
-begin
-  if (val = nil) then exit;
-  i := elemUsed;
-  if (i = Length(elem)) then SetLength(elem, Length(elem)+16384); // arbitrary number
-  Inc(elemUsed);
-  while (i <> 0) do
-  begin
-    par := (i-1) div 2; // parent
-    if not lessfn(val, elem[par]) then break;
-    elem[i] := elem[par];
-    i := par;
-  end;
-  elem[i] := val;
-end;
-
-function TBinaryHeapObj.front (): TObject;
-begin
-  if elemUsed > 0 then result := elem[0] else result := nil;
-end;
-
-
-procedure TBinaryHeapObj.popFront ();
-begin
-  if (elemUsed > 0) then
-  begin
-    Dec(elemUsed);
-    elem[0] := elem[elemUsed];
-    heapify(0);
-  end;
-end;
+*)
 
 
 end.