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

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 0ffc5bc..5b2f8b1 100644
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -13,38 +13,41 @@
  * 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;
 
-  TBodyProxy = class(TObject)
+  TBodyProxy = Integer;
+
+  PBodyProxyRec = ^TBodyProxyRec;
+  TBodyProxyRec = record
   private
     mX, mY, mWidth, mHeight: Integer; // aabb
     mQueryMark: DWord; // was this object visited at this query?
     mObj: TObject;
-    mGrid: TBodyGrid;
+    //mGrid: TBodyGrid;
     mTag: Integer;
-    prevLink: TBodyProxy; // only for used
-    nextLink: TBodyProxy; // either used or free
+    nextLink: TBodyProxy; // next free or nothing
 
   private
     procedure setup (aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
 
   public
-    constructor Create (aGrid: TBodyGrid; aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
-    destructor Destroy (); override;
+    //constructor Create (aGrid: TBodyGrid; aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
+    //destructor Destroy (); override;
 
     property x: Integer read mX;
     property y: Integer read mY;
@@ -52,12 +55,16 @@ type
     property height: Integer read mHeight;
     property obj: TObject read mObj;
     property tag: Integer read mTag;
-    property grid: TBodyGrid read mGrid;
+    //property grid: TBodyGrid read mGrid;
   end;
 
   PGridCell = ^TGridCell;
   TGridCell = record
-    body: TBodyProxy;
+    {$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;
 
@@ -71,11 +78,12 @@ 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
-    mProxyList: TBodyProxy; // used
-    mProxyCount: Integer; // total allocated
+    mProxyCount: Integer; // currently used
+    mProxyMaxCount: Integer;
 
   private
     function allocCell: Integer;
@@ -94,68 +102,28 @@ type
     destructor Destroy (); override;
 
     function insertBody (aObj: TObject; ax, ay, aWidth, aHeight: Integer; aTag: Integer=0): TBodyProxy;
-    procedure removeBody (aObj: TBodyProxy); // WARNING! this will NOT destroy proxy!
+    procedure removeBody (aObj: TBodyProxy); // WARNING! this WILL destroy proxy!
 
     procedure moveBody (body: TBodyProxy; dx, dy: Integer);
     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 TBodyProxy.setup (aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
+procedure TBodyProxyRec.setup (aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer);
 begin
   mX := aX;
   mY := aY;
@@ -164,8 +132,7 @@ begin
   mQueryMark := 0;
   mObj := aObj;
   mTag := aTag;
-  prevLink := nil;
-  nextLink := nil;
+  nextLink := -1;
 end;
 
 
@@ -185,46 +152,38 @@ begin
   mHeight := (aPixHeight+aTileSize-1) div aTileSize;
   SetLength(mGrid, mWidth*mHeight);
   SetLength(mCells, mWidth*mHeight);
+  SetLength(mProxies, 8192);
   mFreeCell := 0;
   // init free list
   for idx := 0 to High(mCells) do
   begin
-    mCells[idx].body := nil;
+    {$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
   // init grid
   for idx := 0 to High(mGrid) do mGrid[idx] := -1;
+  // init proxies
+  for idx := 0 to High(mProxies) do mProxies[idx].nextLink := idx+1;
+  mProxies[High(mProxies)].nextLink := -1;
   mLastQuery := 0;
   mUsedCells := 0;
-  mProxyFree := nil;
-  mProxyList := nil;
+  mProxyFree := 0;
   mProxyCount := 0;
+  mProxyMaxCount := 0;
   e_WriteLog(Format('created grid with size: %dx%d (tile size: %d); pix: %dx%d', [mWidth, mHeight, mTileSize, mWidth*mTileSize, mHeight*mTileSize]), MSG_NOTIFY);
 end;
 
 
 destructor TBodyGrid.Destroy ();
-var
-  px: TBodyProxy;
 begin
-  // free all owned proxies
-  while mProxyFree <> nil do
-  begin
-    px := mProxyFree;
-    mProxyFree := px.nextLink;
-    px.Free();
-  end;
-
-  while mProxyList <> nil do
-  begin
-    px := mProxyList;
-    mProxyList := px.nextLink;
-    px.Free();
-  end;
-
   mCells := nil;
   mGrid := nil;
+  mProxies := nil;
   inherited;
 end;
 
@@ -245,7 +204,7 @@ begin
     end;
     if (mcb < cnt) then mcb := cnt;
   end;
-  e_WriteLog(Format('grid size: %dx%d (tile size: %d); pix: %dx%d; used cells: %d; max bodies in cell: %d; proxies allocated: %d', [mWidth, mHeight, mTileSize, mWidth*mTileSize, mHeight*mTileSize, mUsedCells, mcb, mProxyCount]), MSG_NOTIFY);
+  e_WriteLog(Format('grid size: %dx%d (tile size: %d); pix: %dx%d; used cells: %d; max bodies in cell: %d; max proxies allocated: %d; proxies used: %d', [mWidth, mHeight, mTileSize, mWidth*mTileSize, mHeight*mTileSize, mUsedCells, mcb, mProxyMaxCount, mProxyCount]), MSG_NOTIFY);
 end;
 
 
@@ -260,7 +219,11 @@ begin
     SetLength(mCells, mFreeCell+32768); // arbitrary number
     for idx := mFreeCell to High(mCells) do
     begin
-      mCells[idx].body := nil;
+      {$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
@@ -277,8 +240,8 @@ procedure TBodyGrid.freeCell (idx: Integer);
 begin
   if (idx >= 0) and (idx < High(mCells)) then
   begin
-    if mCells[idx].body = nil then exit; // the thing that should not be
-    mCells[idx].body := nil;
+    //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);
@@ -287,46 +250,40 @@ end;
 
 
 function TBodyGrid.allocProxy (aX, aY, aWidth, aHeight: Integer; aObj: TObject; aTag: Integer): TBodyProxy;
+var
+  olen, idx: Integer;
+  px: PBodyProxyRec;
 begin
-  if (mProxyFree = nil) then
-  begin
-    // no free proxies, create new
-    result := TBodyProxy.Create(self, aX, aY, aWidth, aHeight, aObj, aTag);
-    Inc(mProxyCount);
-  end
-  else
+  if (mProxyFree = -1) then
   begin
-    // get one from list
-    result := mProxyFree;
-    mProxyFree := result.nextLink;
-    result.setup(aX, aY, aWidth, aHeight, aObj, aTag);
+    // no free proxies, resize list
+    olen := Length(mProxies);
+    SetLength(mProxies, olen+8192); // arbitrary number
+    for idx := olen to High(mProxies) do mProxies[idx].nextLink := idx+1;
+    mProxies[High(mProxies)].nextLink := -1;
+    mProxyFree := olen;
   end;
+  // get one from list
+  result := mProxyFree;
+  px := @mProxies[result];
+  mProxyFree := px.nextLink;
+  px.setup(aX, aY, aWidth, aHeight, aObj, aTag);
   // add to used list
-  result.nextLink := mProxyList;
-  if (mProxyList <> nil) then mProxyList.prevLink := result;
-  mProxyList := result;
+  px.nextLink := -1;
+  // statistics
+  Inc(mProxyCount);
+  if (mProxyMaxCount < mProxyCount) then mProxyMaxCount := mProxyCount;
 end;
 
 procedure TBodyGrid.freeProxy (body: TBodyProxy);
 begin
-  if body = nil then exit; // just in case
-  // remove from used list
-  if (body.prevLink = nil) then
-  begin
-    // this must be head
-    if (body <> mProxyList) then raise Exception.Create('wutafuuuuu in grid?');
-    mProxyList := body.nextLink;
-  end
-  else
-  begin
-    body.prevLink.nextLink := body.nextLink;
-  end;
-  if (body.nextLink <> nil) then body.nextLink.prevLink := body.prevLink;
+  if (body < 0) or (body > High(mProxies)) then exit; // just in case
+  if (mProxyCount = 0) then raise Exception.Create('wutafuuuuu in grid (no allocated proxies, what i should free now?)');
   // add to free list
-  //body.mObj := nil; //WARNING! DON'T DO THIS! `removeBody()` depends on valid mObj
-  body.prevLink := nil;
-  body.nextLink := mProxyFree;
+  mProxies[body].mObj := nil;
+  mProxies[body].nextLink := mProxyFree;
   mProxyFree := body;
+  Dec(mProxyCount);
 end;
 
 
@@ -361,25 +318,59 @@ 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
+  px: PBodyProxyRec;
 begin
-  if body = nil then exit;
-  forGridRect(body.mX, body.mY, body.mWidth, body.mHeight, inserter);
+  if (body < 0) or (body > High(mProxies)) then exit; // just in case
+  px := @mProxies[body];
+  forGridRect(px.mX, px.mY, px.mWidth, px.mHeight, inserter);
 end;
 
 
 // absolutely not tested
 procedure TBodyGrid.remove (body: TBodyProxy);
 
+(*
   function remover (grida: Integer): Boolean;
   var
     pidx, idx, tmp: Integer;
@@ -405,9 +396,16 @@ procedure TBodyGrid.remove (body: TBodyProxy);
     end;
   end;
 
+var
+  px: PBodyProxyRec;
+*)
 begin
-  if body = nil then exit;
-  forGridRect(body.mX, body.mY, body.mWidth, body.mHeight, remover);
+(*
+  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;
 
 
@@ -418,28 +416,26 @@ begin
 end;
 
 
-// WARNING! this will NOT destroy proxy!
 procedure TBodyGrid.removeBody (aObj: TBodyProxy);
 begin
-  if aObj = nil then exit;
-  if (aObj.mGrid <> self) then raise Exception.Create('trying to remove alien proxy from grid');
+  if (aObj < 0) or (aObj > High(mProxies)) then exit; // just in case
   removeBody(aObj);
-  //HACK!
   freeProxy(aObj);
-  if (mProxyFree <> aObj) then raise Exception.Create('grid deletion invariant fucked');
-  mProxyFree := aObj.nextLink;
-  aObj.nextLink := nil;
 end;
 
 
 procedure TBodyGrid.moveResizeBody (body: TBodyProxy; dx, dy, sx, sy: Integer);
+var
+  px: PBodyProxyRec;
 begin
-  if (body = nil) or ((dx = 0) and (dy = 0) and (sx = 0) and (sy = 0)) then exit;
+  if (body < 0) or (body > High(mProxies)) then exit; // just in case
+  if ((dx = 0) and (dy = 0) and (sx = 0) and (sy = 0)) then exit;
   remove(body);
-  Inc(body.mX, dx);
-  Inc(body.mY, dy);
-  Inc(body.mWidth, sx);
-  Inc(body.mHeight, sy);
+  px := @mProxies[body];
+  Inc(px.mX, dx);
+  Inc(px.mY, dy);
+  Inc(px.mWidth, sx);
+  Inc(px.mHeight, sy);
   insert(body);
 end;
 
@@ -454,22 +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
+    while (idx >= 0) do
     begin
-      if (mCells[idx].body <> nil) and (mCells[idx].body.mQueryMark <> mLastQuery) then
+      {$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
-        //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);
-        mCells[idx].body.mQueryMark := mLastQuery;
-        if (cb(mCells[idx].body.mObj, mCells[idx].body.mTag)) then begin result := true; exit; end;
+        px := @mProxies[mCells[idx].body];
+        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 := mCells[idx].next;
+      {$ENDIF}
     end;
   end;
 
@@ -485,7 +506,7 @@ begin
   begin
     // just in case of overflow
     mLastQuery := 1;
-    for idx := 0 to High(mCells) do if (mCells[idx].body <> nil) then mCells[idx].body.mQueryMark := 0;
+    for idx := 0 to High(mProxies) do mProxies[idx].mQueryMark := 0;
   end;
   //e_WriteLog(Format('grid: query #%d: (%d,%d)-(%dx%d)', [mLastQuery, minx, miny, maxx, maxy]), MSG_NOTIFY);
 
@@ -493,9 +514,10 @@ begin
 end;
 
 
+(*
 function TBodyGrid.getProxyForBody (aObj: TObject; x, y, w, h: Integer): TBodyProxy;
 var
-  res: TBodyProxy = nil;
+  res: TBodyProxy = -1;
 
   function iterator (grida: Integer): Boolean;
   var
@@ -505,7 +527,7 @@ var
     idx := mGrid[grida];
     while idx >= 0 do
     begin
-      if (mCells[idx].body <> nil) and (mCells[idx].body = aObj) then
+      if (mCells[idx].body <> -1) and (mProxies[mCells[idx].body].mObj = aObj) then
       begin
         result := true;
         res := mCells[idx].body;
@@ -516,90 +538,12 @@ var
   end;
 
 begin
-  result := nil;
+  result := -1;
   if (aObj = nil) then exit;
   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.