index fcb8f6801d20ea037a5e906b40cc2dcc9cb28c07..a64e6322b7cbd98518e4ee9671cdb2a70aaccd94 100644 (file)
--- a/src/game/z_aabbtree.pas
+++ b/src/game/z_aabbtree.pas
interface
-uses e_log;
+uses
+ e_log, g_grid;
// ////////////////////////////////////////////////////////////////////////// //
public
constructor Create (ax, ay: Single; aangle: Single); overload;
constructor Create (ax0, ay0, ax1, ay1: Single); overload;
- constructor Create (const aray: Ray2D); overload;
+ constructor Create (var aray: Ray2D); overload;
- procedure copyFrom (const aray: Ray2D); inline;
+ procedure copyFrom (var aray: Ray2D); inline;
procedure normalizeDir (); inline;
public
constructor Create (x0, y0, x1, y1: TreeNumber); overload;
- constructor Create (const aabb: AABB2D); overload;
- constructor Create (const aabb0, aabb1: AABB2D); overload;
+ constructor Create (var aabb: AABB2D); overload;
+ constructor Create (var aabb0, aabb1: AABB2D); overload;
- procedure copyFrom (const aabb: AABB2D); inline;
+ procedure copyFrom (var aabb: AABB2D); inline;
procedure setDims (x0, y0, x1, y1: TreeNumber); inline;
- procedure setMergeTwo (const aabb0, aabb1: AABB2D); inline;
+ procedure setMergeTwo (var aabb0, aabb1: AABB2D); inline;
function volume (): TreeNumber; inline;
- procedure merge (const aabb: AABB2D); inline;
+ procedure merge (var aabb: AABB2D); inline;
// return true if the current AABB contains the AABB given in parameter
- function contains (const aabb: AABB2D): Boolean; inline; overload;
+ function contains (var aabb: AABB2D): Boolean; inline; overload;
function contains (ax, ay: TreeNumber): Boolean; inline; overload;
// return true if the current AABB is overlapping with the AABB in parameter
// two AABBs overlap if they overlap in the two axes at the same time
- function overlaps (const aabb: AABB2D): Boolean; inline; overload;
+ function overlaps (var aabb: AABB2D): Boolean; inline; overload;
// ray direction must be normalized
- function intersects (const ray: Ray2D; tmino: PSingle=nil; tmaxo: PSingle=nil): Boolean; overload;
+ function intersects (var ray: Ray2D; tmino: PSingle=nil; tmaxo: PSingle=nil): Boolean; overload;
function intersects (ax, ay, bx, by: Single): Boolean; inline; overload;
property valid: Boolean read getvalid;
//nextNodeId: Integer;
// a node is either a leaf (has data) or is an internal node (has children)
children: array [0..1] of Integer; // left and right child of the node (children[0] = left child)
- //TODO: `flesh` can be united with `children`
- flesh: TTreeFlesh;
// height of the node in the tree (-1 for free nodes)
height: SmallInt;
// fat axis aligned bounding box (AABB) corresponding to the node
aabb: AABB2D;
+ //TODO: `flesh` can be united with `children`
+ flesh: TTreeFlesh;
+ fleshX, fleshY: TreeNumber;
tag: Integer; // just a user-defined tag
public
// return true if the node is a leaf of the tree
function isfree (): Boolean; inline;
property nextNodeId: Integer read parentId write parentId;
//property flesh: Integer read children[0] write children[0];
+
+ procedure dumpToLog ();
end;
TVisitCheckerCB = function (node: PTreeNode): Boolean is nested;
public
// return `true` to stop
- type TForEachLeafCB = function (abody: TTreeFlesh; const aabb: AABB2D): Boolean is nested; // WARNING! don't modify AABB here!
+ type TForEachLeafCB = function (abody: TTreeFlesh; var aabb: AABB2D): Boolean is nested; // WARNING! don't modify AABB here!
public
// in the broad-phase collision detection (dynamic AABB tree), the AABBs are
function getNodeObjectId (nodeid: Integer): TTreeFlesh; inline;
procedure getNodeFatAABB (var aabb: AABB2D; nodeid: Integer); inline;
+ // returns `false` if nodeid is not leaf
+ function getNodeXY (nodeid: Integer; out x, y: Integer): Boolean; inline;
+
// return `false` for invalid flesh
- function getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boolean; virtual; abstract;
+ function getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh; tag: Integer): Boolean; virtual; abstract;
// insert an object into the tree
// this method creates a new leaf node in the tree and returns the id of the corresponding node or -1 on error
*
* return `true` if the tree was modified.
*)
- function updateObject (nodeId: Integer; dispX, dispY: TreeNumber; forceReinsert: Boolean=false): Boolean;
+ function updateObject (nodeId: Integer; dispX, dispY: TreeNumber; forceReinsert: Boolean=false): Boolean; overload;
+ function updateObject (nodeId: Integer; forceReinsert: Boolean=false): Boolean; overload;
function aabbQuery (ax, ay, aw, ah: TreeNumber; cb: TQueryOverlapCB; tagmask: Integer=-1): TTreeFlesh;
function pointQuery (ax, ay: TreeNumber; cb: TQueryOverlapCB): TTreeFlesh;
@@ -301,10 +309,10 @@ function maxF (a, b: TreeNumber): TreeNumber; inline; begin if (a > b) then resu
// ////////////////////////////////////////////////////////////////////////// //
constructor Ray2D.Create (ax, ay: Single; aangle: Single); begin setXYAngle(ax, ay, aangle); end;
constructor Ray2D.Create (ax0, ay0, ax1, ay1: Single); begin setX0Y0X1Y1(ax0, ay0, ax1, ay1); end;
-constructor Ray2D.Create (const aray: Ray2D); overload; begin copyFrom(aray); end;
+constructor Ray2D.Create (var aray: Ray2D); overload; begin copyFrom(aray); end;
-procedure Ray2D.copyFrom (const aray: Ray2D); inline;
+procedure Ray2D.copyFrom (var aray: Ray2D); inline;
begin
origX := aray.origX;
origY := aray.origY;
setDims(x0, y0, x1, y1);
end;
-constructor AABB2D.Create (const aabb: AABB2D); overload;
+constructor AABB2D.Create (var aabb: AABB2D); overload;
begin
copyFrom(aabb);
end;
-constructor AABB2D.Create (const aabb0, aabb1: AABB2D); overload;
+constructor AABB2D.Create (var aabb0, aabb1: AABB2D); overload;
begin
setMergeTwo(aabb0, aabb1);
end;
@@ -367,7 +375,7 @@ function AABB2D.getcenterY (): TreeNumber; inline; begin result := (minY+maxY) d
function AABB2D.getextentX (): TreeNumber; inline; begin result := (maxX-minX); end;
function AABB2D.getextentY (): TreeNumber; inline; begin result := (maxY-minY); end;
-procedure AABB2D.copyFrom (const aabb: AABB2D); inline;
+procedure AABB2D.copyFrom (var aabb: AABB2D); inline;
begin
minX := aabb.minX;
minY := aabb.minY;
end;
-procedure AABB2D.setMergeTwo (const aabb0, aabb1: AABB2D); inline;
+procedure AABB2D.setMergeTwo (var aabb0, aabb1: AABB2D); inline;
begin
{$IF DEFINED(D2F_DEBUG)}
if not aabb0.valid then raise Exception.Create('setMergeTwo: aabb0 is fucked');
end;
-procedure AABB2D.merge (const aabb: AABB2D); inline;
+procedure AABB2D.merge (var aabb: AABB2D); inline;
begin
{$IF DEFINED(D2F_DEBUG)}
if not aabb.valid then raise Exception.Create('merge: aabb is fucked');
end;
-function AABB2D.contains (const aabb: AABB2D): Boolean; inline; overload;
+function AABB2D.contains (var aabb: AABB2D): Boolean; inline; overload;
begin
result :=
(aabb.minX >= minX) and (aabb.minY >= minY) and
end;
-function AABB2D.overlaps (const aabb: AABB2D): Boolean; inline; overload;
+function AABB2D.overlaps (var aabb: AABB2D): Boolean; inline; overload;
begin
result := false;
// exit with no intersection if found separated along any axis
// something to consider here is that 0 * inf =nan which occurs when the ray starts exactly on the edge of a box
// https://tavianator.com/fast-branchless-raybounding-box-intersections-part-2-nans/
-function AABB2D.intersects (const ray: Ray2D; tmino: PSingle=nil; tmaxo: PSingle=nil): Boolean; overload;
+function AABB2D.intersects (var ray: Ray2D; tmino: PSingle=nil; tmaxo: PSingle=nil): Boolean; overload;
var
dinv, t1, t2, tmp: Single;
tmin, tmax: Single;
aabb.maxY := 0;
end;
+procedure TDynAABBTree.TTreeNode.dumpToLog ();
+begin
+ e_WriteLog(Format('NODE: parentId=%d; children=[%d,%d]; height=%d; tag=%d; fleshX=%d; fleshY=%d; aabb=(%d,%d)-(%d,%d)',
+ [parentId, children[0], children[1], Integer(height), tag, fleshX, fleshY, aabb.minX, aabb.minY, aabb.maxX, aabb.maxY]),
+ MSG_NOTIFY);
+end;
+
// ////////////////////////////////////////////////////////////////////////// //
// allocate and return a node to use in the tree
begin
{$IFDEF aabbtree_many_asserts}assert(mNodeCount = mAllocCount);{$ENDIF}
// allocate more nodes in the tree
- if (mAllocCount < 32768) then newsz := mAllocCount*2 else newsz := mAllocCount+16384;
+ if (mAllocCount <= 16384) then newsz := mAllocCount*2 else newsz := mAllocCount+16384;
SetLength(mNodes, newsz);
mAllocCount := newsz;
// initialize the allocated nodes
end;
// get the next free node
freeNodeId := mFreeNodeId;
- {$IFDEF aabbtree_many_asserts}assert((freeNodeId >= mNodeCount) and (freeNodeId < mAllocCount));{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}assert(freeNodeId < mAllocCount);{$ENDIF}
node := @mNodes[freeNodeId];
mFreeNodeId := node.nextNodeId;
node.clear();
node.height := 0;
Inc(mNodeCount);
result := freeNodeId;
+
+ //e_WriteLog(Format('tree: allocated node #%d', [result]), MSG_NOTIFY);
end;
mNodes[nodeId].flesh := nil;
mFreeNodeId := nodeId;
Dec(mNodeCount);
+
+ //e_WriteLog(Format('tree: released node #%d', [nodeId]), MSG_NOTIFY);
end;
function TDynAABBTree.insertObjectInternal (var aabb: AABB2D; staticObject: Boolean): Integer;
var
nodeId: Integer;
+ node: PTreeNode;
begin
// get the next available node (or allocate new ones if necessary)
nodeId := allocateNode();
+ node := @mNodes[nodeId];
+
// create the fat aabb to use in the tree
- mNodes[nodeId].aabb := AABB2D.Create(aabb);
+ node.aabb := AABB2D.Create(aabb);
if (not staticObject) then
begin
- mNodes[nodeId].aabb.minX -= mExtraGap;
- mNodes[nodeId].aabb.minY -= mExtraGap;
- mNodes[nodeId].aabb.maxX += mExtraGap;
- mNodes[nodeId].aabb.maxY += mExtraGap;
+ node.aabb.minX -= mExtraGap;
+ node.aabb.minY -= mExtraGap;
+ node.aabb.maxX += mExtraGap;
+ node.aabb.maxY += mExtraGap;
end;
// set the height of the node in the tree
- mNodes[nodeId].height := 0;
+ node.height := 0;
// insert the new leaf node in the tree
insertLeafNode(nodeId);
- {$IFDEF aabbtree_many_asserts}assert(mNodes[nodeId].leaf);{$ENDIF}
- {$IFDEF aabbtree_many_asserts}assert(nodeId >= 0);{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}node := @mNodes[nodeId];{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}assert(node.leaf);{$ENDIF}
// return the id of the node
result := nodeId;
{$ENDIF}
if pNode.leaf then
begin
- getFleshAABB(aabb, pNode.flesh);
+ getFleshAABB(aabb, pNode.flesh, pNode.tag);
{$IFDEF aabbtree_use_floats}
e_WriteLog(Format(' LEAF AABB:(%f,%f)-(%f,%f); valid=%d; volume=%f', [aabb.minX, aabb.minY, aabb.maxX, aabb.maxY, Integer(aabb.valid), aabb.volume]), MSG_NOTIFY);
{$ELSE}
function spop (): Integer; inline;
begin
- {$IFDEF aabbtree_many_asserts}assert(sp > 0);{$ENDIF}
+ //{$IFDEF aabbtree_many_asserts}assert(sp > 0);{$ENDIF}
if (sp <= length(stack)) then
begin
// use "small stack"
doNode: Boolean = false;
begin
if not assigned(checker) then begin result := -1; exit; end;
+ if not assigned(visitor) then raise Exception.Create('dyntree: empty visitors aren''t supported');
//if not assigned(visitor) then begin result := -1; exit; end;
- try
+ //try
{$IFDEF aabbtree_query_count}
mNodesVisited := 0;
mNodesDeepVisited := 0;
while (sp > 0) do
begin
// get the next node id to visit
- nodeId := spop();
+ {$IF TRUE}
+ nodeId := spop();
+ {$ELSE}
+ if (sp <= length(stack)) then
+ begin
+ // use "small stack"
+ Dec(sp);
+ nodeId := stack[sp];
+ end
+ else
+ begin
+ // use "big stack"
+ Dec(sp);
+ nodeId := bigstack[sp-length(stack)];
+ end;
+ {$ENDIF}
// skip it if it is a nil node
if (nodeId = TTreeNode.NullTreeNode) then continue;
{$IFDEF aabbtree_query_count}Inc(mNodesVisited);{$ENDIF}
// should we investigate this node?
case mode of
ModeNoChecks: doNode := checker(node);
- ModeAABB: doNode := caabb.overlaps(node.aabb);
- ModePoint: doNode := node.aabb.contains(caabb.minX, caabb.minY);
+ ModeAABB:
+ begin
+ //doNode := caabb.overlaps(node.aabb);
+ // this gives small speedup (or not...)
+ // exit with no intersection if found separated along any axis
+ if (caabb.maxX < node.aabb.minX) or (caabb.minX > node.aabb.maxX) then doNode := false
+ else if (caabb.maxY < node.aabb.minY) or (caabb.minY > node.aabb.maxY) then doNode := false
+ else doNode := true;
+ end;
+ ModePoint:
+ begin
+ //doNode := node.aabb.contains(caabb.minX, caabb.minY);
+ // this gives small speedup
+ doNode := (caabb.minX >= node.aabb.minX) and (caabb.minY >= node.aabb.minY) and (caabb.minX <= node.aabb.maxX) and (caabb.minY <= node.aabb.maxY);
+ end;
end;
if doNode then
begin
begin
// call visitor on it
{$IFDEF aabbtree_query_count}Inc(mNodesDeepVisited);{$ENDIF}
- if ((node.tag and tagmask) <> 0) and assigned(visitor) then
+ if ((node.tag and tagmask) <> 0) then
begin
- if (visitor(node.flesh, node.tag)) then begin result := nodeId; exit; end;
+ if (visitor(node.flesh, node.tag)) then begin result := nodeId; bigstack := nil; exit; end;
end;
end
else
end;
result := -1; // oops
- finally
bigstack := nil;
- end;
+ //finally
+ // bigstack := nil;
+ //end;
end;
@@ -1268,7 +1320,7 @@ function TDynAABBTree.computeTreeHeight (): Integer; begin result := computeHeig
// return the root AABB of the tree
procedure TDynAABBTree.getRootAABB (var aabb: AABB2D);
begin
- {$IFDEF aabbtree_many_asserts}assert((mRootNodeId >= 0) and (mRootNodeId < mNodeCount));{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}assert((mRootNodeId >= 0) and (mRootNodeId < mAllocCount));{$ENDIF}
aabb := mNodes[mRootNodeId].aabb;
end;
// WARNING: ids of removed objects can be reused on later insertions!
function TDynAABBTree.isValidId (id: Integer): Boolean;
begin
- result := (id >= 0) and (id < mNodeCount) and (mNodes[id].leaf);
+ result := (id >= 0) and (id < mAllocCount) and (mNodes[id].leaf);
end;
// get object by nodeid; can return nil for invalid ids
function TDynAABBTree.getNodeObjectId (nodeid: Integer): TTreeFlesh;
begin
- if (nodeid >= 0) and (nodeid < mNodeCount) and (mNodes[nodeid].leaf) then result := mNodes[nodeid].flesh else result := nil;
+ if (nodeid >= 0) and (nodeid < mAllocCount) and (mNodes[nodeid].leaf) then result := mNodes[nodeid].flesh else result := nil;
end;
// get fat object AABB by nodeid; returns random shit for invalid ids
procedure TDynAABBTree.getNodeFatAABB (var aabb: AABB2D; nodeid: Integer);
begin
- if (nodeid >= 0) and (nodeid < mNodeCount) and (not mNodes[nodeid].isfree) then aabb.copyFrom(mNodes[nodeid].aabb) else aabb.setDims(0, 0, 0, 0);
+ if (nodeid >= 0) and (nodeid < mAllocCount) and (not mNodes[nodeid].isfree) then aabb.copyFrom(mNodes[nodeid].aabb) else aabb.setDims(0, 0, 0, 0);
+end;
+
+function TDynAABBTree.getNodeXY (nodeid: Integer; out x, y: Integer): Boolean; inline;
+begin
+ if (nodeid >= 0) and (nodeid < mAllocCount) and (mNodes[nodeid].leaf) then
+ begin
+ result := true;
+ {$IFDEF aabbtree_use_floats}
+ x := round(mNodes[nodeid].fleshX);
+ y := round(mNodes[nodeid].fleshY);
+ {$ELSE}
+ x := mNodes[nodeid].fleshX;
+ y := mNodes[nodeid].fleshY;
+ {$ENDIF}
+ end
+ else
+ begin
+ result := false;
+ x := 0;
+ y := 0;
+ //if (nodeid >= 0) and (nodeid < mAllocCount) then mNodes[nodeid].dumpToLog();
+ end;
end;
function TDynAABBTree.insertObject (flesh: TTreeFlesh; tag: Integer; staticObject: Boolean=false): Integer;
var
aabb: AABB2D;
- nodeId: Integer;
+ nodeId, fx, fy: Integer;
begin
- if not getFleshAABB(aabb, flesh) then
+ if not getFleshAABB(aabb, flesh, tag) then
begin
{$IFDEF aabbtree_use_floats}
e_WriteLog(Format('trying to insert FUCKED FLESH:(%f,%f)-(%f,%f); volume=%f; valid=%d', [aabb.minX, aabb.minY, aabb.maxX, aabb.maxY, aabb.volume, Integer(aabb.valid)]), MSG_WARNING);
exit;
end;
//e_WriteLog(Format('inserting AABB:(%f,%f)-(%f,%f); volume=%f; valid=%d', [aabb.minX, aabb.minY, aabb.maxX, aabb.maxY, aabb.volume, Integer(aabb.valid)]), MSG_NOTIFY);
+ fx := aabb.minX;
+ fy := aabb.minY;
nodeId := insertObjectInternal(aabb, staticObject);
{$IFDEF aabbtree_many_asserts}assert(mNodes[nodeId].leaf);{$ENDIF}
mNodes[nodeId].flesh := flesh;
mNodes[nodeId].tag := tag;
+ mNodes[nodeId].fleshX := fx;
+ mNodes[nodeId].fleshY := fy;
result := nodeId;
end;
// WARNING: ids of removed objects can be reused on later insertions!
procedure TDynAABBTree.removeObject (nodeId: Integer);
begin
- if (nodeId < 0) or (nodeId >= mNodeCount) or (not mNodes[nodeId].leaf) then raise Exception.Create('invalid node id in TDynAABBTree');
+ if (nodeId < 0) or (nodeId >= mAllocCount) or (not mNodes[nodeId].leaf) then raise Exception.Create('invalid node id in TDynAABBTree');
// remove the node from the tree
removeLeafNode(nodeId);
releaseNode(nodeId);
end;
-function TDynAABBTree.updateObject (nodeId: Integer; dispX, dispY: TreeNumber; forceReinsert: Boolean=false): Boolean;
+function TDynAABBTree.updateObject (nodeId: Integer; forceReinsert: Boolean=false): Boolean; overload;
var
newAABB: AABB2D;
+ dispX, dispY: TreeNumber;
begin
- if (nodeId < 0) or (nodeId >= mNodeCount) or (not mNodes[nodeId].leaf) then raise Exception.Create('invalid node id in TDynAABBTree.updateObject');
+ if (nodeId < 0) or (nodeId >= mAllocCount) or (not mNodes[nodeId].leaf) then raise Exception.Create('invalid node id in TDynAABBTree.updateObject');
- if not getFleshAABB(newAABB, mNodes[nodeId].flesh) then raise Exception.Create('invalid node id in TDynAABBTree.updateObject');
+ if not getFleshAABB(newAABB, mNodes[nodeId].flesh, mNodes[nodeId].tag) then raise Exception.Create('invalid flesh dimensions in TDynAABBTree.updateObject');
if not newAABB.valid then raise Exception.Create('invalid flesh aabb in TDynAABBTree.updateObject');
+ dispX := newAABB.minX-mNodes[nodeId].fleshX;
+ dispY := newAABB.minY-mNodes[nodeId].fleshY;
+
+ if (dispX < -16) then dispX := -16 else if (dispX > 16) then dispX := 16;
+ if (dispY < -16) then dispY := -16 else if (dispY > 16) then dispY := 16;
+
+ result := updateObject(nodeId, dispX, dispY, forceReinsert);
+end;
+
+function TDynAABBTree.updateObject (nodeId: Integer; dispX, dispY: TreeNumber; forceReinsert: Boolean=false): Boolean; overload;
+var
+ newAABB: AABB2D;
+ fx, fy: Integer;
+ node: PTreeNode;
+begin
+ if (nodeId < 0) or (nodeId >= mAllocCount) or (not mNodes[nodeId].leaf) then raise Exception.Create('invalid node id in TDynAABBTree.updateObject');
+
+ if not getFleshAABB(newAABB, mNodes[nodeId].flesh, mNodes[nodeId].tag) then raise Exception.Create('invalid flesh dimensions in TDynAABBTree.updateObject');
+ if not newAABB.valid then raise Exception.Create('invalid flesh aabb in TDynAABBTree.updateObject');
+
+ fx := newAABB.minX;
+ fy := newAABB.minY;
+
// if the new AABB is still inside the fat AABB of the node
- if (not forceReinsert) and (mNodes[nodeId].aabb.contains(newAABB)) then begin result := false; exit; end;
+ if (not forceReinsert) and (mNodes[nodeId].aabb.contains(newAABB)) then
+ begin
+ node := @mNodes[nodeId];
+ node.fleshX := fx;
+ node.fleshY := fy;
+ result := false;
+ exit;
+ end;
// if the new AABB is outside the fat AABB, we remove the corresponding node
removeLeafNode(nodeId);
+ node := @mNodes[nodeId];
+
// compute the fat AABB by inflating the AABB with a constant gap
- mNodes[nodeId].aabb := newAABB;
+ node.aabb.copyFrom(newAABB);
+ node.fleshX := fx;
+ node.fleshY := fy;
+
if (not forceReinsert) and ((dispX <> 0) or (dispY <> 0)) then
begin
- mNodes[nodeId].aabb.minX := mNodes[nodeId].aabb.minX-mExtraGap;
- mNodes[nodeId].aabb.minY := mNodes[nodeId].aabb.minY-mExtraGap;
- mNodes[nodeId].aabb.maxX := mNodes[nodeId].aabb.maxX+mExtraGap;
- mNodes[nodeId].aabb.maxY := mNodes[nodeId].aabb.maxY+mExtraGap;
+ node.aabb.minX -= mExtraGap;
+ node.aabb.minY += mExtraGap;
+ node.aabb.maxX += mExtraGap;
+ node.aabb.maxY += mExtraGap;
end;
// inflate the fat AABB in direction of the linear motion of the AABB
if (dispX < 0) then
begin
- mNodes[nodeId].aabb.minX := mNodes[nodeId].aabb.minX+LinearMotionGapMultiplier*dispX {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
+ node.aabb.minX += LinearMotionGapMultiplier*dispX {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
end
else
begin
- mNodes[nodeId].aabb.maxX := mNodes[nodeId].aabb.maxX+LinearMotionGapMultiplier*dispX {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
+ node.aabb.maxX += LinearMotionGapMultiplier*dispX {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
end;
+
if (dispY < 0) then
begin
- mNodes[nodeId].aabb.minY := mNodes[nodeId].aabb.minY+LinearMotionGapMultiplier*dispY {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
+ node.aabb.minY += LinearMotionGapMultiplier*dispY {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
end
else
begin
- mNodes[nodeId].aabb.maxY := mNodes[nodeId].aabb.maxY+LinearMotionGapMultiplier*dispY {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
+ node.aabb.maxY += LinearMotionGapMultiplier*dispY {$IFDEF aabbtree_use_floats}{$ELSE}div 10{$ENDIF};
end;
- {$IFDEF aabbtree_many_asserts}assert(mNodes[nodeId].aabb.contains(newAABB));{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}assert(node.aabb.contains(newAABB));{$ENDIF}
// reinsert the node into the tree
insertLeafNode(nodeId);
result := nil;
if not assigned(cb) then exit;
if (aw < 1) or (ah < 1) then exit;
- caabb := AABB2D.Create(ax, ay, ax+aw, ay+ah);
+ //caabb := AABB2D.Create(ax, ay, ax+aw, ay+ah);
+ caabb.minX := ax;
+ caabb.minY := ay;
+ caabb.maxX := ax+aw;
+ caabb.maxY := ay+ah;
nid := visit(caabb, ModeAABB, checker, cb, tagmask);
if (nid >= 0) then result := mNodes[nid].flesh else result := nil;
end;
@@ -1423,13 +1542,15 @@ function TDynAABBTree.pointQuery (ax, ay: TreeNumber; cb: TQueryOverlapCB): TTre
begin
result := node.aabb.contains(ax, ay);
end;
+ function dummycb (abody: TTreeFlesh; atag: Integer): Boolean; begin result := false; end;
var
nid: Integer;
caabb: AABB2D;
begin
+ if not assigned(cb) then cb := dummycb;
caabb := AABB2D.Create(ax, ay, ax+1, ay+1);
nid := visit(caabb, ModePoint, checker, cb);
- {$IFDEF aabbtree_many_asserts}assert((nid < 0) or ((nid >= 0) and (nid < mNodeCount) and (mNodes[nid].leaf)));{$ENDIF}
+ {$IFDEF aabbtree_many_asserts}assert((nid < 0) or ((nid >= 0) and (nid < mAllocCount) and (mNodes[nid].leaf)));{$ENDIF}
if (nid >= 0) then result := mNodes[nid].flesh else result := nil;
end;