diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 9b99c7c976f9bf2f8796cab8b17e330db26ad5ff..81f19c12af6fbfc64072bbd7dbb35510ef8cf6b2 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
type TGridRayQueryCB = function (obj: ITP; tag: Integer; x, y, prevx, prevy: Integer): Boolean is nested; // return `true` to stop
type TGridAlongQueryCB = function (obj: ITP; tag: Integer): Boolean is nested; // return `true` to stop
+ type TCellQueryCB = procedure (x, y: Integer) is nested; // top-left cell corner coords
+
const TagDisabled = $40000000;
const TagFullMask = $3fffffff;
private
const
- GridDefaultTileSize = 32;
+ GridDefaultTileSize = 32; // must be power of two!
GridCellBucketSize = 8; // WARNING! can't be less than 2!
private
//mTileSize: Integer;
const mTileSize = GridDefaultTileSize;
+ public
+ const tileSize = mTileSize;
+
private
mMinX, mMinY: Integer; // so grids can start at any origin
mWidth, mHeight: Integer; // in tiles
function insertBody (aObj: ITP; ax, ay, aWidth, aHeight: Integer; aTag: Integer=-1): TBodyProxyId;
procedure removeBody (body: TBodyProxyId); // WARNING! this WILL destroy proxy!
- procedure moveBody (body: TBodyProxyId; dx, dy: Integer);
- procedure resizeBody (body: TBodyProxyId; sx, sy: Integer);
- procedure moveResizeBody (body: TBodyProxyId; dx, dy, sx, sy: Integer);
+ procedure moveBody (body: TBodyProxyId; nx, ny: Integer);
+ procedure resizeBody (body: TBodyProxyId; nw, nh: Integer);
+ procedure moveResizeBody (body: TBodyProxyId; nx, ny, nw, nh: Integer);
function insideGrid (x, y: Integer): Boolean; inline;
//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): ITP;
+ function forEachAlongLine (x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
+ // debug
+ procedure forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB);
+ function forEachInCell (x, y: Integer; cb: TGridQueryCB): ITP;
procedure dumpStats ();
//WARNING! no sanity checks!
// if result is `false`, `inx` and `iny` are undefined
function lineAABBIntersects (x0, y0, x1, y1: Integer; bx, by, bw, bh: Integer; out inx, iny: Integer): Boolean;
-procedure swapInt (var a: Integer; var b: Integer); inline;
function distanceSq (x0, y0, x1, y1: Integer): Integer; inline;
+procedure swapInt (var a: Integer; var b: Integer); inline;
+function minInt (a, b: Integer): Integer; inline;
+function maxInt (a, b: Integer): Integer; inline;
+
implementation
// ////////////////////////////////////////////////////////////////////////// //
procedure swapInt (var a: Integer; var b: Integer); inline; var t: Integer; begin t := a; a := b; b := t; end;
+function minInt (a, b: Integer): Integer; inline; begin if (a < b) then result := a else result := b; end;
+function maxInt (a, b: Integer): Integer; inline; begin if (a > b) then result := a else result := b; end;
function distanceSq (x0, y0, x1, y1: Integer): Integer; inline; begin result := (x1-x0)*(x1-x0)+(y1-y0)*(y1-y0); end;
end;
+procedure TBodyGridBase.forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB);
+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
+ begin
+ cidx := mGrid[g];
+ while (cidx <> -1) do
+ begin
+ cc := @mCells[cidx];
+ for f := 0 to High(TGridCell.bodies) 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;
+ end;
+ end;
+end;
+
+
+function TBodyGridBase.forEachInCell (x, y: Integer; cb: TGridQueryCB): ITP;
+var
+ f, cidx: Integer;
+ cc: PGridCell;
+begin
+ result := Default(ITP);
+ if not assigned(cb) then exit;
+ Dec(x, mMinX);
+ Dec(y, mMinY);
+ if (x < 0) or (y < 0) or (x >= mWidth*mTileSize) or (y > mHeight*mTileSize) then exit;
+ cidx := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)];
+ while (cidx <> -1) do
+ begin
+ cc := @mCells[cidx];
+ for f := 0 to High(TGridCell.bodies) 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;
+ end;
+ // next cell
+ cidx := cc.next;
+ end;
+end;
+
+
// ////////////////////////////////////////////////////////////////////////// //
function TBodyGridBase.getGridWidthPx (): Integer; inline; begin result := mWidth*mTileSize; end;
function TBodyGridBase.getGridHeightPx (): Integer; inline; begin result := mHeight*mTileSize; 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[High(TGridCell.bodies)] := -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;
+ //pc.bodies[0] := -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[High(TGridCell.bodies)] := -1; // 'has free room' flag
+ next := mFreeCell;
+ end;
mFreeCell := idx;
Dec(mUsedCells);
end;
if (pc <> -1) then
begin
pi := @mCells[pc];
- f := 0;
- for f := 0 to High(TGridCell.bodies) do
+ if (pi.bodies[High(TGridCell.bodies)] = -1) then
begin
- if (pi.bodies[f] = -1) then
+ // can add here
+ for f := 0 to High(TGridCell.bodies) do
begin
- // can add here
- pi.bodies[f] := bodyId;
- if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
- exit;
+ if (pi.bodies[f] = -1) then
+ begin
+ pi.bodies[f] := bodyId;
+ if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
+ exit;
+ end;
end;
+ raise Exception.Create('internal error in grid inserter');
end;
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 High(TGridCell.bodies) 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 High(TGridCell.bodies)-1 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[High(TGridCell.bodies)] := -1; // "has free room" flag
+ exit;
end;
- Inc(f);
end;
- pidx := idx;
- idx := tmp;
+ pidx := cidx;
+ cidx := pc.next;
end;
end;
// ////////////////////////////////////////////////////////////////////////// //
-procedure TBodyGridBase.moveResizeBody (body: TBodyProxyId; dx, dy, sx, sy: Integer);
+procedure TBodyGridBase.moveResizeBody (body: TBodyProxyId; nx, ny, nw, nh: Integer);
var
px: PBodyProxyRec;
x0, y0, w, h: Integer;
begin
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;
px := @mProxies[body];
x0 := px.mX;
y0 := px.mY;
w := px.mWidth;
h := px.mHeight;
+ if (nx = x0) and (ny = y0) and (nw = w) and (nh = h) then exit;
// did any corner crossed tile boundary?
- if (x0 div mTileSize <> (x0+dx) div mTileSize) or
- (y0 div mTileSize <> (y0+dx) div mTileSize) or
- ((x0+w) div mTileSize <> (x0+w+sx) div mTileSize) or
- ((y0+h) div mTileSize <> (y0+h+sy) div mTileSize) then
+ if (x0 div mTileSize <> nx div mTileSize) or
+ (y0 div mTileSize <> ny div mTileSize) or
+ ((x0+w) div mTileSize <> (nx+nw) div mTileSize) or
+ ((y0+h) div mTileSize <> (ny+nh) div mTileSize) then
begin
removeInternal(body);
- Inc(px.mX, dx);
- Inc(px.mY, dy);
- Inc(px.mWidth, sx);
- Inc(px.mHeight, sy);
+ px.mX := nx;
+ px.mY := ny;
+ px.mWidth := nw;
+ px.mHeight := nh;
insertInternal(body);
end
else
begin
- Inc(px.mX, dx);
- Inc(px.mY, dy);
- Inc(px.mWidth, sx);
- Inc(px.mHeight, sy);
+ px.mX := nx;
+ px.mY := ny;
+ px.mWidth := nw;
+ px.mHeight := nh;
end;
end;
-procedure TBodyGridBase.moveBody (body: TBodyProxyId; dx, dy: Integer);
+//TODO: optimize for horizontal/vertical moves
+procedure TBodyGridBase.moveBody (body: TBodyProxyId; nx, ny: Integer);
var
px: PBodyProxyRec;
- nx, ny: Integer;
+ 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
- if (dx = 0) and (dy = 0) then exit;
// check if tile coords was changed
px := @mProxies[body];
- nx := px.mX+dx;
- ny := px.mY+dy;
- if (nx div mTileSize <> px.mX div mTileSize) or (ny div mTileSize <> px.mY div mTileSize) then
+ x0 := px.mX;
+ y0 := px.mY;
+ if (nx = x0) and (ny = y0) then exit;
+ // 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
- moveResizeBody(body, dx, dy, 0, 0);
- 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; sx, sy: Integer);
+procedure TBodyGridBase.resizeBody (body: TBodyProxyId; nw, nh: Integer);
var
px: PBodyProxyRec;
- x0, y0: Integer;
- nw, nh: Integer;
+ x0, y0, w, h: Integer;
begin
if (body < 0) or (body > High(mProxies)) then exit; // just in case
- if (sx = 0) and (sy = 0) then exit;
// check if tile coords was changed
px := @mProxies[body];
x0 := px.mX;
y0 := px.mY;
- nw := px.mWidth+sx;
- nh := px.mHeight+sy;
- if ((x0+px.mWidth) div mTileSize <> (x0+nw) div mTileSize) or
- ((y0+px.mHeight) div mTileSize <> (y0+nh) div mTileSize) then
+ w := px.mWidth;
+ h := px.mHeight;
+ if ((x0+w) div mTileSize <> (x0+nw) div mTileSize) or
+ ((y0+h) div mTileSize <> (y0+nh) div mTileSize) then
begin
// crossed tile boundary, do heavy work
- moveResizeBody(body, 0, 0, sx, sy);
+ removeInternal(body);
+ px.mWidth := nw;
+ px.mHeight := nh;
+ insertInternal(body);
end
else
begin
// done?
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)');
+ {$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);
while (xd <> term) do
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)');
+ {$ENDIF}
// new tile?
ga := (yptr^ div tsize)*gw+(xptr^ div tsize);
if (ga <> lastGA) then
// ////////////////////////////////////////////////////////////////////////// //
//FIXME! optimize this with real tile walking
-function TBodyGridBase.forEachAlongLine (x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.forEachAlongLine (x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
const
tsize = mTileSize;
var
lastWasInGrid: Boolean;
tbcross: Boolean;
f: Integer;
+ //tedist: Integer;
begin
+ log := false;
result := Default(ITP);
tagmask := tagmask and TagFullMask;
- if (tagmask = 0) then exit;
+ if (tagmask = 0) or not assigned(cb) then exit;
minx := mMinX;
miny := mMinY;
if (dx > 0) then incx := 1 else if (dx < 0) then incx := -1 else incx := 0;
if (dy > 0) then incy := 1 else if (dy < 0) then incy := -1 else incy := 0;
+ if (incx = 0) and (incy = 0) then exit; // just incase
+
dx := abs(dx);
dy := abs(dy);
xerr := -d;
yerr := -d;
+ if (log) then e_WriteLog(Format('tracing: (%d,%d)-(%d,%d)', [x, y, x1-minx, y1-miny]), MSG_NOTIFY);
+
// now trace
- for i := 1 to d do
+ i := 0;
+ while (i < d) do
begin
+ Inc(i);
// do one step
xerr += dx;
yerr += dy;
// invariant: one of those always changed
+ {$IF DEFINED(D2F_DEBUG)}
if (xerr < 0) and (yerr < 0) then raise Exception.Create('internal bug in grid raycaster (0)');
+ {$ENDIF}
if (xerr >= 0) then begin xerr -= d; x += incx; stepx := incx; end else stepx := 0;
if (yerr >= 0) then begin yerr -= d; y += incy; stepy := incy; end else stepy := 0;
// invariant: we always doing a step
+ {$IF DEFINED(D2F_DEBUG)}
if ((stepx or stepy) = 0) then raise Exception.Create('internal bug in grid raycaster (1)');
+ {$ENDIF}
begin
// check for crossing tile/grid boundary
if (x >= 0) and (y >= 0) and (x <= maxx) and (y <= maxy) then
begin
// setup new cell index
ccidx := mGrid[(y div tsize)*gw+(x div tsize)];
+ if (log) then e_WriteLog(Format(' stepped to new tile (%d,%d) -- (%d,%d)', [(x div tsize), (y div tsize), x, y]), MSG_NOTIFY);
+ end
+ else
+ if (ccidx = -1) then
+ begin
+ // we have nothing interesting here anymore, jump directly to tile edge
+ (*
+ if (incx = 0) then
+ begin
+ // vertical line
+ if (incy < 0) then tedist := y-(y and (not tsize)) else tedist := (y or (tsize-1))-y;
+ if (tedist > 1) then
+ begin
+ if (log) then e_WriteLog(Format(' doing vertical jump from tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ y += incy*tedist;
+ Inc(i, tedist);
+ if (log) then e_WriteLog(Format(' jumped to tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ end;
+ end
+ else if (incy = 0) then
+ begin
+ // horizontal line
+ if (incx < 0) then tedist := x-(x and (not tsize)) else tedist := (x or (tsize-1))-x;
+ if (tedist > 1) then
+ begin
+ if (log) then e_WriteLog(Format(' doing horizontal jump from tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ x += incx*tedist;
+ Inc(i, tedist);
+ if (log) then e_WriteLog(Format(' jumped to tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ end;
+ end;
+ *)
+ (*
+ else if (
+ // get minimal distance to tile edges
+ if (incx < 0) then tedist := x-(x and (not tsize)) else if (incx > 0) then tedist := (x or (tsize+1))-x else tedist := 0;
+ {$IF DEFINED(D2F_DEBUG)}
+ if (tedist < 0) then raise Exception.Create('internal bug in grid raycaster (2.x)');
+ {$ENDIF}
+ if (incy < 0) then f := y-(y and (not tsize)) else if (incy > 0) then f := (y or (tsize+1))-y else f := 0;
+ {$IF DEFINED(D2F_DEBUG)}
+ if (f < 0) then raise Exception.Create('internal bug in grid raycaster (2.y)');
+ {$ENDIF}
+ if (tedist = 0) then tedist := f else if (f <> 0) then tedist := minInt(tedist, f);
+ // do jump
+ if (tedist > 1) then
+ begin
+ if (log) then e_WriteLog(Format(' doing jump from tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ xerr += dx*tedist;
+ yerr += dy*tedist;
+ if (xerr >= 0) then begin x += incx*((xerr div d)+1); xerr := (xerr mod d)-d; end;
+ if (yerr >= 0) then begin y += incy*((yerr div d)+1); yerr := (yerr mod d)-d; end;
+ Inc(i, tedist);
+ if (log) then e_WriteLog(Format(' jumped to tile (%d,%d) - (%d,%d) by %d steps', [(x div tsize), (y div tsize), x, y, tedist]), MSG_NOTIFY);
+ end;
+ *)
end;
end
else
// process cell
curci := ccidx;
// convert coords to map (to avoid ajdusting coords inside the loop)
- Inc(x, minx);
- Inc(y, miny);
+ //Inc(x, minx);
+ //Inc(y, miny);
// process cell list
while (curci <> -1) do
begin
end;
ccidx := -1; // don't process this anymore
// convert coords to grid
- Dec(x, minx);
- Dec(y, miny);
+ //Dec(x, minx);
+ //Dec(y, miny);
end;
end;
end;