X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_grid.pas;h=475cb68d7ec3b961c324f504bcf802230ae2bbfc;hb=4d64aecc835437d733321a8497b4c872c2b1c085;hp=19c4d0d2ca8f31fc39170217693375c3d8cc5de2;hpb=a17222535319cb4089e3f9a92711731c015819b3;p=d2df-sdl.git diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas index 19c4d0d..475cb68 100644 --- a/src/game/g_grid.pas +++ b/src/game/g_grid.pas @@ -18,7 +18,9 @@ {$IF DEFINED(D2F_DEBUG)} {.$DEFINE D2F_DEBUG_RAYTRACE} {.$DEFINE D2F_DEBUG_XXQ} + {.$DEFINE D2F_DEBUG_MOVER} {$ENDIF} +{$DEFINE GRID_USE_ORTHO_ACCEL} unit g_grid; interface @@ -31,7 +33,6 @@ type public type TGridQueryCB = function (obj: ITP; tag: Integer): Boolean is nested; // return `true` to stop 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 @@ -43,7 +44,7 @@ type GridDefaultTileSize = 32; // must be power of two! GridCellBucketSize = 8; // WARNING! can't be less than 2! - private + public type PBodyProxyRec = ^TBodyProxyRec; TBodyProxyRec = record @@ -56,28 +57,61 @@ type private procedure setup (aX, aY, aWidth, aHeight: Integer; aObj: ITP; aTag: Integer); + + function getTag (): Integer; inline; + procedure setTag (v: Integer); inline; + + function getEnabled (): Boolean; inline; + procedure setEnabled (v: Boolean); inline; + + public + property x: Integer read mX; + property y: Integer read mY; + property width: Integer read mWidth; + property height: Integer read mHeight; + property tag: Integer read getTag write setTag; + property enabled: Boolean read getEnabled write setEnabled; + property obj: ITP read mObj; end; + private + type PGridCell = ^TGridCell; TGridCell = record bodies: array [0..GridCellBucketSize-1] of Integer; // -1: end of list next: Integer; // in this cell; index in mCells end; + TCellArray = array of TGridCell; + TGridInternalCB = function (grida: Integer; bodyId: TBodyProxyId): Boolean of object; // return `true` to stop private //mTileSize: Integer; const mTileSize = GridDefaultTileSize; + type TGetProxyFn = function (pxidx: Integer): PBodyProxyRec of object; public const tileSize = mTileSize; + type + TAtPointEnumerator = record + private + mCells: TCellArray; + curidx, curbki: Integer; + getpx: TGetProxyFn; + public + constructor Create (acells: TCellArray; aidx: Integer; agetpx: TGetProxyFn); + function MoveNext (): Boolean; inline; + function getCurrent (): PBodyProxyRec; inline; + property Current: PBodyProxyRec read getCurrent; + end; + private mMinX, mMinY: Integer; // so grids can start at any origin mWidth, mHeight: Integer; // in tiles mGrid: array of Integer; // mWidth*mHeight, index in mCells - mCells: array of TGridCell; // cell pool + mCells: TCellArray; // cell pool mFreeCell: Integer; // first free cell index or -1 mLastQuery: LongWord; mUsedCells: Integer; @@ -85,6 +119,7 @@ type mProxyFree: TBodyProxyId; // free mProxyCount: Integer; // currently used mProxyMaxCount: Integer; + mInQuery: Boolean; public dbgShowTraceLog: Boolean; @@ -113,6 +148,8 @@ type function getGridWidthPx (): Integer; inline; function getGridHeightPx (): Integer; inline; + function getProxyById (idx: TBodyProxyId): PBodyProxyRec; inline; + public constructor Create (aMinPixX, aMinPixY, aPixWidth, aPixHeight: Integer{; aTileSize: Integer=GridDefaultTileSize}); destructor Destroy (); override; @@ -128,6 +165,8 @@ type // `false` if `body` is surely invalid function getBodyXY (body: TBodyProxyId; out rx, ry: Integer): Boolean; inline; + function getBodyWH (body: TBodyProxyId; out rw, rh: Integer): Boolean; inline; + function getBodyDims (body: TBodyProxyId; out rx, ry, rw, rh: 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) @@ -136,28 +175,35 @@ type //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 `true` on the first hit - function forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; + // 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 atCellInPoint (x, y: Integer): TAtPointEnumerator; //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) // cb with `(nil)` will be called before processing new tile - // no callback: return `true` on the nearest hit + // no callback: return object of the nearest hit or nil + // if `inverted` is true, trace will register bodies *exluding* tagmask //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; + //function traceOrthoRayWhileIn (const x0, y0, x1, y1: Integer; tagmask: Integer=-1): ITP; overload; + //function traceOrthoRayWhileIn (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; 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 //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; + function forEachAlongLine (ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; // debug procedure forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB); function forEachInCell (x, y: Integer; cb: TGridQueryCB): ITP; procedure dumpStats (); + public //WARNING! no sanity checks! property proxyEnabled[pid: TBodyProxyId]: Boolean read getProxyEnabled write setProxyEnabled; @@ -165,6 +211,8 @@ type property gridY0: Integer read mMinY; property gridWidth: Integer read getGridWidthPx; // in pixels property gridHeight: Integer read getGridHeightPx; // in pixels + + property proxy[idx: TBodyProxyId]: PBodyProxyRec read getProxyById; end; @@ -184,7 +232,7 @@ function maxInt (a, b: Integer): Integer; inline; implementation uses - SysUtils, e_log; + SysUtils, e_log, g_console; // ////////////////////////////////////////////////////////////////////////// // @@ -370,6 +418,61 @@ begin end; +function TBodyGridBase.TBodyProxyRec.getTag (): Integer; inline; +begin + result := mTag and TagFullMask; +end; + +procedure TBodyGridBase.TBodyProxyRec.setTag (v: Integer); inline; +begin + mTag := (mTag and TagDisabled) or (v and TagFullMask); +end; + +function TBodyGridBase.TBodyProxyRec.getEnabled (): Boolean; inline; +begin + result := ((mTag and TagDisabled) = 0); +end; + +procedure TBodyGridBase.TBodyProxyRec.setEnabled (v: Boolean); inline; +begin + if v then mTag := mTag and (not TagDisabled) else mTag := mTag or TagDisabled; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +constructor TBodyGridBase.TAtPointEnumerator.Create (acells: TCellArray; aidx: Integer; agetpx: TGetProxyFn); +begin + mCells := acells; + curidx := aidx; + curbki := -1; + getpx := agetpx; +end; + + +function TBodyGridBase.TAtPointEnumerator.MoveNext (): Boolean; inline; +begin + while (curidx <> -1) do + begin + while (curbki < GridCellBucketSize) do + begin + Inc(curbki); + if (mCells[curidx].bodies[curbki] = -1) then break; + result := true; + exit; + end; + curidx := mCells[curidx].next; + curbki := -1; + end; + result := false; +end; + + +function TBodyGridBase.TAtPointEnumerator.getCurrent (): PBodyProxyRec; inline; +begin + result := getpx(mCells[curidx].bodies[curbki]); +end; + + // ////////////////////////////////////////////////////////////////////////// // constructor TBodyGridBase.Create (aMinPixX, aMinPixY, aPixWidth, aPixHeight: Integer{; aTileSize: Integer=GridDefaultTileSize}); var @@ -525,6 +628,41 @@ begin end; +function TBodyGridBase.getBodyWH (body: TBodyProxyId; out rw, rh: Integer): Boolean; inline; +begin + if (body >= 0) and (body < Length(mProxies)) then + begin + with mProxies[body] do begin rw := mWidth; rh := mHeight; end; + result := true; + end + else + begin + rw := 0; + rh := 0; + result := false; + end; +end; + + +function TBodyGridBase.getBodyDims (body: TBodyProxyId; out rx, ry, rw, rh: Integer): Boolean; inline; +begin + if (body >= 0) and (body < Length(mProxies)) then + begin + with mProxies[body] do begin rx := mX; ry := mY; rw := mWidth; rh := mHeight; end; + result := true; + end + else + begin + rx := 0; + ry := 0; + rw := 0; + rh := 0; + result := false; + end; +end; + + + // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.getProxyEnabled (pid: TBodyProxyId): Boolean; inline; begin @@ -548,6 +686,12 @@ begin end; +function TBodyGridBase.getProxyById (idx: TBodyProxyId): PBodyProxyRec; inline; +begin + if (idx >= 0) and (idx < High(mProxies)) then result := @mProxies[idx] else result := nil; +end; + + // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.allocCell (): Integer; var @@ -814,7 +958,15 @@ begin y0 := px.mY; w := px.mWidth; h := px.mHeight; + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format('proxy #%d: MOVERESIZE: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d;nw=%d;nh=%d', [body, x0-mMinX, y0-mMinY, w, h, nx-mMinX, ny-mMinY, nw, nh]), MSG_NOTIFY); + {$ENDIF} if (nx = x0) and (ny = y0) and (nw = w) and (nh = h) then exit; + // map -> grid + Dec(x0, mMinX); + Dec(y0, mMinY); + Dec(nx, mMinX); + Dec(ny, mMinY); // did any corner crossed tile boundary? if (x0 div mTileSize <> nx div mTileSize) or (y0 div mTileSize <> ny div mTileSize) or @@ -822,16 +974,16 @@ begin ((y0+h) div mTileSize <> (ny+nh) div mTileSize) then begin removeInternal(body); - px.mX := nx; - px.mY := ny; + px.mX := nx+mMinX; + px.mY := ny+mMinY; px.mWidth := nw; px.mHeight := nh; insertInternal(body); end else begin - px.mX := nx; - px.mY := ny; + px.mX := nx+mMinX; + px.mY := ny+mMinY; px.mWidth := nw; px.mHeight := nh; end; @@ -856,9 +1008,9 @@ begin if (nx = x0) and (ny = y0) then exit; // map -> grid Dec(x0, mMinX); - Dec(y0, mMinX); + Dec(y0, mMinY); Dec(nx, mMinX); - Dec(ny, mMinX); + Dec(ny, mMinY); // check for heavy work pw := px.mWidth; ph := px.mHeight; @@ -870,6 +1022,9 @@ begin ogy1 := (y0+ph-1) div mTileSize; ngx1 := (nx+pw-1) div mTileSize; ngy1 := (ny+ph-1) div mTileSize; + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format('proxy #%d: checkmove: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY); + {$ENDIF} if (ogx0 <> ngx0) or (ogy0 <> ngy0) or (ogx1 <> ngx1) or (ogy1 <> ngy1) then begin // crossed tile boundary, do heavy work @@ -877,7 +1032,9 @@ begin 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); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format('proxy #%d: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY); + {$ENDIF} // remove stale marks if not ((ogy0 >= gh) or (ogy1 < 0)) and not ((ogx0 >= gw) or (ogx1 < 0)) then @@ -886,7 +1043,9 @@ begin 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); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' norm og:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1]), MSG_NOTIFY); + {$ENDIF} for gx := ogx0 to ogx1 do begin if (gx < ngx0) or (gx > ngx1) then @@ -894,7 +1053,9 @@ 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); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' remove0:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$ENDIF} remover(gy*gw+gx, body); end; end @@ -905,7 +1066,9 @@ begin begin if (gy < ngy0) or (gy > ngy1) then begin - //e_WriteLog(Format(' remove:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' remove1:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$ENDIF} remover(gy*gw+gx, body); end; end; @@ -920,7 +1083,9 @@ begin 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); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' norm ng:(%d,%d)-(%d,%d)', [ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY); + {$ENDIF} for gx := ngx0 to ngx1 do begin if (gx < ogx0) or (gx > ogx1) then @@ -928,7 +1093,9 @@ 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); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' insert0:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$ENDIF} inserter(gy*gw+gx, body); end; end @@ -939,7 +1106,9 @@ begin begin if (gy < ogy0) or (gy > ogy1) then begin - //e_WriteLog(Format(' insert:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format(' insert1:(%d,%d)', [gx, gy]), MSG_NOTIFY); + {$ENDIF} inserter(gy*gw+gx, body); end; end; @@ -947,6 +1116,12 @@ begin end; end; // done + end + else + begin + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format('proxy #%d: GRID OK: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY); + {$ENDIF} end; // update coordinates px.mX := nx+mMinX; @@ -961,10 +1136,13 @@ begin if (body < 0) or (body > High(mProxies)) then exit; // just in case // check if tile coords was changed px := @mProxies[body]; - x0 := px.mX; - y0 := px.mY; + x0 := px.mX-mMinX; + y0 := px.mY-mMinY; w := px.mWidth; h := px.mHeight; + {$IF DEFINED(D2F_DEBUG_MOVER)} + e_WriteLog(Format('proxy #%d: RESIZE: xg=%d;yg=%d;w=%d;h=%d;nw=%d;nh=%d', [body, x0, y0, w, h, nw, nh]), MSG_NOTIFY); + {$ENDIF} if ((x0+w) div mTileSize <> (x0+nw) div mTileSize) or ((y0+h) div mTileSize <> (y0+nh) div mTileSize) then begin @@ -983,9 +1161,21 @@ begin end; +// ////////////////////////////////////////////////////////////////////////// // +function TBodyGridBase.atCellInPoint (x, y: Integer): TAtPointEnumerator; +var + cidx: Integer = -1; +begin + Dec(x, mMinX); + Dec(y, mMinY); + if (x >= 0) and (y >= 0) and (x < mWidth*mTileSize) and (y < mHeight*mTileSize) then cidx := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)]; + result := TAtPointEnumerator.Create(mCells, cidx, getProxyById); +end; + + // ////////////////////////////////////////////////////////////////////////// // // no callback: return `true` on the first hit -function TBodyGridBase.forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; +function TBodyGridBase.forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1; exittag: PInteger=nil): ITP; var f: Integer; idx, curci: Integer; @@ -995,6 +1185,7 @@ var ptag: Integer; begin result := Default(ITP); + if (exittag <> nil) then exittag^ := 0; tagmask := tagmask and TagFullMask; if (tagmask = 0) then exit; @@ -1054,11 +1245,17 @@ begin begin if assigned(cb) then begin - if cb(px.mObj, ptag) then begin result := px.mObj; exit; end; + 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; @@ -1104,6 +1301,9 @@ begin if (x+w <= 0) or (y+h <= 0) then exit; if (x >= gw*tsize) or (y >= mHeight*tsize) then exit; + if mInQuery then raise Exception.Create('recursive queries aren''t supported'); + mInQuery := true; + // increase query counter Inc(mLastQuery); if (mLastQuery = 0) then @@ -1143,11 +1343,12 @@ begin if (x0+w <= px.mX) or (y0+h <= px.mY) then continue; if assigned(cb) then begin - if cb(px.mObj, ptag) then begin result := px.mObj; exit; end; + if cb(px.mObj, ptag) then begin result := px.mObj; mInQuery := false; exit; end; end else begin result := px.mObj; + mInQuery := false; exit; end; end; @@ -1155,6 +1356,8 @@ begin end; end; end; + + mInQuery := false; end; @@ -1199,6 +1402,15 @@ var lq: LongWord; f, ptag, distSq: Integer; x0, y0, x1, y1: Integer; + //swapped: Boolean = false; // true: xd is yd, and vice versa + // horizontal walker + {$IFDEF GRID_USE_ORTHO_ACCEL} + wklen, wkstep: Integer; + //wksign: Integer; + hopt: Boolean; + {$ENDIF} + // skipper + xdist, ydist: Integer; begin result := Default(ITP); lastObj := Default(ITP); @@ -1207,7 +1419,15 @@ begin ey := ay1; // why not? if (tagmask = 0) then exit; - if (ax0 = ax1) and (ay0 = ay1) then exit; // as the first point is ignored, just get outta here + if (ax0 = ax1) and (ay0 = ay1) then + begin + result := forEachAtPoint(ax0, ay0, nil, tagmask, @ptag); + if (result <> nil) then + begin + if assigned(cb) and not cb(result, ptag, ax0, ay0, ax0, ay0) then result := Default(ITP); + end; + exit; + end; lastDistSq := distanceSq(ax0, ay0, ax1, ay1)+1; @@ -1282,6 +1502,7 @@ begin if (dsx < dsy) then begin + //swapped := true; xptr := @yd; yptr := @xd; swapInt(x0, y0); @@ -1352,31 +1573,60 @@ begin dx2 -= dy2; // first move, to skip starting point - if (xd = term) then exit; + // DON'T DO THIS! loop will take care of that + if (xd = term) then + begin + //FIXME! + result := forEachAtPoint(ax0, ay0, nil, tagmask, @ptag); + if (result <> nil) then + begin + if assigned(cb) then + begin + if cb(result, ptag, ax0, ay0, ax0, ay0) then + begin + ex := ax0; + ey := ay0; + end + else + begin + result := nil; + end; + end + else + begin + ex := ax0; + ey := ay0; + end; + end; + exit; + end; + prevx := xptr^+minx; prevy := yptr^+miny; + (* // move coords if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; xd += stx; // done? if (xd = term) then exit; + *) {$IF DEFINED(D2F_DEBUG)} 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]; + // DON'T DO THIS! loop will take care of that + //lastGA := (yptr^ div tsize)*gw+(xptr^ div tsize); + //ccidx := mGrid[lastGA]; {$IF DEFINED(D2F_DEBUG_RAYTRACE)} //if assigned(dbgRayTraceTileHitCB) then e_WriteLog('1:TRACING!', MSG_NOTIFY); {$ENDIF} - {$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); + if mInQuery then raise Exception.Create('recursive queries aren''t supported'); + mInQuery := true; + // increase query counter Inc(mLastQuery); if (mLastQuery = 0) then @@ -1387,8 +1637,237 @@ begin end; lq := mLastQuery; + {$IFDEF GRID_USE_ORTHO_ACCEL} + // if this is strict horizontal/vertical trace, use optimized codepath + if (ax0 = ax1) or (ay0 = ay1) then + begin + // horizontal trace: walk the whole tiles, calculating mindist once for each proxy in cell + // stx < 0: going left, otherwise `stx` is > 0, and we're going right + // vertical trace: walk the whole tiles, calculating mindist once for each proxy in cell + // stx < 0: going up, otherwise `stx` is > 0, and we're going down + hopt := (ay0 = ay1); // horizontal? + if (stx < 0) then begin {wksign := -1;} wklen := -(term-xd); end else begin {wksign := 1;} wklen := term-xd; end; + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln('optimized htrace; wklen=%d', [wklen]); + {$ENDIF} + ga := (yptr^ div tsize)*gw+(xptr^ div tsize); + // one of those will never change + x := xptr^+minx; + y := yptr^+miny; + //prevx := x; + //prevy := y; + {$IF DEFINED(D2F_DEBUG)} + if hopt then + begin + if (y <> ay0) then raise Exception.Create('htrace fatal internal error'); + end + else + begin + if (x <> ax0) then raise Exception.Create('vtrace fatal internal error'); + end; + {$ENDIF} + while (wklen > 0) do + begin + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' htrace; ga=%d; x=%d, y=%d; y=%d; y=%d', [ga, xptr^+minx, yptr^+miny, y, ay0]); + {$ENDIF} + // new tile? + if (ga <> lastGA) then + begin + lastGA := ga; + ccidx := mGrid[lastGA]; + // convert coords to map (to avoid ajdusting coords inside the loop) + if hopt then x := xptr^+minx else y := yptr^+miny; + while (ccidx <> -1) do + begin + cc := @mCells[ccidx]; + 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) and + // constant coord should be inside + ((hopt and (y >= px.mY) and (y < px.mY+px.mHeight)) or + ((not hopt) and (x >= px.mX) and (x < px.mX+px.mWidth))) then + begin + px.mQueryMark := lq; // mark as processed + // inside the proxy? + if (hopt and (x > px.mX) and (x < px.mX+px.mWidth-1)) or + ((not hopt) and (y > px.mY) and (y < px.mY+px.mHeight-1)) then + begin + // setup prev[xy] + if assigned(cb) then + begin + if cb(px.mObj, ptag, x, y, x, y) then + begin + result := px.mObj; + ex := x; + ey := y; + mInQuery := false; + exit; + end; + end + else + begin + distSq := distanceSq(ax0, ay0, x, y); + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' EMBEDDED hhit(%d): a=(%d,%d), h=(%d,%d), distsq=%d; lastsq=%d', [cc.bodies[f], ax0, ay0, x, y, distSq, lastDistSq]); + {$ENDIF} + if (distSq < lastDistSq) then + begin + ex := x; + ey := y; + result := px.mObj; + mInQuery := false; + exit; + end; + end; + continue; + end; + // remember this hitpoint if it is nearer than an old one + // setup prev[xy] + if hopt then + begin + // horizontal trace + prevy := y; + y := yptr^+miny; + if (stx < 0) then + begin + // going left + if (x < px.mX+px.mWidth-1) then continue; // not on the right edge + prevx := px.mX+px.mWidth; + x := prevx-1; + end + else + begin + // going right + if (x > px.mX) then continue; // not on the left edge + prevx := px.mX-1; + x := prevx+1; + end; + end + else + begin + // vertical trace + prevx := x; + x := xptr^+minx; + if (stx < 0) then + begin + // going up + if (y < px.mY+px.mHeight-1) then continue; // not on the bottom edge + prevy := px.mY+px.mHeight; + y := prevy-1; + end + else + begin + // going down + if (y > px.mY) then continue; // not on the top edge + prevy := px.mY-1; + y := prevy+1; + end; + end; + if assigned(cb) then + begin + if cb(px.mObj, ptag, x, y, prevx, prevy) then + begin + result := px.mObj; + ex := prevx; + ey := prevy; + mInQuery := false; + exit; + end; + end + else + begin + distSq := distanceSq(ax0, ay0, prevx, prevy); + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' hhit(%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]); + {$ENDIF} + if (distSq < lastDistSq) then + begin + wasHit := true; + lastDistSq := distSq; + ex := prevx; + ey := prevy; + lastObj := px.mObj; + end; + end; + end; + end; + // next cell + ccidx := cc.next; + end; + if wasHit and not assigned(cb) then begin result := lastObj; mInQuery := false; exit; end; + if assigned(cb) and cb(nil, 0, x, y, x, y) then begin result := lastObj; mInQuery := false; exit; end; + end; + // skip to next tile + if hopt then + begin + if (stx > 0) then + begin + // to the right + wkstep := ((xptr^ or (mTileSize-1))+1)-xptr^; + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' right step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Inc(xptr^, wkstep); + Inc(ga); + end + else + begin + // to the left + wkstep := xptr^-((xptr^ and (not (mTileSize-1)))-1); + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' left step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Dec(xptr^, wkstep); + Dec(ga); + end; + end + else + begin + if (stx > 0) then + begin + // to the down + wkstep := ((yptr^ or (mTileSize-1))+1)-yptr^; + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' down step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Inc(yptr^, wkstep); + Inc(ga, mHeight); + end + else + begin + // to the up + wkstep := yptr^-((yptr^ and (not (mTileSize-1)))-1); + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' up step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Dec(yptr^, wkstep); + Dec(ga, mHeight); + end; + end; + Dec(wklen, wkstep); + end; + // we can travel less than one cell + if wasHit and not assigned(cb) then result := lastObj else begin ex := ax1; ey := ay1; end; + mInQuery := false; + exit; + end; + {$ENDIF} + + {$IF DEFINED(D2F_DEBUG_RAYTRACE)} + if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny); + {$ENDIF} + + //e_LogWritefln('*********************', []); ccidx := -1; - // draw it; can omit checks + // can omit checks while (xd <> term) do begin // check cell(s) @@ -1397,6 +1876,9 @@ begin {$ENDIF} // new tile? ga := (yptr^ div tsize)*gw+(xptr^ div tsize); + {$IF DEFINED(D2F_DEBUG_RAYTRACE)} + if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format(' xd=%d; term=%d; gx=%d; gy=%d; ga=%d; lastga=%d', [xd, term, xptr^, yptr^, ga, lastGA]), MSG_NOTIFY); + {$ENDIF} if (ga <> lastGA) then begin // yes @@ -1408,11 +1890,12 @@ begin // signal cell completion if assigned(cb) then begin - if cb(nil, 0, xptr^+minx, yptr^+miny, prevx, prevy) then begin result := lastObj; exit; end; + if cb(nil, 0, xptr^+minx, yptr^+miny, prevx, prevy) then begin result := lastObj; mInQuery := false; exit; end; end else if wasHit then begin result := lastObj; + mInQuery := false; exit; end; end; @@ -1447,25 +1930,12 @@ begin begin if cb(px.mObj, ptag, x, y, prevx, prevy) then begin - result := lastObj; + result := px.mObj; ex := prevx; ey := prevy; + mInQuery := false; 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 @@ -1501,15 +1971,33 @@ begin ccidx := -1; if assigned(cb) then begin - if cb(nil, 0, x, y, prevx, prevy) then begin result := lastObj; exit; end; + if cb(nil, 0, x, y, prevx, prevy) then begin result := lastObj; mInQuery := false; exit; end; end else if wasHit then begin result := lastObj; + mInQuery := false; exit; end; end; end; + if (ccidx = -1) then + begin + // move to cell edge, as we have nothing to trace here anymore + if (stx < 0) then xdist := xd and (not (mTileSize-1)) else xdist := xd or (mTileSize-1); + if (sty < 0) then ydist := yd and (not (mTileSize-1)) else ydist := yd or (mTileSize-1); + //e_LogWritefln('0: swapped=%d; xd=%d; yd=%d; stx=%d; sty=%d; e=%d; dx2=%d; dy2=%d; term=%d; xdist=%d; ydist=%d', [swapped, xd, yd, stx, sty, e, dx2, dy2, term, xdist, ydist]); + while (xd <> xdist) and (yd <> ydist) do + begin + // step + xd += stx; + if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; + //e_LogWritefln(' xd=%d; yd=%d', [xd, yd]); + if (xd = term) then break; + end; + //e_LogWritefln('1: swapped=%d; xd=%d; yd=%d; stx=%d; sty=%d; e=%d; dx2=%d; dy2=%d; term=%d; xdist=%d; ydist=%d', [swapped, xd, yd, stx, sty, e, dx2, dy2, term, xdist, ydist]); + if (xd = term) then break; + end; //putPixel(xptr^, yptr^); // move coords prevx := xptr^+minx; @@ -1517,59 +2005,230 @@ begin if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; xd += stx; end; + // we can travel less than one cell + if wasHit and not assigned(cb) then + begin + result := lastObj; + end + else + begin + ex := ax1; // why not? + ey := ay1; // why not? + end; + + mInQuery := false; end; // ////////////////////////////////////////////////////////////////////////// // //FIXME! optimize this with real tile walking -function TBodyGridBase.forEachAlongLine (const x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; +function TBodyGridBase.forEachAlongLine (ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; const tsize = mTileSize; var - i: Integer; - dx, dy, d: Integer; - xerr, yerr: Integer; - incx, incy: Integer; - stepx, stepy: Integer; - x, y: Integer; - maxx, maxy: Integer; - gw, gh: Integer; - ccidx: Integer; - curci: Integer; + wx0, wy0, wx1, wy1: Integer; // window coordinates + stx, sty: Integer; // "steps" for x and y axes + dsx, dsy: Integer; // "lengthes" for x and y axes + dx2, dy2: Integer; // "double lengthes" for x and y axes + xd, yd: Integer; // current coord + e: Integer; // "error" (as in bresenham algo) + rem: Integer; + term: Integer; + xptr, yptr: PInteger; + xfixed: Boolean; + temp: Integer; + ccidx, curci: Integer; + lastGA: Integer = -1; + ga: Integer; + gw, gh, minx, miny, maxx, maxy: Integer; cc: PGridCell; px: PBodyProxyRec; lq: LongWord; - minx, miny: Integer; - ptag: Integer; - lastWasInGrid: Boolean; - tbcross: Boolean; - f: Integer; - //tedist: Integer; + f, ptag: Integer; + x0, y0, x1, y1: Integer; + //swapped: Boolean = false; // true: xd is yd, and vice versa + // horizontal walker + {$IFDEF GRID_USE_ORTHO_ACCEL} + wklen, wkstep: Integer; + //wksign: Integer; + hopt: Boolean; + {$ENDIF} + // skipper + xdist, ydist: Integer; begin log := false; result := Default(ITP); tagmask := tagmask and TagFullMask; if (tagmask = 0) or not assigned(cb) then exit; + if (ax0 = ax1) and (ay0 = ay1) then + begin + result := forEachAtPoint(ax0, ay0, cb, tagmask, @ptag); + exit; + end; + + gw := mWidth; + gh := mHeight; minx := mMinX; miny := mMinY; + maxx := gw*tsize-1; + maxy := gh*tsize-1; + + x0 := ax0; + y0 := ay0; + x1 := ax1; + y1 := ay1; + + // offset query coords to (0,0)-based + Dec(x0, minx); + Dec(y0, miny); + Dec(x1, minx); + Dec(y1, miny); + + // clip rectange + wx0 := 0; + wy0 := 0; + wx1 := maxx; + wy1 := maxy; + + // horizontal setup + if (x0 < x1) then + begin + // from left to right + if (x0 > wx1) or (x1 < wx0) then exit; // out of screen + stx := 1; // going right + end + else + begin + // from right to left + if (x1 > wx1) or (x0 < wx0) then exit; // out of screen + stx := -1; // going left + x0 := -x0; + x1 := -x1; + wx0 := -wx0; + wx1 := -wx1; + swapInt(wx0, wx1); + end; - dx := x1-x0; - dy := y1-y0; + // vertical setup + if (y0 < y1) then + begin + // from top to bottom + if (y0 > wy1) or (y1 < wy0) then exit; // out of screen + sty := 1; // going down + end + else + begin + // from bottom to top + if (y1 > wy1) or (y0 < wy0) then exit; // out of screen + sty := -1; // going up + y0 := -y0; + y1 := -y1; + wy0 := -wy0; + wy1 := -wy1; + swapInt(wy0, wy1); + end; - 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; + dsx := x1-x0; + dsy := y1-y0; - if (incx = 0) and (incy = 0) then exit; // just incase + if (dsx < dsy) then + begin + //swapped := true; + xptr := @yd; + yptr := @xd; + swapInt(x0, y0); + swapInt(x1, y1); + swapInt(dsx, dsy); + swapInt(wx0, wy0); + swapInt(wx1, wy1); + swapInt(stx, sty); + end + else + begin + xptr := @xd; + yptr := @yd; + end; - dx := abs(dx); - dy := abs(dy); + dx2 := 2*dsx; + dy2 := 2*dsy; + xd := x0; + yd := y0; + e := 2*dsy-dsx; + term := x1; - if (dx > dy) then d := dx else d := dy; + xfixed := false; + if (y0 < wy0) then + begin + // clip at top + temp := dx2*(wy0-y0)-dsx; + xd += temp div dy2; + rem := temp mod dy2; + if (xd > wx1) then exit; // x is moved out of clipping rect, nothing to do + if (xd+1 >= wx0) then + begin + yd := wy0; + e -= rem+dsx; + if (rem > 0) then begin Inc(xd); e += dy2; end; + xfixed := true; + end; + end; - // `x` and `y` will be in grid coords - x := x0-minx; - y := y0-miny; + if (not xfixed) and (x0 < wx0) then + begin + // clip at left + temp := dy2*(wx0-x0); + yd += temp div dx2; + rem := temp mod dx2; + if (yd > wy1) or (yd = wy1) and (rem >= dsx) then exit; + xd := wx0; + e += rem; + if (rem >= dsx) then begin Inc(yd); e -= dx2; end; + end; + + if (y1 > wy1) then + begin + // clip at bottom + temp := dx2*(wy1-y0)+dsx; + term := x0+temp div dy2; + rem := temp mod dy2; + if (rem = 0) then Dec(term); + end; + + if (term > wx1) then term := wx1; // clip at right + + Inc(term); // draw last point + //if (term = xd) then exit; // this is the only point, get out of here + + if (sty = -1) then yd := -yd; + if (stx = -1) then begin xd := -xd; term := -term; end; + dx2 -= dy2; + + // first move, to skip starting point + // DON'T DO THIS! loop will take care of that + if (xd = term) then + begin + result := forEachAtPoint(ax0, ay0, cb, tagmask, @ptag); + exit; + end; + + (* + // move coords + if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; + xd += stx; + // done? + if (xd = term) then exit; + *) + + {$IF DEFINED(D2F_DEBUG)} + if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ >= gh*tsize) then raise Exception.Create('raycaster internal error (0)'); + {$ENDIF} + // DON'T DO THIS! loop will take care of that + //lastGA := (yptr^ div tsize)*gw+(xptr^ div tsize); + //ccidx := mGrid[lastGA]; + + if mInQuery then raise Exception.Create('recursive queries aren''t supported'); + mInQuery := true; // increase query counter Inc(mLastQuery); @@ -1577,137 +2236,161 @@ begin begin // just in case of overflow mLastQuery := 1; - for i := 0 to High(mProxies) do mProxies[i].mQueryMark := 0; + for f := 0 to High(mProxies) do mProxies[f].mQueryMark := 0; end; lq := mLastQuery; - // cache various things - //tsize := mTileSize; - gw := mWidth; - gh := mHeight; - maxx := gw*tsize-1; - maxy := gh*tsize-1; - - // setup distance and flags - lastWasInGrid := (x >= 0) and (y >= 0) and (x <= maxx) and (y <= maxy); - - // setup starting tile ('cause we'll adjust tile vars only on tile edge crossing) - if lastWasInGrid then ccidx := mGrid[(y div tsize)*gw+(x div tsize)] else ccidx := -1; - - // it is slightly faster this way - 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 - i := 0; - while (i < d) do + {$IFDEF GRID_USE_ORTHO_ACCEL} + // if this is strict horizontal/vertical trace, use optimized codepath + if (ax0 = ax1) or (ay0 = ay1) then begin - Inc(i); - // do one step - xerr += dx; - yerr += dy; - // invariant: one of those always changed + // horizontal trace: walk the whole tiles, calculating mindist once for each proxy in cell + // stx < 0: going left, otherwise `stx` is > 0, and we're going right + // vertical trace: walk the whole tiles, calculating mindist once for each proxy in cell + // stx < 0: going up, otherwise `stx` is > 0, and we're going down + hopt := (ay0 = ay1); // horizontal? + if (stx < 0) then begin {wksign := -1;} wklen := -(term-xd); end else begin {wksign := 1;} wklen := term-xd; end; {$IF DEFINED(D2F_DEBUG)} - if (xerr < 0) and (yerr < 0) then raise Exception.Create('internal bug in grid raycaster (0)'); + if dbgShowTraceLog then e_LogWritefln('optimized htrace; wklen=%d', [wklen]); {$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 + ga := (yptr^ div tsize)*gw+(xptr^ div tsize); {$IF DEFINED(D2F_DEBUG)} - if ((stepx or stepy) = 0) then raise Exception.Create('internal bug in grid raycaster (1)'); + if hopt then + begin + if (yptr^ <> ay0) then raise Exception.Create('htrace fatal internal error'); + end + else + begin + if (xptr^ <> ax0) then raise Exception.Create('vtrace fatal internal error'); + end; {$ENDIF} + while (wklen > 0) do begin - // check for crossing tile/grid boundary - if (x >= 0) and (y >= 0) and (x <= maxx) and (y <= maxy) then + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' htrace; ga=%d; x=%d, y=%d; ay0=%d', [ga, xptr^+minx, yptr^+miny, ay0]); + {$ENDIF} + // new tile? + if (ga <> lastGA) then begin - // we're still in grid - lastWasInGrid := true; - // check for tile edge crossing - if (stepx < 0) and ((x mod tsize) = tsize-1) then tbcross := true - else if (stepx > 0) and ((x mod tsize) = 0) then tbcross := true - else if (stepy < 0) and ((y mod tsize) = tsize-1) then tbcross := true - else if (stepy > 0) and ((y mod tsize) = 0) then tbcross := true - else tbcross := false; - // crossed tile edge? - if tbcross 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 + lastGA := ga; + ccidx := mGrid[lastGA]; + // convert coords to map (to avoid ajdusting coords inside the loop) + while (ccidx <> -1) do 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 + cc := @mCells[ccidx]; + for f := 0 to GridCellBucketSize-1 do begin - // horizontal line - if (incx < 0) then tedist := x-(x and (not tsize)) else tedist := (x or (tsize-1))-x; - if (tedist > 1) then + 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 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); + px.mQueryMark := lq; // mark as processed + if assigned(cb) then + begin + if cb(px.mObj, ptag) then begin result := px.mObj; mInQuery := false; exit; end; + end + else + begin + result := px.mObj; + mInQuery := false; + exit; + end; 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; + // next cell + ccidx := cc.next; + end; + end; + // skip to next tile + if hopt then + begin + if (stx > 0) then + begin + // to the right + wkstep := ((xptr^ or (mTileSize-1))+1)-xptr^; {$IF DEFINED(D2F_DEBUG)} - if (tedist < 0) then raise Exception.Create('internal bug in grid raycaster (2.x)'); + if dbgShowTraceLog then e_LogWritefln(' right step: wklen=%d; wkstep=%d', [wklen, wkstep]); {$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 (wkstep >= wklen) then break; + Inc(xptr^, wkstep); + Inc(ga); + end + else + begin + // to the left + wkstep := xptr^-((xptr^ and (not (mTileSize-1)))-1); {$IF DEFINED(D2F_DEBUG)} - if (f < 0) then raise Exception.Create('internal bug in grid raycaster (2.y)'); + if dbgShowTraceLog then e_LogWritefln(' left step: wklen=%d; wkstep=%d', [wklen, wkstep]); {$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; - *) + if (wkstep >= wklen) then break; + Dec(xptr^, wkstep); + Dec(ga); end; end else begin - // out of grid - if lastWasInGrid then exit; // oops, stepped out of the grid -- there is no way to return + if (stx > 0) then + begin + // to the down + wkstep := ((yptr^ or (mTileSize-1))+1)-yptr^; + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' down step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Inc(yptr^, wkstep); + Inc(ga, mHeight); + end + else + begin + // to the up + wkstep := yptr^-((yptr^ and (not (mTileSize-1)))-1); + {$IF DEFINED(D2F_DEBUG)} + if dbgShowTraceLog then e_LogWritefln(' up step: wklen=%d; wkstep=%d', [wklen, wkstep]); + {$ENDIF} + if (wkstep >= wklen) then break; + Dec(yptr^, wkstep); + Dec(ga, mHeight); + end; end; + Dec(wklen, wkstep); end; + mInQuery := false; + exit; + end; + {$ENDIF} + + {$IF DEFINED(D2F_DEBUG_RAYTRACE)} + if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny); + {$ENDIF} - // has something to process in the current cell? + ccidx := -1; + // can omit checks + while (xd <> term) do + begin + // check cell(s) + {$IF DEFINED(D2F_DEBUG)} + 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 DEFINED(D2F_DEBUG_RAYTRACE)} + if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format(' xd=%d; term=%d; gx=%d; gy=%d; ga=%d; lastga=%d', [xd, term, xptr^, yptr^, ga, lastGA]), MSG_NOTIFY); + {$ENDIF} + 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} + lastGA := ga; + ccidx := mGrid[lastGA]; + end; + // has something to process in this tile? if (ccidx <> -1) then begin // process cell curci := ccidx; - // convert coords to map (to avoid ajdusting coords inside the loop) - //Inc(x, minx); - //Inc(y, miny); // process cell list while (curci <> -1) do begin @@ -1720,18 +2403,45 @@ begin if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then begin px.mQueryMark := lq; // mark as processed - if cb(px.mObj, ptag) then begin result := px.mObj; exit; end; + if assigned(cb) then + begin + if cb(px.mObj, ptag) then begin result := px.mObj; mInQuery := false; exit; end; + end + else + begin + result := px.mObj; + mInQuery := false; + exit; + end; end; end; // next cell curci := cc.next; end; - ccidx := -1; // don't process this anymore - // convert coords to grid - //Dec(x, minx); - //Dec(y, miny); + // nothing more interesting in this cell + ccidx := -1; end; + // move to cell edge, as we have nothing to trace here anymore + if (stx < 0) then xdist := xd and (not (mTileSize-1)) else xdist := xd or (mTileSize-1); + if (sty < 0) then ydist := yd and (not (mTileSize-1)) else ydist := yd or (mTileSize-1); + //e_LogWritefln('0: swapped=%d; xd=%d; yd=%d; stx=%d; sty=%d; e=%d; dx2=%d; dy2=%d; term=%d; xdist=%d; ydist=%d', [swapped, xd, yd, stx, sty, e, dx2, dy2, term, xdist, ydist]); + while (xd <> xdist) and (yd <> ydist) do + begin + // step + xd += stx; + if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; + //e_LogWritefln(' xd=%d; yd=%d', [xd, yd]); + if (xd = term) then break; + end; + //e_LogWritefln('1: swapped=%d; xd=%d; yd=%d; stx=%d; sty=%d; e=%d; dx2=%d; dy2=%d; term=%d; xdist=%d; ydist=%d', [swapped, xd, yd, stx, sty, e, dx2, dy2, term, xdist, ydist]); + if (xd = term) then break; + //putPixel(xptr^, yptr^); + // move coords + if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; + xd += stx; end; + + mInQuery := false; end;