diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 41f03adea7bcf5fbd0bd7f3f6b402e840c4b955d..02624b7f9eafd40c7133a49fb534699a1cd780d2 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
mProxyFree: TBodyProxyId; // free
mProxyCount: Integer; // currently used
mProxyMaxCount: Integer;
- mInQuery: Boolean;
+ //mInQuery: Boolean;
public
dbgShowTraceLog: Boolean;
//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)
// no callback: return object on the first hit or nil
- function forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1; exittag: PInteger=nil): ITP;
+ //function forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1{; exittag: PInteger=nil}): ITP;
+ function forEachAtPoint (x, y: Integer; tagmask: Integer=-1; allowDisabled: Boolean=false; firstHit: Boolean=false): Integer;
function atCellInPoint (x, y: Integer): TAtPointEnumerator;
// ////////////////////////////////////////////////////////////////////////// //
// no callback: return `true` on the first hit
-function TBodyGridBase.forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1; exittag: PInteger=nil): ITP;
+function TBodyGridBase.forEachAtPoint (x, y: Integer; tagmask: Integer=-1; allowDisabled: Boolean=false; firstHit: Boolean=false): Integer;
var
f: Integer;
idx, curci: Integer;
px: PBodyProxyRec;
lq: LongWord;
ptag: Integer;
+ presobj: PITP;
begin
- result := Default(ITP);
- if (exittag <> nil) then exittag^ := 0;
+ result := 0;
tagmask := tagmask and TagFullMask;
if (tagmask = 0) then exit;
while (curci <> -1) do
begin
{$IF DEFINED(D2F_DEBUG_XXQ)}
- if (assigned(cb)) then e_WriteLog(Format(' cell #%d', [curci]), MSG_NOTIFY);
+ //if (assigned(cb)) then e_WriteLog(Format(' cell #%d', [curci]), MSG_NOTIFY);
{$ENDIF}
cc := @mCells[curci];
for f := 0 to GridCellBucketSize-1 do
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
{$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);
+ //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
+ 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) then continue;
+ if (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
begin
- 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
- if assigned(cb) then
- begin
- if cb(px.mObj, ptag) then
- begin
- result := px.mObj;
- if (exittag <> nil) then exittag^ := ptag;
- exit;
- end;
- end
- else
- begin
- result := px.mObj;
- if (exittag <> nil) then exittag^ := ptag;
- exit;
- end;
- end;
+ presobj := PITP(framePool.alloc(sizeof(ITP)));
+ Move(px.mObj, presobj^, sizeof(ITP));
+ Inc(result);
+ if (firstHit) then begin {mInQuery := false;} exit; end;
end;
end;
curci := cc.next;
begin
result := 0;
if (w < 1) or (h < 1) then exit;
+
+ if (w = 1) and (h = 1) then
+ begin
+ result := forEachAtPoint(x, y, tagmask, allowDisabled, firstHit);
+ exit;
+ end;
+
tagmask := tagmask and TagFullMask;
if (tagmask = 0) then exit;
if (sx > ex) or (sy > ey) then exit; // just in case
// has something to do
- if mInQuery then raise Exception.Create('recursive queries aren''t supported');
- mInQuery := true;
+ //if mInQuery then raise Exception.Create('recursive queries aren''t supported');
+ //mInQuery := true;
// increase query counter
Inc(mLastQuery);
presobj := PITP(framePool.alloc(sizeof(ITP)));
Move(px.mObj, presobj^, sizeof(ITP));
Inc(result);
- if (firstHit) then begin mInQuery := false; exit; end;
+ if (firstHit) then begin {mInQuery := false;} exit; end;
(*
if assigned(cb) then
begin
end;
end;
- mInQuery := false;
+ //mInQuery := false;
end;
lw := TLineWalker.Create(0, 0, gw*mTileSize-1, gh*mTileSize-1);
if not lw.setup(x0, y0, x1, y1) then exit; // out of screen
- if mInQuery then raise Exception.Create('recursive queries aren''t supported');
- mInQuery := true;
+ //if mInQuery then raise Exception.Create('recursive queries aren''t supported');
+ //mInQuery := true;
// increase query counter
Inc(mLastQuery);
if cb(px.mObj, ptag) then
begin
result := px.mObj;
- mInQuery := false;
+ //mInQuery := false;
exit;
end;
end;
// done processing cells, move to next tile
until lw.stepToNextTile();
- mInQuery := false;
+ //mInQuery := false;
end;
// just in case
if (cx0 > cx1) or (cy0 > cy1) then exit;
- if mInQuery then raise Exception.Create('recursive queries aren''t supported');
- mInQuery := true;
+ //if mInQuery then raise Exception.Create('recursive queries aren''t supported');
+ //mInQuery := true;
// increase query counter
Inc(mLastQuery);
begin
ex := ax0;
ey := ay0;
- mInQuery := false;
+ //mInQuery := false;
exit;
end;
end;
end;
end;
- mInQuery := false;
+ //mInQuery := false;
end;
{$IF DEFINED(D2F_DEBUG_OTR)}
s: AnsiString = '';
{$ENDIF}
+ pmark: PoolMark;
begin
result := false;
ex := ax1;
tagmask := tagmask and TagFullMask;
if (tagmask = 0) then exit;
- if (forEachAtPoint(ax0, ay0, nil, tagmask) = nil) then exit;
+ pmark := framePool.mark();
+ if (forEachAtPoint(ax0, ay0, tagmask, false, true) = 0) then exit;
+ framePool.release(pmark);
minx := mMinX;
miny := mMinY;
//if assigned(dbgRayTraceTileHitCB) then e_LogWritefln('*** traceRay: (%s,%s)-(%s,%s)', [x0, y0, x1, y1]);
{$ENDIF}
- if mInQuery then raise Exception.Create('recursive queries aren''t supported');
- mInQuery := true;
+ //if mInQuery then raise Exception.Create('recursive queries aren''t supported');
+ //mInQuery := true;
// increase query counter
Inc(mLastQuery);
ex := ax0;
ey := ay0;
result := px.mObj;
- mInQuery := false;
+ //mInQuery := false;
{$IF DEFINED(D2F_DEBUG)}
if assigned(dbgRayTraceTileHitCB) then e_LogWriteln(' INSIDE!');
{$ENDIF}
end;
// done processing cells; exit if we registered a hit
// next cells can't have better candidates, obviously
- if wasHit then begin mInQuery := false; exit; end;
+ if wasHit then begin {mInQuery := false;} exit; end;
firstCell := false;
// move to next tile
until lw.stepToNextTile();
- mInQuery := false;
+ //mInQuery := false;
end;