diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 27b553a30b26e98a9ad63dbfeb63aa2c890dee54..19c4d0d2ca8f31fc39170217693375c3d8cc5de2 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
*)
// universal spatial grid
{$INCLUDE ../shared/a_modes.inc}
+{$IF DEFINED(D2F_DEBUG)}
+ {.$DEFINE D2F_DEBUG_RAYTRACE}
+ {.$DEFINE D2F_DEBUG_XXQ}
+{$ENDIF}
unit g_grid;
interface
public
dbgShowTraceLog: Boolean;
+ {$IF DEFINED(D2F_DEBUG)}
+ dbgRayTraceTileHitCB: TCellQueryCB;
+ {$ENDIF}
private
function allocCell (): Integer;
// you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
// cb with `(nil)` will be called before processing new tile
// no callback: return `true` on the nearest hit
- function traceRay (x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; overload;
- function traceRay (out ex, ey: Integer; ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
+ //WARNING: don't change tags in callbacks here!
+ function traceRay (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; overload;
+ function traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
//WARNING: don't modify grid while any query is in progress (no checks are made!)
// you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
// trace line along the grid, calling `cb` for all objects in passed cells, in no particular order
- function forEachAlongLine (x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
+ //WARNING: don't change tags in callbacks here!
+ function forEachAlongLine (const x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
// debug
procedure forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB);
idx: Integer;
begin
dbgShowTraceLog := false;
+ {$IF DEFINED(D2F_DEBUG)}
+ dbgRayTraceTileHitCB := nil;
+ {$ENDIF}
{
if aTileSize < 1 then aTileSize := 1;
if aTileSize > 8192 then aTileSize := 8192; // arbitrary limit
for idx := 0 to High(mCells) do
begin
mCells[idx].bodies[0] := -1;
+ mCells[idx].bodies[GridCellBucketSize-1] := -1; // "has free room" flag
mCells[idx].next := idx+1;
end;
mCells[High(mCells)].next := -1; // last cell
var
g, f, cidx: Integer;
cc: PGridCell;
- //px: PBodyProxyRec;
begin
if (body < 0) or (body > High(mProxies)) or not assigned(cb) then exit;
for g := 0 to High(mGrid) do
while (cidx <> -1) do
begin
cc := @mCells[cidx];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
if (cc.bodies[f] = body) then cb((g mod mWidth)*mTileSize+mMinX, (g div mWidth)*mTileSize+mMinY);
- //px := @mProxies[cc.bodies[f]];
end;
// next cell
cidx := cc.next;
while (cidx <> -1) do
begin
cc := @mCells[cidx];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
if cb(mProxies[cc.bodies[f]].mObj, mProxies[cc.bodies[f]].mTag) then begin result := mProxies[cc.bodies[f]].mObj; exit; end;
function TBodyGridBase.allocCell (): Integer;
var
idx: Integer;
+ pc: PGridCell;
begin
if (mFreeCell < 0) then
begin
for idx := mFreeCell to High(mCells) do
begin
mCells[idx].bodies[0] := -1;
+ mCells[idx].bodies[GridCellBucketSize-1] := -1; // 'has free room' flag
mCells[idx].next := idx+1;
end;
mCells[High(mCells)].next := -1; // last cell
end;
result := mFreeCell;
- mFreeCell := mCells[result].next;
- mCells[result].next := -1;
- mCells[result].bodies[0] := -1;
+ pc := @mCells[result];
+ mFreeCell := pc.next;
+ pc.next := -1;
Inc(mUsedCells);
//e_WriteLog(Format('grid: allocated new cell #%d (total: %d)', [result, mUsedCells]), MSG_NOTIFY);
end;
begin
if (idx >= 0) and (idx < Length(mCells)) then
begin
- //if mCells[idx].body = -1 then exit; // the thing that should not be
- mCells[idx].bodies[0] := -1;
- mCells[idx].next := mFreeCell;
+ with mCells[idx] do
+ begin
+ bodies[0] := -1;
+ bodies[GridCellBucketSize-1] := -1; // 'has free room' flag
+ next := mFreeCell;
+ end;
mFreeCell := idx;
Dec(mUsedCells);
end;
pc := mGrid[grida];
if (pc <> -1) then
begin
- pi := @mCells[pc];
- f := 0;
- for f := 0 to High(TGridCell.bodies) do
+ {$IF DEFINED(D2F_DEBUG)}
+ cidx := pc;
+ while (cidx <> -1) do
+ begin
+ pi := @mCells[cidx];
+ for f := 0 to GridCellBucketSize-1 do
+ begin
+ if (pi.bodies[f] = -1) then break;
+ if (pi.bodies[f] = bodyId) then raise Exception.Create('trying to insert already inserted proxy');
+ end;
+ cidx := pi.next;
+ end;
+ {$ENDIF}
+ cidx := pc;
+ while (cidx <> -1) do
begin
- if (pi.bodies[f] = -1) then
+ pi := @mCells[cidx];
+ // check "has room" flag
+ if (pi.bodies[GridCellBucketSize-1] = -1) then
begin
// can add here
- pi.bodies[f] := bodyId;
- if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
- exit;
+ for f := 0 to GridCellBucketSize-1 do
+ begin
+ if (pi.bodies[f] = -1) then
+ begin
+ pi.bodies[f] := bodyId;
+ if (f+1 < GridCellBucketSize) then pi.bodies[f+1] := -1;
+ exit;
+ end;
+ end;
+ raise Exception.Create('internal error in grid inserter');
end;
+ // no room, go to next cell in list (if there is any)
+ cidx := pi.next;
end;
+ // no room in cells, add new cell to list
end;
// either no room, or no cell at all
cidx := allocCell();
- mCells[cidx].bodies[0] := bodyId;
- mCells[cidx].bodies[1] := -1;
- mCells[cidx].next := pc;
+ pi := @mCells[cidx];
+ pi.bodies[0] := bodyId;
+ pi.bodies[1] := -1;
+ pi.next := pc;
mGrid[grida] := cidx;
end;
end;
-// absolutely not tested
+// assume that we cannot have one object added to bucket twice
function TBodyGridBase.remover (grida: Integer; bodyId: TBodyProxyId): Boolean;
var
- f: Integer;
- pidx, idx, tmp: Integer;
+ f, c: Integer;
+ pidx, cidx: Integer;
pc: PGridCell;
begin
result := false; // never stop
// find and remove cell
- pidx := -1;
- idx := mGrid[grida];
- while (idx >= 0) do
+ pidx := -1; // previous cell index
+ cidx := mGrid[grida]; // current cell index
+ while (cidx <> -1) do
begin
- tmp := mCells[idx].next;
- pc := @mCells[idx];
- f := 0;
- while (f < High(TGridCell.bodies)) do
+ pc := @mCells[cidx];
+ for f := 0 to GridCellBucketSize-1 do
begin
if (pc.bodies[f] = bodyId) then
begin
if (f = 0) and (pc.bodies[1] = -1) then
begin
// this cell contains no elements, remove it
- tmp := mCells[idx].next;
- if (pidx = -1) then mGrid[grida] := tmp else mCells[pidx].next := tmp;
- freeCell(idx);
- end
- else
+ if (pidx = -1) then mGrid[grida] := pc.next else mCells[pidx].next := pc.next;
+ freeCell(cidx);
+ exit;
+ end;
+ // remove element from bucket
+ for c := f to GridCellBucketSize-2 do
begin
- // remove element from bucket
- Inc(f);
- while (f < High(TGridCell.bodies)) do
- begin
- pc.bodies[f-1] := pc.bodies[f];
- if (pc.bodies[f] = -1) then break;
- Inc(f);
- end;
- pc.bodies[High(TGridCell.bodies)] := -1; // just in case
+ pc.bodies[c] := pc.bodies[c+1];
+ if (pc.bodies[c] = -1) then break;
end;
- exit; // assume that we cannot have one object added to bucket twice
+ pc.bodies[GridCellBucketSize-1] := -1; // "has free room" flag
+ exit;
end;
- Inc(f);
end;
- pidx := idx;
- idx := tmp;
+ pidx := cidx;
+ cidx := pc.next;
end;
end;
-// absolutely not tested
procedure TBodyGridBase.removeInternal (body: TBodyProxyId);
var
px: PBodyProxyRec;
end;
end;
+//TODO: optimize for horizontal/vertical moves
procedure TBodyGridBase.moveBody (body: TBodyProxyId; nx, ny: Integer);
var
px: PBodyProxyRec;
x0, y0: Integer;
+ ogx0, ogx1, ogy0, ogy1: Integer; // old grid rect
+ ngx0, ngx1, ngy0, ngy1: Integer; // new grid rect
+ gx, gy: Integer;
+ gw, gh: Integer;
+ pw, ph: Integer;
begin
if (body < 0) or (body > High(mProxies)) then exit; // just in case
// check if tile coords was changed
x0 := px.mX;
y0 := px.mY;
if (nx = x0) and (ny = y0) then exit;
- if (nx div mTileSize <> x0 div mTileSize) or (ny div mTileSize <> y0 div mTileSize) then
+ // map -> grid
+ Dec(x0, mMinX);
+ Dec(y0, mMinX);
+ Dec(nx, mMinX);
+ Dec(ny, mMinX);
+ // check for heavy work
+ pw := px.mWidth;
+ ph := px.mHeight;
+ ogx0 := x0 div mTileSize;
+ ogy0 := y0 div mTileSize;
+ ngx0 := nx div mTileSize;
+ ngy0 := ny div mTileSize;
+ ogx1 := (x0+pw-1) div mTileSize;
+ ogy1 := (y0+ph-1) div mTileSize;
+ ngx1 := (nx+pw-1) div mTileSize;
+ ngy1 := (ny+ph-1) div mTileSize;
+ if (ogx0 <> ngx0) or (ogy0 <> ngy0) or (ogx1 <> ngx1) or (ogy1 <> ngy1) then
begin
// crossed tile boundary, do heavy work
- removeInternal(body);
- px.mX := nx;
- px.mY := ny;
- insertInternal(body);
- end
- else
- begin
- // nothing to do with the grid, just fix coordinates
- px.mX := nx;
- px.mY := ny;
+ gw := mWidth;
+ gh := mHeight;
+ // cycle with old rect, remove body where it is necessary
+ // optimized for horizontal moves
+ //e_WriteLog(Format('og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+ // remove stale marks
+ if not ((ogy0 >= gh) or (ogy1 < 0)) and
+ not ((ogx0 >= gw) or (ogx1 < 0)) then
+ begin
+ if (ogx0 < 0) then ogx0 := 0;
+ if (ogy0 < 0) then ogy0 := 0;
+ if (ogx1 > gw-1) then ogx1 := gw-1;
+ if (ogy1 > gh-1) then ogy1 := gh-1;
+ //e_WriteLog(Format(' norm og:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1]), MSG_NOTIFY);
+ for gx := ogx0 to ogx1 do
+ begin
+ if (gx < ngx0) or (gx > ngx1) then
+ begin
+ // this column is completely outside of new rect
+ for gy := ogy0 to ogy1 do
+ begin
+ //e_WriteLog(Format(' remove:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+ remover(gy*gw+gx, body);
+ end;
+ end
+ else
+ begin
+ // heavy checks
+ for gy := ogy0 to ogy1 do
+ begin
+ if (gy < ngy0) or (gy > ngy1) then
+ begin
+ //e_WriteLog(Format(' remove:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+ remover(gy*gw+gx, body);
+ end;
+ end;
+ end;
+ end;
+ end;
+ // cycle with new rect, add body where it is necessary
+ if not ((ngy0 >= gh) or (ngy1 < 0)) and
+ not ((ngx0 >= gw) or (ngx1 < 0)) then
+ begin
+ if (ngx0 < 0) then ngx0 := 0;
+ if (ngy0 < 0) then ngy0 := 0;
+ if (ngx1 > gw-1) then ngx1 := gw-1;
+ if (ngy1 > gh-1) then ngy1 := gh-1;
+ //e_WriteLog(Format(' norm ng:(%d,%d)-(%d,%d)', [ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+ for gx := ngx0 to ngx1 do
+ begin
+ if (gx < ogx0) or (gx > ogx1) then
+ begin
+ // this column is completely outside of old rect
+ for gy := ngy0 to ngy1 do
+ begin
+ //e_WriteLog(Format(' insert:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+ inserter(gy*gw+gx, body);
+ end;
+ end
+ else
+ begin
+ // heavy checks
+ for gy := ngy0 to ngy1 do
+ begin
+ if (gy < ogy0) or (gy > ogy1) then
+ begin
+ //e_WriteLog(Format(' insert:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+ inserter(gy*gw+gx, body);
+ end;
+ end;
+ end;
+ end;
+ end;
+ // done
end;
+ // update coordinates
+ px.mX := nx+mMinX;
+ px.mY := ny+mMinY;
end;
procedure TBodyGridBase.resizeBody (body: TBodyProxyId; nw, nh: Integer);
tagmask := tagmask and TagFullMask;
if (tagmask = 0) then exit;
+ {$IF DEFINED(D2F_DEBUG_XXQ)}
+ if (assigned(cb)) then e_WriteLog(Format('0: grid pointquery: (%d,%d)', [x, y]), MSG_NOTIFY);
+ {$ENDIF}
+
// make coords (0,0)-based
Dec(x, mMinX);
Dec(y, mMinY);
if (x < 0) or (y < 0) or (x >= mWidth*mTileSize) or (y >= mHeight*mTileSize) then exit;
curci := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)];
+
+ {$IF DEFINED(D2F_DEBUG_XXQ)}
+ if (assigned(cb)) then e_WriteLog(Format('1: grid pointquery: (%d,%d) (%d,%d) %d', [x, y, (x div mTileSize), (y div mTileSize), curci]), MSG_NOTIFY);
+ {$ENDIF}
+
// restore coords
Inc(x, mMinX);
Inc(y, mMinY);
end;
lq := mLastQuery;
+ {$IF DEFINED(D2F_DEBUG_XXQ)}
+ if (assigned(cb)) then e_WriteLog(Format('2: grid pointquery: (%d,%d); lq=%u', [x, y, lq]), MSG_NOTIFY);
+ {$ENDIF}
+
while (curci <> -1) do
begin
+ {$IF DEFINED(D2F_DEBUG_XXQ)}
+ if (assigned(cb)) then e_WriteLog(Format(' cell #%d', [curci]), MSG_NOTIFY);
+ {$ENDIF}
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
- ptag := px.mTag;
- if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
+ {$IF DEFINED(D2F_DEBUG_XXQ)}
+ if (assigned(cb)) then e_WriteLog(Format(' proxy #%d; qm:%u; tag:%08x; tagflag:%d %u', [cc.bodies[f], px.mQueryMark, px.mTag, (px.mTag and tagmask), LongWord(px.mObj)]), MSG_NOTIFY);
+ {$ENDIF}
+ // shit. has to do it this way, so i can change tag in callback
+ if (px.mQueryMark <> lq) then
begin
- if (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
+ px.mQueryMark := lq;
+ ptag := px.mTag;
+ if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and
+ (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
begin
- px.mQueryMark := lq;
if assigned(cb) then
begin
if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
+ // shit. has to do it this way, so i can change tag in callback
+ if (px.mQueryMark = lq) then continue;
+ px.mQueryMark := lq;
ptag := px.mTag;
if (not allowDisabled) and ((ptag and TagDisabled) <> 0) then continue;
- if ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
- //if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
- //if ( ((ptag and TagDisabled) = 0) = ignoreDisabled) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
+ if ((ptag and tagmask) = 0) then continue;
+ if (x0 >= px.mX+px.mWidth) or (y0 >= px.mY+px.mHeight) then continue;
+ if (x0+w <= px.mX) or (y0+h <= px.mY) then continue;
+ if assigned(cb) then
begin
- if (x0 >= px.mX+px.mWidth) or (y0 >= px.mY+px.mHeight) then continue;
- if (x0+w <= px.mX) or (y0+h <= px.mY) then continue;
- px.mQueryMark := lq;
- if assigned(cb) then
- begin
- if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
- end
- else
- begin
- result := px.mObj;
- exit;
- end;
+ if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
+ end
+ else
+ begin
+ result := px.mObj;
+ exit;
end;
end;
curci := cc.next;
// ////////////////////////////////////////////////////////////////////////// //
// no callback: return `true` on the nearest hit
-function TBodyGridBase.traceRay (x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.traceRay (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
var
ex, ey: Integer;
begin
// no callback: return `true` on the nearest hit
// you are not supposed to understand this
-function TBodyGridBase.traceRay (out ex, ey: Integer; ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
const
tsize = mTileSize;
var
maxx := gw*tsize-1;
maxy := gh*tsize-1;
+ {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+ if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format('TRACING: (%d,%d)-(%d,%d) [(%d,%d)-(%d,%d)]; maxdistsq=%d', [ax0, ay0, ax1, ay1, minx, miny, maxx, maxy, lastDistSq]), MSG_NOTIFY);
+ {$ENDIF}
+
x0 := ax0;
y0 := ay0;
x1 := ax1;
if (xd = term) then exit;
{$IF DEFINED(D2F_DEBUG)}
- if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ > mHeight*tsize) then raise Exception.Create('raycaster internal error (0)');
+ if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ >= gh*tsize) then raise Exception.Create('raycaster internal error (0)');
{$ENDIF}
+ lastGA := (yptr^ div tsize)*gw+(xptr^ div tsize);
+ ccidx := mGrid[lastGA];
- //if (dbgShowTraceLog) then e_WriteLog(Format('raycast start: (%d,%d)-(%d,%d); xptr^=%d; yptr^=%d', [ax0, ay0, ax1, ay1, xptr^, yptr^]), MSG_NOTIFY);
+ {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+ //if assigned(dbgRayTraceTileHitCB) then e_WriteLog('1:TRACING!', MSG_NOTIFY);
+ {$ENDIF}
- // restore query coords
- Inc(ax0, minx);
- Inc(ay0, miny);
- //Inc(ax1, minx);
- //Inc(ay1, miny);
+ {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+ if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny);
+ {$ENDIF}
+
+ //if (dbgShowTraceLog) then e_WriteLog(Format('raycast start: (%d,%d)-(%d,%d); xptr^=%d; yptr^=%d', [ax0, ay0, ax1, ay1, xptr^, yptr^]), MSG_NOTIFY);
// increase query counter
Inc(mLastQuery);
begin
// check cell(s)
{$IF DEFINED(D2F_DEBUG)}
- if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ > mHeight*tsize) then raise Exception.Create('raycaster internal error (0)');
+ if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ >= gh*tsize) then raise Exception.Create('raycaster internal error (0)');
{$ENDIF}
// new tile?
ga := (yptr^ div tsize)*gw+(xptr^ div tsize);
if (ga <> lastGA) then
begin
// yes
+ {$IF DEFINED(D2F_DEBUG)}
+ if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny);
+ {$ENDIF}
if (ccidx <> -1) then
begin
// signal cell completion
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
ey := prevy;
exit;
end;
+ (*
+ {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+ distSq := distanceSq(ax0, ay0, prevx, prevy);
+ if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format(' hit(%d): a=(%d,%d), h=(%d,%d), p=(%d,%d); distsq=%d; lastsq=%d', [cc.bodies[f], ax0, ay0, x, y, prevx, prevy, distSq, lastDistSq]), MSG_NOTIFY);
+ if (distSq < lastDistSq) then
+ begin
+ wasHit := true;
+ lastDistSq := distSq;
+ ex := prevx;
+ ey := prevy;
+ lastObj := px.mObj;
+ end;
+ {$ENDIF}
+ *)
end
else
begin
// remember this hitpoint if it is nearer than an old one
distSq := distanceSq(ax0, ay0, prevx, prevy);
+ {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+ if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format(' hit(%d): a=(%d,%d), h=(%d,%d), p=(%d,%d); distsq=%d; lastsq=%d', [cc.bodies[f], ax0, ay0, x, y, prevx, prevy, distSq, lastDistSq]), MSG_NOTIFY);
+ {$ENDIF}
if (distSq < lastDistSq) then
begin
wasHit := true;
// ////////////////////////////////////////////////////////////////////////// //
//FIXME! optimize this with real tile walking
-function TBodyGridBase.forEachAlongLine (x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
+function TBodyGridBase.forEachAlongLine (const x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
const
tsize = mTileSize;
var
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];