X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_grid.pas;h=427482fda6e4a61ab3d088df39acc4f73e46c3a0;hb=d7d166dc3cd287276202e862746208892c4cc89f;hp=d7263f36e0c244dedd9a8424e113e41e397e1981;hpb=d25ad51560a2159ff524fa9ef4ca37a81dcb528f;p=d2df-sdl.git diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas index d7263f3..427482f 100644 --- a/src/game/g_grid.pas +++ b/src/game/g_grid.pas @@ -21,19 +21,24 @@ {.$DEFINE D2F_DEBUG_MOVER} {$ENDIF} {.$DEFINE GRID_USE_ORTHO_ACCEL} +{$DEFINE LINEAABB2} unit g_grid; interface +uses + mempool; + +const + GridTileSize = 32; // must be power of two! type TBodyProxyId = Integer; - generic TBodyGridBase = class(TObject) + generic TBodyGridBase = class(TPoolObject) 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 TCellQueryCB = procedure (x, y: Integer) is nested; // top-left cell corner coords const TagDisabled = $40000000; @@ -41,7 +46,6 @@ type private const - GridDefaultTileSize = 32; // must be power of two! GridCellBucketSize = 8; // WARNING! can't be less than 2! public @@ -96,7 +100,7 @@ type private //mTileSize: Integer; - const mTileSize = GridDefaultTileSize; + const mTileSize = GridTileSize; type TGetProxyFn = function (pxidx: Integer): PBodyProxyRec of object; public @@ -142,9 +146,6 @@ type function allocProxy (aX, aY, aWidth, aHeight: Integer; aObj: ITP; aTag: Integer): TBodyProxyId; procedure freeProxy (body: TBodyProxyId); - procedure insertInternal (body: TBodyProxyId); - procedure removeInternal (body: TBodyProxyId); - function forGridRect (x, y, w, h: Integer; cb: TGridInternalCB; bodyId: TBodyProxyId): Boolean; function inserter (grida: Integer; bodyId: TBodyProxyId): Boolean; @@ -194,13 +195,24 @@ type // 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 traceRayOld (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; overload; + function traceRayOld (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) + // cb with `(nil)` will be called before processing new tile + // no callback: return object of the nearest hit or nil + // if `inverted` is true, trace will register bodies *exluding* tagmask + // `cb` is used unconvetionally here: if it returns `false`, tracer will ignore the object + //WARNING: don't change tags in callbacks here! + function traceRay (const x0, y0, x1, y1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; overload; + function traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; // return `false` if we're still inside at the end // line should be either strict horizontal, or strict vertical, otherwise an exception will be thrown // `true`: endpoint will point at the last "inside" pixel // `false`: endpoint will be (ax1, ay1) + //WARNING: don't change tags in callbacks here! function traceOrthoRayWhileIn (out ex, ey: Integer; ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): Boolean; //WARNING: don't modify grid while any query is in progress (no checks are made!) @@ -209,6 +221,11 @@ type //WARNING: don't change tags in callbacks here! function forEachAlongLine (ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; + // trace box with the given velocity; return object hit (if any) + // `cb` is used unconvetionally here: if it returns `false`, tracer will ignore the object + //WARNING: don't change tags in callbacks here! + function traceBox (out ex, ey: Integer; const ax0, ay0, aw, ah: Integer; const dx, dy: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; + // debug procedure forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB); function forEachInCell (x, y: Integer; cb: TGridQueryCB): ITP; @@ -227,17 +244,72 @@ type end; +type + // common structure for all line tracers + TLineWalker = record + public + const TileSize = GridTileSize; + + private + wx0, wy0, wx1, wy1: Integer; // window coordinates + stx, sty: Integer; // "steps" for x and y axes + stleft: Integer; // "steps left" + err, errinc, errmax: Integer; + xd, yd: Integer; // current coord + horiz: Boolean; + + public + // call `setyp` after this + constructor Create (minx, miny, maxx, maxy: Integer); + + procedure setClip (minx, miny, maxx, maxy: Integer); inline; + + // this will use `w[xy][01]` to clip coords + // return `false` if the whole line was clipped away + // on `true`, you should process first point, and go on + function setup (x0, y0, x1, y1: Integer): Boolean; + + // call this *after* doing a step + // WARNING! if you will do a step when this returns `true`, you will fall into limbo + function done (): Boolean; inline; + + // as you will prolly call `done()` after doing a step anyway, this will do it for you + // move to next point, return `true` when the line is complete (i.e. you should stop) + function step (): Boolean; inline; + + // move to next tile; return `true` if the line is complete (and walker state is undefined then) + function stepToNextTile (): Boolean; inline; + + procedure getXY (out ox, oy: Integer); inline; + + public + // current coords + property x: Integer read xd; + property y: Integer read yd; + end; + + // you are not supposed to understand this // returns `true` if there is an intersection, and enter coords // enter coords will be equal to (x0, y0) if starting point is inside the box // 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; +// sweep two AABB's to see if and when they are overlapping +// returns `true` if collision was detected (but boxes doesn't overlap) +// u1 and u1 has no sense if no collision was detected +// u0 = normalized time of first collision (i.e. collision starts at myMove*u0) +// u1 = normalized time of second collision (i.e. collision stops after myMove*u1) +// hitedge for `it`: 0: top; 1: right; 2: bottom; 3: left +// enter/exit coords will form non-intersecting configuration (i.e. will be before/after the actual collision) +function sweepAABB (mex0, mey0, mew, meh: Integer; medx, medy: Integer; itx0, ity0, itw, ith: Integer; + u0: PSingle=nil; hitedge: PInteger=nil; u1: PSingle=nil): Boolean; + 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; +//function minInt (a, b: Integer): Integer; inline; +//function maxInt (a, b: Integer): Integer; inline; implementation @@ -248,200 +320,453 @@ uses // ////////////////////////////////////////////////////////////////////////// // 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; +//procedure swapInt (var a: Integer; var b: Integer); inline; begin a := a xor b; b := b xor a; a := a xor b; 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; // ////////////////////////////////////////////////////////////////////////// // -// you are not supposed to understand this +function clipLine (var x0, y0, x1, y1: Single; xmin, ymin, xmax, ymax: Single): Boolean; +const + Inside = 0; + Left = 1; + Right = 2; + Bottom = 4; + Top = 8; + + function xcode (x, y: Single): Byte; inline; + begin + result := Inside; + if (x < xmin) then result := result or Left else if (x > xmax) then result := result or Right; + if (y < ymin) then result := result or Bottom else if (y > ymax) then result := result or Top; + end; + +var + outcode0, outcode1, outcodeOut: Byte; + x: Single = 0; + y: Single = 0; +begin + result := false; // accept + outcode0 := xcode(x0, y0); + outcode1 := xcode(x1, y1); + while true do + begin + if ((outcode0 or outcode1) = 0) then begin result := true; exit; end; // accept + if ((outcode0 and outcode1) <> 0) then exit; // reject + outcodeOut := outcode0; + if (outcodeOut = 0) then outcodeOut := outcode1; + if ((outcodeOut and Top) <> 0) then + begin + x := x0+(x1-x0)*(ymax-y0)/(y1-y0); + y := ymax; + end + else if ((outcodeOut and Bottom) <> 0) then + begin + x := x0+(x1-x0)*(ymin-y0)/(y1-y0); + y := ymin; + end + else if ((outcodeOut and Right) <> 0) then + begin + y := y0+(y1-y0)*(xmax-x0)/(x1-x0); + x := xmax; + end + else if ((outcodeOut and Left) <> 0) then + begin + y := y0+(y1-y0)*(xmin-x0)/(x1-x0); + x := xmin; + end; + if (outcodeOut = outcode0) then + begin + x0 := x; + y0 := y; + outcode0 := xcode(x0, y0); + end + else + begin + x1 := x; + y1 := y; + outcode1 := xcode(x1, y1); + end; + end; +end; + + // returns `true` if there is an intersection, and enter coords // enter coords will be equal to (x0, y0) if starting point is inside the box // 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; var - 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; - d0, d1: PInteger; - xfixed: Boolean; - temp: Integer; + sx0, sy0, sx1, sy1: Single; begin - result := false; - // why not inx := x0; iny := y0; - if (bw < 1) or (bh < 1) then exit; // impossible box - - if (x0 = x1) and (y0 = y1) then + result := false; + if (bw < 1) or (bh < 1) then exit; + if (x0 >= bx) and (y0 >= by) and (x0 < bx+bw) and (y0 < by+bh) then begin result := true; exit; end; + sx0 := x0; sy0 := y0; + sx1 := x1; sy1 := y1; + result := clipLine(sx0, sy0, sx1, sy1, bx, by, bx+bw-1, by+bh-1); + if result then + begin + inx := trunc(sx0); + iny := trunc(sy0); + // hack! + if (inx = bx) then Dec(inx) else if (inx = bx+bw-1) then Inc(inx); + if (iny = by) then Dec(iny) else if (iny = by+bh-1) then Inc(iny); + end + else begin - // check this point - result := (x0 >= bx) and (y0 >= by) and (x0 < bx+bw) and (y0 < by+bh); - exit; + inx := x1; + iny := y1; end; +end; - // check if staring point is inside the box - if (x0 >= bx) and (y0 >= by) and (x0 < bx+bw) and (y0 < by+bh) then begin result := true; exit; end; +// ////////////////////////////////////////////////////////////////////////// // +constructor TLineWalker.Create (minx, miny, maxx, maxy: Integer); +begin + setClip(minx, miny, maxx, maxy); +end; + +procedure TLineWalker.setClip (minx, miny, maxx, maxy: Integer); inline; +begin // clip rectange - wx0 := bx; - wy0 := by; - wx1 := bx+bw-1; - wy1 := by+bh-1; + wx0 := minx; + wy0 := miny; + wx1 := maxx; + wy1 := maxy; +end; - // horizontal setup - if (x0 < x1) then +function TLineWalker.setup (x0, y0, x1, y1: Integer): Boolean; +var + sx0, sy0, sx1, sy1: Single; +begin + if (wx1 < wx0) or (wy1 < wy0) then begin stleft := 0; xd := x0; yd := y0; result := false; exit; end; + + if (x0 >= wx0) and (y0 >= wy0) and (x0 <= wx1) and (y0 <= wy1) and + (x1 >= wx0) and (y1 >= wy0) and (x1 <= wx1) and (y1 <= wy1) then begin - // from left to right - if (x0 > wx1) or (x1 < wx0) then exit; // out of screen - stx := 1; // going right + result := true; 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); + sx0 := x0; sy0 := y0; + sx1 := x1; sy1 := y1; + result := clipLine(sx0, sy0, sx1, sy1, wx0, wy0, wx1, wy1); + if not result then begin stleft := 0; xd := x0; yd := y0; exit; end; + x0 := trunc(sx0); y0 := trunc(sy0); + x1 := trunc(sx1); y1 := trunc(sy1); end; - // vertical setup - if (y0 < y1) then + // check for ortho lines + if (y0 = y1) then begin - // from top to bottom - if (y0 > wy1) or (y1 < wy0) then exit; // out of screen - sty := 1; // going down + // horizontal + horiz := true; + stleft := abs(x1-x0)+1; + if (x0 < x1) then stx := 1 else stx := -1; + sty := 0; + errinc := 0; + errmax := 10; // anything that is greater than zero + end + else if (x0 = x1) then + begin + // vertical + horiz := false; + stleft := abs(y1-y0)+1; + stx := 0; + if (y0 < y1) then sty := 1 else sty := -1; + errinc := 0; + errmax := 10; // anything that is greater than zero 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); + // diagonal + if (abs(x1-x0) >= abs(y1-y0)) then + begin + // horizontal + horiz := true; + stleft := abs(x1-x0)+1; + errinc := abs(y1-y0)+1; + end + else + begin + // vertical + horiz := false; + stleft := abs(y1-y0)+1; + errinc := abs(x1-x0)+1; + end; + if (x0 < x1) then stx := 1 else stx := -1; + if (y0 < y1) then sty := 1 else sty := -1; + errmax := stleft; end; + xd := x0; + yd := y0; + err := -errmax; +end; - dsx := x1-x0; - dsy := y1-y0; +function TLineWalker.done (): Boolean; inline; begin result := (stleft <= 0); end; - if (dsx < dsy) then +// true: done +function TLineWalker.step (): Boolean; inline; +begin + if horiz then begin - d0 := @yd; - d1 := @xd; - swapInt(x0, y0); - swapInt(x1, y1); - swapInt(dsx, dsy); - swapInt(wx0, wy0); - swapInt(wx1, wy1); - swapInt(stx, sty); + xd += stx; + err += errinc; + if (err >= 0) then begin err -= errmax; yd += sty; end; end else begin - d0 := @xd; - d1 := @yd; + yd += sty; + err += errinc; + if (err >= 0) then begin err -= errmax; xd += stx; end; end; + Dec(stleft); + result := (stleft <= 0); +end; - dx2 := 2*dsx; - dy2 := 2*dsy; - xd := x0; - yd := y0; - e := 2*dsy-dsx; - //!term := x1; +// true: done +function TLineWalker.stepToNextTile (): Boolean; inline; +var + ex, ey: Integer; + xwalk, ywalk, wklen: Integer; // to the respective edges + f: Integer; +begin + result := false; - xfixed := false; - if (y0 < wy0) then + if (stleft < 2) then begin result := true; exit; end; // max one pixel left, nothing to do + + // strictly horizontal? + if (sty = 0) 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 + // only xd + if (stx < 0) then begin - yd := wy0; - e -= rem+dsx; - if (rem > 0) then begin Inc(xd); e += dy2; end; - xfixed := true; + // xd: to left edge + ex := (xd and (not (TileSize-1)))-1; + stleft -= xd-ex; + end + else + begin + // xd: to right edge + ex := (xd or (TileSize-1))+1; + stleft -= ex-xd; end; + result := (stleft <= 0); + xd := ex; + exit; end; - if (not xfixed) and (x0 < wx0) then + // strictly vertical? + if (stx = 0) 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; + // only xd + if (sty < 0) then + begin + // yd: to top edge + ey := (yd and (not (TileSize-1)))-1; + stleft -= yd-ey; + end + else + begin + // yd: to bottom edge + ey := (yd or (TileSize-1))+1; + stleft -= ey-yd; + end; + result := (stleft <= 0); + yd := ey; + exit; end; - (* - if (y1 > wy1) then + // diagonal + + // calculate xwalk + if (stx < 0) 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); + ex := (xd and (not (TileSize-1)))-1; + xwalk := xd-ex; + end + else + begin + ex := (xd or (TileSize-1))+1; + xwalk := ex-xd; 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 - *) + // calculate ywalk + if (sty < 0) then + begin + ey := (yd and (not (TileSize-1)))-1; + ywalk := yd-ey; + end + else + begin + ey := (yd or (TileSize-1))+1; + ywalk := ey-yd; + end; - if (sty = -1) then yd := -yd; - if (stx = -1) then begin xd := -xd; {!term := -term;} end; - //!dx2 -= dy2; + { + while (xd <> ex) and (yd <> ey) do + begin + if horiz then + begin + xd += stx; + err += errinc; + if (err >= 0) then begin err -= errmax; yd += sty; end; + end + else + begin + yd += sty; + err += errinc; + if (err >= 0) then begin err -= errmax; xd += stx; end; + end; + Dec(stleft); + if (stleft < 1) then begin result := true; exit; end; + end; + } - inx := d0^; - iny := d1^; - result := true; + if (xwalk <= ywalk) then wklen := xwalk else wklen := ywalk; + while true do + begin + // in which dir we want to walk? + stleft -= wklen; + if (stleft <= 0) then begin result := true; exit; end; + if horiz then + begin + xd += wklen*stx; + for f := 1 to wklen do + begin + err += errinc; + if (err >= 0) then begin err -= errmax; yd += sty; end; + end; + end + else + begin + yd += wklen*sty; + for f := 1 to wklen do + begin + err += errinc; + if (err >= 0) then begin err -= errmax; xd += stx; end; + end; + end; + // check for walk completion + if (xd = ex) or (yd = ey) then exit; + wklen := 1; + end; end; +procedure TLineWalker.getXY (out ox, oy: Integer); inline; begin ox := xd; oy := yd; end; + // ////////////////////////////////////////////////////////////////////////// // -procedure TBodyGridBase.TBodyProxyRec.setup (aX, aY, aWidth, aHeight: Integer; aObj: ITP; aTag: Integer); -begin - mX := aX; - mY := aY; - mWidth := aWidth; - mHeight := aHeight; - mQueryMark := 0; - mObj := aObj; - mTag := aTag; - nextLink := -1; -end; +function sweepAABB (mex0, mey0, mew, meh: Integer; medx, medy: Integer; itx0, ity0, itw, ith: Integer; + u0: PSingle=nil; hitedge: PInteger=nil; u1: PSingle=nil): Boolean; +var + tin, tout: Single; + function axisOverlap (me0, me1, it0, it1, d, he0, he1: Integer): Boolean; inline; + var + t: Single; + begin + result := false; -function TBodyGridBase.TBodyProxyRec.getTag (): Integer; inline; -begin - result := mTag and TagFullMask; -end; + if (me1 < it0) then + begin + if (d >= 0) then exit; // oops, no hit + t := (me1-it0+1)/d; + if (t > tin) then begin tin := t; hitedge^ := he1; end; + end + else if (it1 < me0) then + begin + if (d <= 0) then exit; // oops, no hit + t := (me0-it1-1)/d; + if (t > tin) then begin tin := t; hitedge^ := he0; end; + end; -procedure TBodyGridBase.TBodyProxyRec.setTag (v: Integer); inline; -begin - mTag := (mTag and TagDisabled) or (v and TagFullMask); -end; + if (d < 0) and (it1 > me0) then + begin + t := (me0-it1-1)/d; + if (t < tout) then tout := t; + end + else if (d > 0) and (me1 > it0) then + begin + t := (me1-it0+1)/d; + if (t < tout) then tout := t; + end; -function TBodyGridBase.TBodyProxyRec.getEnabled (): Boolean; inline; -begin - result := ((mTag and TagDisabled) = 0); + result := true; + end; + +var + mex1, mey1, itx1, ity1, vx, vy: Integer; + htt: Integer = -1; +begin + result := false; + if (u0 <> nil) then u0^ := -1.0; + if (u1 <> nil) then u1^ := -1.0; + if (hitedge = nil) then hitedge := @htt else hitedge^ := -1; + + if (mew < 1) or (meh < 1) or (itw < 1) or (ith < 1) then exit; + + mex1 := mex0+mew-1; + mey1 := mey0+meh-1; + itx1 := itx0+itw-1; + ity1 := ity0+ith-1; + + // check if they are overlapping right now (SAT) + //if (mex1 >= itx0) and (mex0 <= itx1) and (mey1 >= ity0) and (mey0 <= ity1) then begin result := true; exit; end; + + if (medx = 0) and (medy = 0) then exit; // both boxes are sationary + + // treat b as stationary, so invert v to get relative velocity + vx := -medx; + vy := -medy; + + tin := -100000000.0; + tout := 100000000.0; + + if not axisOverlap(mex0, mex1, itx0, itx1, vx, 1, 3) then exit; + if not axisOverlap(mey0, mey1, ity0, ity1, vy, 2, 0) then exit; + + if (u0 <> nil) then u0^ := tin; + if (u1 <> nil) then u1^ := tout; + + if (tin <= tout) and (tin >= 0.0) and (tin <= 1.0) then + begin + result := true; + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +procedure TBodyGridBase.TBodyProxyRec.setup (aX, aY, aWidth, aHeight: Integer; aObj: ITP; aTag: Integer); +begin + mX := aX; + mY := aY; + mWidth := aWidth; + mHeight := aHeight; + mQueryMark := 0; + mObj := aObj; + mTag := aTag; + nextLink := -1; +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; @@ -536,7 +861,7 @@ begin 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); + e_WriteLog(Format('created grid with size: %dx%d (tile size: %d); pix: %dx%d', [mWidth, mHeight, mTileSize, mWidth*mTileSize, mHeight*mTileSize]), TMsgType.Notify); end; @@ -552,43 +877,43 @@ end; // ////////////////////////////////////////////////////////////////////////// // procedure TBodyGridBase.dumpStats (); var - idx, mcb, cidx, cnt: Integer; + idx, mcb, ccidx, cnt: Integer; begin mcb := 0; for idx := 0 to High(mGrid) do begin - cidx := mGrid[idx]; + ccidx := mGrid[idx]; cnt := 0; - while cidx >= 0 do + while ccidx >= 0 do begin Inc(cnt); - cidx := mCells[cidx].next; + ccidx := mCells[ccidx].next; 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; max proxies allocated: %d; proxies used: %d', [mWidth, mHeight, mTileSize, mWidth*mTileSize, mHeight*mTileSize, mUsedCells, mcb, mProxyMaxCount, 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]), TMsgType.Notify); end; procedure TBodyGridBase.forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB); var - g, f, cidx: Integer; + g, f, ccidx: Integer; cc: PGridCell; 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 + ccidx := mGrid[g]; + while (ccidx <> -1) do begin - cc := @mCells[cidx]; + cc := @mCells[ccidx]; 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); end; // next cell - cidx := cc.next; + ccidx := cc.next; end; end; end; @@ -596,7 +921,7 @@ end; function TBodyGridBase.forEachInCell (x, y: Integer; cb: TGridQueryCB): ITP; var - f, cidx: Integer; + f, ccidx: Integer; cc: PGridCell; begin result := Default(ITP); @@ -604,17 +929,17 @@ begin 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 + ccidx := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)]; + while (ccidx <> -1) do begin - cc := @mCells[cidx]; + cc := @mCells[ccidx]; 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; end; // next cell - cidx := cc.next; + ccidx := cc.next; end; end; @@ -798,11 +1123,10 @@ end; // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.forGridRect (x, y, w, h: Integer; cb: TGridInternalCB; bodyId: TBodyProxyId): Boolean; -const - tsize = mTileSize; var - gx, gy: Integer; gw, gh: Integer; + ex, ey: Integer; + gx, gy: Integer; begin result := false; if (w < 1) or (h < 1) or not assigned(cb) then exit; @@ -813,16 +1137,22 @@ begin if (x+w <= 0) or (y+h <= 0) then exit; gw := mWidth; gh := mHeight; - //tsize := mTileSize; - if (x >= gw*tsize) or (y >= gh*tsize) then exit; - for gy := y div tsize to (y+h-1) div tsize do - begin - if (gy < 0) then continue; - if (gy >= gh) then break; - for gx := x div tsize to (x+w-1) div tsize do + if (x >= gw*mTileSize) or (y >= gh*mTileSize) then exit; + ex := (x+w-1) div mTileSize; + ey := (y+h-1) div mTileSize; + x := x div mTileSize; + y := y div mTileSize; + // clip rect + if (x < 0) then x := 0 else if (x >= gw) then x := gw-1; + if (y < 0) then y := 0 else if (y >= gh) then y := gh-1; + if (ex < 0) then ex := 0 else if (ex >= gw) then ex := gw-1; + if (ey < 0) then ey := 0 else if (ey >= gh) then ey := gh-1; + if (x > ex) or (y > ey) then exit; // just in case + // do the work + for gy := y to ey do + begin + for gx := x to ex do begin - if (gx < 0) then continue; - if (gx >= gw) then break; result := cb(gy*gw+gx, bodyId); if result then exit; end; @@ -833,7 +1163,7 @@ end; // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.inserter (grida: Integer; bodyId: TBodyProxyId): Boolean; var - cidx: Integer; + ccidx: Integer; pc: Integer; pi: PGridCell; f: Integer; @@ -844,22 +1174,22 @@ begin if (pc <> -1) then begin {$IF DEFINED(D2F_DEBUG)} - cidx := pc; - while (cidx <> -1) do + ccidx := pc; + while (ccidx <> -1) do begin - pi := @mCells[cidx]; + pi := @mCells[ccidx]; 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; + ccidx := pi.next; end; {$ENDIF} - cidx := pc; - while (cidx <> -1) do + ccidx := pc; + while (ccidx <> -1) do begin - pi := @mCells[cidx]; + pi := @mCells[ccidx]; // check "has room" flag if (pi.bodies[GridCellBucketSize-1] = -1) then begin @@ -876,26 +1206,17 @@ begin raise Exception.Create('internal error in grid inserter'); end; // no room, go to next cell in list (if there is any) - cidx := pi.next; + ccidx := pi.next; end; // no room in cells, add new cell to list end; // either no room, or no cell at all - cidx := allocCell(); - pi := @mCells[cidx]; + ccidx := allocCell(); + pi := @mCells[ccidx]; pi.bodies[0] := bodyId; pi.bodies[1] := -1; pi.next := pc; - mGrid[grida] := cidx; -end; - -procedure TBodyGridBase.insertInternal (body: TBodyProxyId); -var - px: PBodyProxyRec; -begin - 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, body); + mGrid[grida] := ccidx; end; @@ -903,16 +1224,16 @@ end; function TBodyGridBase.remover (grida: Integer; bodyId: TBodyProxyId): Boolean; var f, c: Integer; - pidx, cidx: Integer; + pidx, ccidx: Integer; pc: PGridCell; begin result := false; // never stop // find and remove cell pidx := -1; // previous cell index - cidx := mGrid[grida]; // current cell index - while (cidx <> -1) do + ccidx := mGrid[grida]; // current cell index + while (ccidx <> -1) do begin - pc := @mCells[cidx]; + pc := @mCells[ccidx]; for f := 0 to GridCellBucketSize-1 do begin if (pc.bodies[f] = bodyId) then @@ -922,7 +1243,7 @@ begin begin // this cell contains no elements, remove it if (pidx = -1) then mGrid[grida] := pc.next else mCells[pidx].next := pc.next; - freeCell(cidx); + freeCell(ccidx); exit; end; // remove element from bucket @@ -935,34 +1256,30 @@ begin exit; end; end; - pidx := cidx; - cidx := pc.next; + pidx := ccidx; + ccidx := pc.next; end; end; -procedure TBodyGridBase.removeInternal (body: TBodyProxyId); -var - px: PBodyProxyRec; -begin - 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, body); -end; - // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.insertBody (aObj: ITP; aX, aY, aWidth, aHeight: Integer; aTag: Integer=-1): TBodyProxyId; begin aTag := aTag and TagFullMask; result := allocProxy(aX, aY, aWidth, aHeight, aObj, aTag); - insertInternal(result); + //insertInternal(result); + forGridRect(aX, aY, aWidth, aHeight, inserter, result); end; procedure TBodyGridBase.removeBody (body: TBodyProxyId); +var + px: PBodyProxyRec; begin if (body < 0) or (body > High(mProxies)) then exit; // just in case - removeInternal(body); + px := @mProxies[body]; + //removeInternal(body); + forGridRect(px.mX, px.mY, px.mWidth, px.mHeight, remover, body); freeProxy(body); end; @@ -991,15 +1308,18 @@ begin // did any corner crossed tile boundary? 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 + ((x0+w-1) div mTileSize <> (nx+nw-1) div mTileSize) or + ((y0+h-1) div mTileSize <> (ny+nh-1) div mTileSize) then begin - removeInternal(body); + //writeln('moveResizeBody: cell occupation changed! old=(', x0, ',', y0, ')-(', x0+w-1, ',', y0+h-1, '); new=(', nx, ',', ny, ')-(', nx+nw-1, ',', ny+nh-1, ')'); + //removeInternal(body); + forGridRect(px.mX, px.mY, px.mWidth, px.mHeight, remover, body); px.mX := nx+mMinX; px.mY := ny+mMinY; px.mWidth := nw; px.mHeight := nh; - insertInternal(body); + //insertInternal(body); + forGridRect(px.mX, px.mY, nw, nh, inserter, body); end else begin @@ -1010,6 +1330,7 @@ begin end; end; + //TODO: optimize for horizontal/vertical moves procedure TBodyGridBase.moveBody (body: TBodyProxyId; nx, ny: Integer); var @@ -1149,6 +1470,7 @@ begin px.mY := ny+mMinY; end; + procedure TBodyGridBase.resizeBody (body: TBodyProxyId; nw, nh: Integer); var px: PBodyProxyRec; @@ -1164,14 +1486,16 @@ begin {$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 + if ((x0+w-1) div mTileSize <> (x0+nw-1) div mTileSize) or + ((y0+h-1) div mTileSize <> (y0+nh-1) div mTileSize) then begin // crossed tile boundary, do heavy work - removeInternal(body); + //removeInternal(body); + forGridRect(px.mX, px.mY, px.mWidth, px.mHeight, remover, body); px.mWidth := nw; px.mHeight := nh; - insertInternal(body); + //insertInternal(body); + forGridRect(px.mX, px.mY, nw, nh, inserter, body); end else begin @@ -1185,12 +1509,12 @@ end; // ////////////////////////////////////////////////////////////////////////// // function TBodyGridBase.atCellInPoint (x, y: Integer): TAtPointEnumerator; var - cidx: Integer = -1; + ccidx: 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); + if (x >= 0) and (y >= 0) and (x < mWidth*mTileSize) and (y < mHeight*mTileSize) then ccidx := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)]; + result := TAtPointEnumerator.Create(mCells, ccidx, getProxyById); end; @@ -1290,17 +1614,16 @@ end; // ////////////////////////////////////////////////////////////////////////// // // no callback: return `true` on the first hit function TBodyGridBase.forEachInAABB (x, y, w, h: Integer; cb: TGridQueryCB; tagmask: Integer=-1; allowDisabled: Boolean=false): ITP; -const - tsize = mTileSize; var idx: Integer; gx, gy: Integer; + sx, sy, ex, ey: Integer; curci: Integer; f: Integer; cc: PGridCell = nil; px: PBodyProxyRec; lq: LongWord; - gw: Integer; + gw, gh: Integer; x0, y0: Integer; ptag: Integer; begin @@ -1317,11 +1640,24 @@ begin Dec(y, mMinY); gw := mWidth; - //tsize := mTileSize; + gh := mHeight; if (x+w <= 0) or (y+h <= 0) then exit; - if (x >= gw*tsize) or (y >= mHeight*tsize) then exit; + if (x >= gw*mTileSize) or (y >= gh*mTileSize) then exit; + + sx := x div mTileSize; + sy := y div mTileSize; + ex := (x+w-1) div mTileSize; + ey := (y+h-1) div mTileSize; + + // clip rect + if (sx < 0) then sx := 0 else if (sx >= gw) then sx := gw-1; + if (sy < 0) then sy := 0 else if (sy >= gh) then sy := gh-1; + if (ex < 0) then ex := 0 else if (ex >= gw) then ex := gw-1; + if (ey < 0) then ey := 0 else if (ey >= gh) then ey := gh-1; + 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; @@ -1337,14 +1673,10 @@ begin lq := mLastQuery; // go on - for gy := y div tsize to (y+h-1) div tsize do + for gy := sy to ey do begin - if (gy < 0) then continue; - if (gy >= mHeight) then break; - for gx := x div tsize to (x+w-1) div tsize do + for gx := sx to ex do begin - if (gx < 0) then continue; - if (gx >= gw) then break; // process cells curci := mGrid[gy*gw+gx]; while (curci <> -1) do @@ -1354,7 +1686,7 @@ begin 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 + // 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; @@ -1383,267 +1715,123 @@ end; // ////////////////////////////////////////////////////////////////////////// // -// no callback: return `true` on the nearest hit -function TBodyGridBase.traceRay (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; -var - ex, ey: Integer; -begin - result := traceRay(ex, ey, x0, y0, x1, y1, cb, tagmask); -end; - - -// no callback: return `true` on the nearest hit -// you are not supposed to understand this -function TBodyGridBase.traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; -const - tsize = mTileSize; +function TBodyGridBase.forEachAlongLine (ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; var - 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; - prevx, prevy: Integer; - lastDistSq: Integer; - ccidx, curci: Integer; - hasUntried: Boolean; - lastGA: Integer = -1; - ga, x, y: Integer; - lastObj: ITP; - wasHit: Boolean = false; - gw, gh, minx, miny, maxx, maxy: Integer; + lw: TLineWalker; + ccidx: Integer; cc: PGridCell; px: PBodyProxyRec; 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; + f, ptag: Integer; + gw, gh, minx, miny: Integer; + x0, y0: Integer; + x1, y1: Integer; + cx, cy: Integer; + //px0, py0, px1, py1: Integer; begin + log := false; result := Default(ITP); - lastObj := Default(ITP); tagmask := tagmask and TagFullMask; - ex := ax1; // why not? - ey := ay1; // why not? - if (tagmask = 0) then exit; - - 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; + if (tagmask = 0) or not assigned(cb) then exit; gw := mWidth; gh := mHeight; minx := mMinX; miny := mMinY; - 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; - y1 := ay1; - - // offset query coords to (0,0)-based - Dec(x0, minx); - Dec(y0, miny); - Dec(x1, minx); - Dec(y1, miny); + // make query coords (0,0)-based + x0 := ax0-minx; + y0 := ay0-miny; + x1 := ax1-minx; + y1 := ay1-miny; - // clip rectange - wx0 := 0; - wy0 := 0; - wx1 := maxx; - wy1 := maxy; + lw := TLineWalker.Create(0, 0, gw*mTileSize-1, gh*mTileSize-1); + if not lw.setup(x0, y0, x1, y1) then exit; // out of screen - // 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; + if mInQuery then raise Exception.Create('recursive queries aren''t supported'); + mInQuery := true; - // 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 + // increase query counter + Inc(mLastQuery); + if (mLastQuery = 0) then 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); + // just in case of overflow + mLastQuery := 1; + for f := 0 to High(mProxies) do mProxies[f].mQueryMark := 0; end; + lq := mLastQuery; - dsx := x1-x0; - dsy := y1-y0; + repeat + lw.getXY(cx, cy); + // check tile + ccidx := mGrid[(cy div mTileSize)*gw+(cx div mTileSize)]; + // process cells + 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) then + begin + px.mQueryMark := lq; // mark as processed + if cb(px.mObj, ptag) then + begin + result := px.mObj; + mInQuery := false; + exit; + end; + end; + end; + // next cell + ccidx := cc.next; + end; + // done processing cells, move to next tile + until lw.stepToNextTile(); - 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; + mInQuery := false; +end; - dx2 := 2*dsx; - dy2 := 2*dsy; - xd := x0; - yd := y0; - e := 2*dsy-dsx; - term := x1; - 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; - - 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 - //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; +// ////////////////////////////////////////////////////////////////////////// // +// trace box with the given velocity; return object hit (if any) +// `cb` is used unconvetionally here: if it returns `false`, tracer will ignore the object +function TBodyGridBase.traceBox (out ex, ey: Integer; const ax0, ay0, aw, ah: Integer; const dx, dy: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; +var + gx, gy: Integer; + ccidx: Integer; + cc: PGridCell; + px: PBodyProxyRec; + lq: LongWord; + f, ptag: Integer; + minu0: Single = 100000.0; + u0: Single; + cx0, cy0, cx1, cy1: Integer; + hitpx: PBodyProxyRec = nil; +begin + result := Default(ITP); + ex := ax0+dx; + ey := ay0+dy; + if (aw < 1) or (ah < 1) then exit; - 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; - *) + cx0 := nmin(ax0, ax0+dx); + cy0 := nmin(ay0, ay0+dy); + cx1 := nmax(ax0+aw-1, ax0+aw-1+dx); + cy1 := nmax(ay0+ah-1, ay0+ah-1+dy); - {$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]; + cx0 -= mMinX; cy0 -= mMinY; + cx1 -= mMinX; cy1 -= mMinY; - {$IF DEFINED(D2F_DEBUG_RAYTRACE)} - //if assigned(dbgRayTraceTileHitCB) then e_WriteLog('1:TRACING!', MSG_NOTIFY); - {$ENDIF} + if (cx1 < 0) or (cy1 < 0) or (cx0 >= mWidth*mTileSize) or (cy0 >= mHeight*mTileSize) then exit; - //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 (cx0 < 0) then cx0 := 0; + if (cy0 < 0) then cy0 := 0; + if (cx1 >= mWidth*mTileSize) then cx1 := mWidth*mTileSize-1; + if (cy1 >= mHeight*mTileSize) then cy1 := mHeight*mTileSize-1; + // just in case + if (cx0 > cx1) or (cy0 > cy1) then exit; if mInQuery then raise Exception.Create('recursive queries aren''t supported'); mInQuery := true; @@ -1658,382 +1846,352 @@ 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 + for gy := cy0 div mTileSize to cy1 div mTileSize do 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; - while (wklen > 0) do + for gx := cx0 div mTileSize to cx1 div mTileSize 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 + ccidx := mGrid[gy*mWidth+gx]; + while (ccidx <> -1) do 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 + cc := @mCells[ccidx]; + for f := 0 to GridCellBucketSize-1 do begin - cc := @mCells[ccidx]; - for f := 0 to GridCellBucketSize-1 do + 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 (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.y0) and (y <= px.y1)) or - ((not hopt) and (x >= px.x0) and (x <= px.x1))) then + px.mQueryMark := lq; // mark as processed + if assigned(cb) then begin - px.mQueryMark := lq; // mark as processed - // inside the proxy? - if (hopt and (x > px.x0) and (x < px.x1)) or - ((not hopt) and (y > px.y0) and (y < px.y1)) 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.x1) then continue; // not on the right edge - x := px.x1; - prevx := x+1; - end - else - begin - // going right - if (x > px.x0) then continue; // not on the left edge - x := px.x0; - prevx := x-1; - end; - end - else - begin - // vertical trace - prevx := x; - x := xptr^+minx; - if (stx < 0) then - begin - // going up - if (y < px.y1) then continue; // not on the bottom edge - y := px.y1; - prevy := x+1; - end - else - begin - // going down - if (y > px.y0) then continue; // not on the top edge - y := px.y0; - prevy := y-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 + if not cb(px.mObj, ptag) then continue; + end; + if not sweepAABB(ax0, ay0, aw, ah, dx, dy, px.mX, px.mY, px.mWidth, px.mHeight, @u0) then continue; + if (minu0 > u0) then + begin + hitpx := px; + result := px.mObj; + minu0 := u0; + if (u0 = 0.0) then 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; + ex := ax0; + ey := ay0; + mInQuery := false; + exit; 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; + // next cell + ccidx := cc.next; end; - // skip to next tile - if hopt then + end; + end; + + if (minu0 <= 1.0) then + begin + ex := ax0+round(dx*minu0); + ey := ay0+round(dy*minu0); + // just in case, compensate for floating point inexactness + if (ex >= hitpx.mX) and (ey >= hitpx.mY) and (ex < hitpx.mX+hitpx.mWidth) and (ey < hitpx.mY+hitpx.mHeight) then + begin + ex := ax0+trunc(dx*minu0); + ey := ay0+trunc(dy*minu0); + end; + end; + + mInQuery := false; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +{.$DEFINE D2F_DEBUG_OTR} +function TBodyGridBase.traceOrthoRayWhileIn (out ex, ey: Integer; ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): Boolean; +var + ccidx: Integer; + cc: PGridCell; + px: PBodyProxyRec; + ptag: Integer; + minx, miny: Integer; + f, c0, c1: Integer; + x0, y0, x1, y1: Integer; + celly0, celly1: Integer; + dy: Integer; + filled: array[0..mTileSize-1] of Byte; + {$IF DEFINED(D2F_DEBUG_OTR)} + s: AnsiString = ''; + {$ENDIF} +begin + result := false; + ex := ax1; + ey := ay1; + if not ((ax0 = ax1) or (ay0 = ay1)) then raise Exception.Create('orthoray is not orthogonal'); + + tagmask := tagmask and TagFullMask; + if (tagmask = 0) then exit; + + if (forEachAtPoint(ax0, ay0, nil, tagmask) = nil) then exit; + + minx := mMinX; + miny := mMinY; + + // offset query coords to (0,0)-based + x0 := ax0-minx; + y0 := ay0-miny; + x1 := ax1-minx; + y1 := ay1-miny; + + if (x0 = x1) then + begin + if (x0 < 0) or (x0 >= mWidth*mTileSize) then exit; // oops + // vertical + if (y0 < y1) then + begin + // down + if (y1 < 0) or (y0 >= mHeight*mTileSize) then exit; + //if (ay0 < 0) then ay0 := 0; + if (y0 < 0) then exit; + if (y1 >= mHeight*mTileSize) then y1 := mHeight*mTileSize-1; + dy := 1; + end + else + begin + // up + if (y0 < 0) or (y1 >= mHeight*mTileSize) then exit; + //if (ay1 < 0) then ay1 := 0; + if (y1 < 0) then exit; + if (y0 >= mHeight*mTileSize) then y0 := mHeight*mTileSize-1; + dy := -1; + end; + // check tile + while true do + begin + ccidx := mGrid[(y0 div mTileSize)*mWidth+(x0 div mTileSize)]; + FillChar(filled, sizeof(filled), 0); + celly0 := y0 and (not (mTileSize-1)); + celly1 := celly0+mTileSize-1; + while (ccidx <> -1) do begin - if (stx > 0) then + cc := @mCells[ccidx]; + for f := 0 to GridCellBucketSize-1 do 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 + 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 + (ax0 >= px.x0) and (ax0 <= px.x1) then + begin + // bound c0 and c1 to cell + c0 := nclamp(px.y0-miny, celly0, celly1); + c1 := nclamp(px.y1-miny, celly0, celly1); + // fill the thing + {$IF DEFINED(D2F_DEBUG_OTR)} + e_LogWritefln('**px.y0=%s; px.y1=%s; c0=%s; c1=%s; celly0=%s; celly1=%s; [%s..%s]', [px.y0-miny, px.y1-miny, c0, c1, celly0, celly1, c0-celly0, (c0-celly0)+(c1-c0)]); + {$ENDIF} + //assert(c0 <= c1); + FillChar(filled[c0-celly0], c1-c0+1, 1); + end; + end; + // next cell + ccidx := cc.next; + end; + {$IF DEFINED(D2F_DEBUG_OTR)} + s := formatstrf(' x=%s; ay0=%s; ay1=%s; y0=%s; celly0=%s; celly1=%s; dy=%s; [', [ax0, ay0, ay1, y0, celly0, celly1, dy]); + for f := 0 to High(filled) do if (filled[f] <> 0) then s += '1' else s += '0'; + s += ']'; + e_LogWriteln(s); + {$ENDIF} + // now go till we hit cell boundary or empty space + if (dy < 0) then + begin + // up + while (y0 >= celly0) and (filled[y0-celly0] <> 0) do 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]); + {$IF DEFINED(D2F_DEBUG_OTR)} + e_LogWritefln(' filled: cdy=%s; y0=%s; celly0=%s; ay0=%s; ay1=%s', [y0-celly0, y0, celly0, ay0, ay1]); {$ENDIF} - if (wkstep >= wklen) then break; - Dec(xptr^, wkstep); - Dec(ga); + Dec(y0); + Dec(ay0); end; + {$IF DEFINED(D2F_DEBUG_OTR)} + e_LogWritefln(' span done: cdy=%s; y0=%s; celly0=%s; ay0=%s; ay1=%s', [y0-celly0, y0, celly0, ay0, ay1]); + {$ENDIF} + if (ay0 <= ay1) then begin ey := ay1; result := false; exit; end; + if (y0 >= celly0) then begin ey := ay0+1; {assert(forEachAtPoint(ex, ey, nil, tagmask) <> nil);} result := true; exit; 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, mWidth); - 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, mWidth); - end; + // down + while (y0 <= celly1) and (filled[y0-celly0] <> 0) do begin Inc(y0); Inc(ay0); end; + if (ay0 >= ay1) then begin ey := ay1; result := false; exit; end; + if (y0 <= celly1) then begin ey := ay0-1; result := true; exit; 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 + else + begin + // horizontal + assert(false); end; - {$ENDIF} +end; - {$IF DEFINED(D2F_DEBUG_RAYTRACE)} - if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny); + +// ////////////////////////////////////////////////////////////////////////// // +function TBodyGridBase.traceRay (const x0, y0, x1, y1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; +var + ex, ey: Integer; +begin + result := traceRay(ex, ey, x0, y0, x1, y1, cb, tagmask); +end; + + +// no callback: return `true` on the nearest hit +// you are not supposed to understand this +function TBodyGridBase.traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; +var + lw: TLineWalker; + ccidx: Integer; + cc: PGridCell; + px: PBodyProxyRec; + lq: LongWord; + f, ptag: Integer; + gw, gh, minx, miny: Integer; + x0, y0: Integer; + x1, y1: Integer; + cx, cy: Integer; + px0, py0, px1, py1: Integer; + lastDistSq, distSq, hx, hy: Integer; + firstCell: Boolean = true; + wasHit: Boolean; +begin + result := Default(ITP); + tagmask := tagmask and TagFullMask; + if (tagmask = 0) then exit; + + gw := mWidth; + gh := mHeight; + minx := mMinX; + miny := mMinY; + + // make query coords (0,0)-based + x0 := ax0-minx; + y0 := ay0-miny; + x1 := ax1-minx; + y1 := ay1-miny; + + lw := TLineWalker.Create(0, 0, gw*mTileSize-1, gh*mTileSize-1); + if not lw.setup(x0, y0, x1, y1) then exit; // out of screen + + lastDistSq := distanceSq(ax0, ay0, ax1, ay1)+1; + + {$IF DEFINED(D2F_DEBUG)} + //if assigned(dbgRayTraceTileHitCB) then e_LogWritefln('*** traceRay: (%s,%s)-(%s,%s)', [x0, y0, x1, y1]); {$ENDIF} - //e_LogWritefln('*********************', []); - ccidx := -1; - // can omit checks - while (xd <> term) do + if mInQuery then raise Exception.Create('recursive queries aren''t supported'); + mInQuery := true; + + // increase query counter + Inc(mLastQuery); + if (mLastQuery = 0) then begin - // check cell(s) + // just in case of overflow + mLastQuery := 1; + for f := 0 to High(mProxies) do mProxies[f].mQueryMark := 0; + end; + lq := mLastQuery; + + repeat + lw.getXY(cx, cy); {$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} - if (ccidx <> -1) then - begin - // signal cell completion - if assigned(cb) then - begin - 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; - lastGA := ga; - ccidx := mGrid[lastGA]; - end; - // has something to process in this tile? - if (ccidx <> -1) then - begin - // process cell - curci := ccidx; - hasUntried := false; // this will be set to `true` if we have some proxies we still want to process at the next step - // convert coords to map (to avoid ajdusting coords inside the loop) - x := xptr^+minx; - y := yptr^+miny; - // process cell list - while (curci <> -1) do + if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB(cx+mMinX, cy+mMinY); + {$ENDIF} + // check tile + ccidx := mGrid[(cy div mTileSize)*gw+(cx div mTileSize)]; + // process cells + wasHit := false; + while (ccidx <> -1) do + begin + cc := @mCells[ccidx]; + for f := 0 to GridCellBucketSize-1 do begin - cc := @mCells[curci]; - for f := 0 to GridCellBucketSize-1 do + 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 (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 + px.mQueryMark := lq; // mark as processed + if assigned(cb) then begin - // can we process this proxy? - 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; // mark as processed - 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 - // 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; - lastDistSq := distSq; - ex := prevx; - ey := prevy; - lastObj := px.mObj; - end; - end; - end - else + if not cb(px.mObj, ptag) then continue; + end; + // get adjusted proxy coords + px0 := px.mX-minx; + py0 := px.mY-miny; + px1 := px0+px.mWidth-1; + py1 := py0+px.mHeight-1; + {$IF DEFINED(D2F_DEBUG)} + //if assigned(dbgRayTraceTileHitCB) then e_LogWritefln(' cxy=(%s,%s); pan=(%s,%s)-(%s,%s)', [cx, cy, px0, py0, px1, py1]); + {$ENDIF} + // inside? + if firstCell and (x0 >= px0) and (y0 >= py0) and (x0 <= px1) and (y0 <= py1) then + begin + // oops + ex := ax0; + ey := ay0; + result := px.mObj; + mInQuery := false; + {$IF DEFINED(D2F_DEBUG)} + if assigned(dbgRayTraceTileHitCB) then e_LogWriteln(' INSIDE!'); + {$ENDIF} + exit; + end; + // do line-vs-aabb test + if lineAABBIntersects(x0, y0, x1, y1, px0, py0, px1-px0+1, py1-py0+1, hx, hy) then + begin + // hit detected + distSq := distanceSq(x0, y0, hx, hy); + {$IF DEFINED(D2F_DEBUG)} + //if assigned(dbgRayTraceTileHitCB) then e_LogWritefln(' hit=(%s,%s); distSq=%s; lastDistSq=%s', [hx, hy, distSq, lastDistSq]); + {$ENDIF} + if (distSq < lastDistSq) then begin - // this is possibly interesting proxy, set "has more to check" flag - hasUntried := true; + lastDistSq := distSq; + ex := hx+minx; + ey := hy+miny; + result := px.mObj; + wasHit := true; end; end; end; - // next cell - curci := cc.next; - end; - // still has something interesting in this cell? - if not hasUntried then - begin - // nope, don't process this cell anymore; signal cell completion - ccidx := -1; - if assigned(cb) then - begin - 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; + // next cell + ccidx := cc.next; end; - //putPixel(xptr^, yptr^); - // move coords - prevx := xptr^+minx; - prevy := yptr^+miny; - 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; + // 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; + firstCell := false; + // move to next tile + until lw.stepToNextTile(); mInQuery := false; end; // ////////////////////////////////////////////////////////////////////////// // -//FIXME! optimize this with real tile walking -function TBodyGridBase.forEachAlongLine (ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP; -const - tsize = mTileSize; +// no callback: return `true` on the nearest hit +function TBodyGridBase.traceRayOld (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; +var + ex, ey: Integer; +begin + result := traceRayOld(ex, ey, x0, y0, x1, y1, cb, tagmask); +end; + + +// no callback: return `true` on the nearest hit +// you are not supposed to understand this +function TBodyGridBase.traceRayOld (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; var wx0, wy0, wx1, wy1: Integer; // window coordinates stx, sty: Integer; // "steps" for x and y axes @@ -2046,14 +2204,19 @@ var xptr, yptr: PInteger; xfixed: Boolean; temp: Integer; + prevx, prevy: Integer; + lastDistSq: Integer; ccidx, curci: Integer; + hasUntried: Boolean; lastGA: Integer = -1; - ga: Integer; + ga, x, y: Integer; + lastObj: ITP; + wasHit: Boolean = false; gw, gh, minx, miny, maxx, maxy: Integer; cc: PGridCell; px: PBodyProxyRec; lq: LongWord; - f, ptag: Integer; + f, ptag, distSq: Integer; x0, y0, x1, y1: Integer; //swapped: Boolean = false; // true: xd is yd, and vice versa // horizontal walker @@ -2065,23 +2228,35 @@ var // skipper xdist, ydist: Integer; begin - log := false; result := Default(ITP); + lastObj := Default(ITP); tagmask := tagmask and TagFullMask; - if (tagmask = 0) or not assigned(cb) then exit; + ex := ax1; // why not? + ey := ay1; // why not? + if (tagmask = 0) then exit; if (ax0 = ax1) and (ay0 = ay1) then begin - result := forEachAtPoint(ax0, ay0, cb, tagmask, @ptag); + 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; + gw := mWidth; gh := mHeight; minx := mMinX; miny := mMinY; - maxx := gw*tsize-1; - maxy := gh*tsize-1; + maxx := gw*mTileSize-1; + maxy := gh*mTileSize-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; @@ -2178,7 +2353,8 @@ begin begin yd := wy0; e -= rem+dsx; - if (rem > 0) then begin Inc(xd); e += dy2; end; + //if (rem > 0) then begin Inc(xd); e += dy2; end; //BUGGY + if (xd < wx0) then begin xd += 1; e += dy2; end; //??? xfixed := true; end; end; @@ -2217,10 +2393,33 @@ begin // DON'T DO THIS! loop will take care of that if (xd = term) then begin - result := forEachAtPoint(ax0, ay0, cb, tagmask, @ptag); + //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; @@ -2230,12 +2429,18 @@ begin *) {$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)'); + if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*mTileSize) and (yptr^ >= gh*mTileSize) 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 DEFINED(D2F_DEBUG_RAYTRACE)} + //if assigned(dbgRayTraceTileHitCB) then e_WriteLog('1:TRACING!', MSG_NOTIFY); + {$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; @@ -2262,11 +2467,14 @@ begin {$IF DEFINED(D2F_DEBUG)} if dbgShowTraceLog then e_LogWritefln('optimized htrace; wklen=%d', [wklen]); {$ENDIF} - ga := (yptr^ div tsize)*gw+(xptr^ div tsize); + ga := (yptr^ div mTileSize)*gw+(xptr^ div mTileSize); + // one of those will never change + x := xptr^+minx; + y := yptr^+miny; while (wklen > 0) do begin {$IF DEFINED(D2F_DEBUG)} - if dbgShowTraceLog then e_LogWritefln(' htrace; ga=%d; x=%d, y=%d; ay0=%d', [ga, xptr^+minx, yptr^+miny, ay0]); + 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 @@ -2274,6 +2482,7 @@ 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]; @@ -2282,24 +2491,120 @@ 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 ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) and + // constant coord should be inside + ((hopt and (y >= px.y0) and (y <= px.y1)) or + ((not hopt) and (x >= px.x0) and (x <= px.x1))) then begin px.mQueryMark := lq; // mark as processed + // inside the proxy? + if (hopt and (x > px.x0) and (x < px.x1)) or + ((not hopt) and (y > px.y0) and (y < px.y1)) 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.x1) then continue; // not on the right edge + x := px.x1; + prevx := x+1; + end + else + begin + // going right + if (x > px.x0) then continue; // not on the left edge + x := px.x0; + prevx := x-1; + end; + end + else + begin + // vertical trace + prevx := x; + x := xptr^+minx; + if (stx < 0) then + begin + // going up + if (y < px.y1) then continue; // not on the bottom edge + y := px.y1; + prevy := x+1; + end + else + begin + // going down + if (y > px.y0) then continue; // not on the top edge + y := px.y0; + prevy := y-1; + end; + end; if assigned(cb) then begin - if cb(px.mObj, ptag) then begin result := px.mObj; mInQuery := false; exit; end; + 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 - result := px.mObj; - mInQuery := false; - exit; + 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 @@ -2354,25 +2659,28 @@ begin 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); + if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div mTileSize*mTileSize)+minx, (yptr^ div mTileSize*mTileSize)+miny); {$ENDIF} + //e_LogWritefln('*********************', []); 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)'); + if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*mTileSize) and (yptr^ >= gh*mTileSize) then raise Exception.Create('raycaster internal error (0)'); {$ENDIF} // new tile? - ga := (yptr^ div tsize)*gw+(xptr^ div tsize); + ga := (yptr^ div mTileSize)*gw+(xptr^ div mTileSize); {$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} @@ -2380,8 +2688,22 @@ begin begin // yes {$IF DEFINED(D2F_DEBUG)} - if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div tsize*tsize)+minx, (yptr^ div tsize*tsize)+miny); + if assigned(dbgRayTraceTileHitCB) then dbgRayTraceTileHitCB((xptr^ div mTileSize*mTileSize)+minx, (yptr^ div mTileSize*mTileSize)+miny); {$ENDIF} + if (ccidx <> -1) then + begin + // signal cell completion + if assigned(cb) then + begin + 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; lastGA := ga; ccidx := mGrid[lastGA]; end; @@ -2390,6 +2712,10 @@ begin begin // process cell curci := ccidx; + hasUntried := false; // this will be set to `true` if we have some proxies we still want to process at the next step + // convert coords to map (to avoid ajdusting coords inside the loop) + x := xptr^+minx; + y := yptr^+miny; // process cell list while (curci <> -1) do begin @@ -2401,177 +2727,101 @@ begin ptag := px.mTag; if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then begin - px.mQueryMark := lq; // mark as processed - if assigned(cb) then + // can we process this proxy? + if (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then begin - if cb(px.mObj, ptag) then begin result := px.mObj; mInQuery := false; exit; end; + px.mQueryMark := lq; // mark as processed + 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 + // 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; + lastDistSq := distSq; + ex := prevx; + ey := prevy; + lastObj := px.mObj; + end; + end; end else begin - result := px.mObj; - mInQuery := false; - exit; + // this is possibly interesting proxy, set "has more to check" flag + hasUntried := true; end; end; end; // next cell curci := cc.next; end; - // nothing more interesting in this cell - ccidx := -1; + // still has something interesting in this cell? + if not hasUntried then + begin + // nope, don't process this cell anymore; signal cell completion + ccidx := -1; + if assigned(cb) then + begin + 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; - // 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 + if (ccidx = -1) then 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]); + // 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; - //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 + prevx := xptr^+minx; + prevy := yptr^+miny; if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2; xd += stx; end; - - mInQuery := false; -end; - - -{.$DEFINE D2F_DEBUG_OTR} -function TBodyGridBase.traceOrthoRayWhileIn (out ex, ey: Integer; ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): Boolean; -var - ccidx: Integer; - cc: PGridCell; - px: PBodyProxyRec; - ptag: Integer; - minx, miny: Integer; - f, c0, c1: Integer; - x0, y0, x1, y1: Integer; - celly0, celly1: Integer; - dy: Integer; - filled: array[0..mTileSize-1] of Byte; - {$IF DEFINED(D2F_DEBUG_OTR)} - s: AnsiString = ''; - {$ENDIF} -begin - result := false; - ex := ax1; - ey := ay1; - if not ((ax0 = ax1) or (ay0 = ay1)) then raise Exception.Create('orthoray is not orthogonal'); - - tagmask := tagmask and TagFullMask; - if (tagmask = 0) then exit; - - if (forEachAtPoint(ax0, ay0, nil, tagmask) = nil) then exit; - - minx := mMinX; - miny := mMinY; - - // offset query coords to (0,0)-based - x0 := ax0-minx; - y0 := ay0-miny; - x1 := ax1-minx; - y1 := ay1-miny; - - if (x0 = x1) then + // we can travel less than one cell + if wasHit and not assigned(cb) then begin - if (x0 < 0) or (x0 >= mWidth*mTileSize) then exit; // oops - // vertical - if (y0 < y1) then - begin - // down - if (y1 < 0) or (y0 >= mHeight*mTileSize) then exit; - //if (ay0 < 0) then ay0 := 0; - if (y0 < 0) then exit; - if (y1 >= mHeight*mTileSize) then y1 := mHeight*mTileSize-1; - dy := 1; - end - else - begin - // up - if (y0 < 0) or (y1 >= mHeight*mTileSize) then exit; - //if (ay1 < 0) then ay1 := 0; - if (y1 < 0) then exit; - if (y0 >= mHeight*mTileSize) then y0 := mHeight*mTileSize-1; - dy := -1; - end; - // check tile - while true do - begin - ccidx := mGrid[(y0 div mTileSize)*mWidth+(x0 div mTileSize)]; - FillChar(filled, sizeof(filled), 0); - celly0 := y0 and (not (mTileSize-1)); - celly1 := celly0+mTileSize-1; - 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 - (ax0 >= px.x0) and (ax0 <= px.x1) then - begin - // bound c0 and c1 to cell - c0 := nclamp(px.y0-miny, celly0, celly1); - c1 := nclamp(px.y1-miny, celly0, celly1); - // fill the thing - {$IF DEFINED(D2F_DEBUG_OTR)} - e_LogWritefln('**px.y0=%s; px.y1=%s; c0=%s; c1=%s; celly0=%s; celly1=%s; [%s..%s]', [px.y0-miny, px.y1-miny, c0, c1, celly0, celly1, c0-celly0, (c0-celly0)+(c1-c0)]); - {$ENDIF} - //assert(c0 <= c1); - FillChar(filled[c0-celly0], c1-c0+1, 1); - end; - end; - // next cell - ccidx := cc.next; - end; - {$IF DEFINED(D2F_DEBUG_OTR)} - s := formatstrf(' x=%s; ay0=%s; ay1=%s; y0=%s; celly0=%s; celly1=%s; dy=%s; [', [ax0, ay0, ay1, y0, celly0, celly1, dy]); - for f := 0 to High(filled) do if (filled[f] <> 0) then s += '1' else s += '0'; - s += ']'; - e_LogWriteln(s); - {$ENDIF} - // now go till we hit cell boundary or empty space - if (dy < 0) then - begin - // up - while (y0 >= celly0) and (filled[y0-celly0] <> 0) do - begin - {$IF DEFINED(D2F_DEBUG_OTR)} - e_LogWritefln(' filled: cdy=%s; y0=%s; celly0=%s; ay0=%s; ay1=%s', [y0-celly0, y0, celly0, ay0, ay1]); - {$ENDIF} - Dec(y0); - Dec(ay0); - end; - {$IF DEFINED(D2F_DEBUG_OTR)} - e_LogWritefln(' span done: cdy=%s; y0=%s; celly0=%s; ay0=%s; ay1=%s', [y0-celly0, y0, celly0, ay0, ay1]); - {$ENDIF} - if (ay0 <= ay1) then begin ey := ay1; result := false; exit; end; - if (y0 >= celly0) then begin ey := ay0+1; {assert(forEachAtPoint(ex, ey, nil, tagmask) <> nil);} result := true; exit; end; - end - else - begin - // down - while (y0 <= celly1) and (filled[y0-celly0] <> 0) do begin Inc(y0); Inc(ay0); end; - if (ay0 >= ay1) then begin ey := ay1; result := false; exit; end; - if (y0 <= celly1) then begin ey := ay0-1; result := true; exit; end; - end; - end; + result := lastObj; end else begin - // horizontal - assert(false); + ex := ax1; // why not? + ey := ay1; // why not? end; + + mInQuery := false; end;