cha0s/avocado-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify aabb query

Browse Source
This commit is contained in:
cha0s 2019-05-09 01:32:49 -05:00
parent 3e4f48c517
commit f15b23c437
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/entity/list/index.js
View File

@ -161,27 +161,22 @@ export class EntityList extends decorate(class {}) {
visibleEntities(query) { visibleEntities(query) {
const entities = []; const entities = [];
const entitiesTrack = []; const entitiesChecked = [];
const quadTree = this._quadTree; const quadTree = this._quadTree;
const nodes = quadTree.search(query); const nodes = quadTree.search(query);
// First, uniqueify. // Check all nodes.
for (let i = 0; i < nodes.length; ++i) { for (let i = 0; i < nodes.length; ++i) {
const node = nodes[i]; const node = nodes[i];
const entity = node.data[2]; const entity = node.data[2];
if (-1 === entitiesTrack.indexOf(entity)) { const aabb = node.data[3];
entitiesTrack.push(entity); if (-1 === entitiesChecked.indexOf(entity)) {
entitiesChecked.push(entity);
// Make sure the AABB is actually in the query due to expansion.
if (Rectangle.intersects(query, aabb)) {
entities.push(entity);
}
} }
} }
for (let i = 0; i < entitiesTrack.length; i++) {
const entity = entitiesTrack[i];
// Make sure they're actually in the query due to expanded AABB.
const visibleAabb = entity.visibleAabb;
if (!Rectangle.intersects(query, visibleAabb)) {
continue;
}
entities.push(entity);
}
// Hitting multiple points for each entity can return duplicates.
return entities; return entities;
} }

2
packages/entity/traits/listed.trait.js
View File

@ -37,7 +37,7 @@ export class Listed extends Trait {
const expandedAabb = Rectangle.expand(aabb, [32, 32]); const expandedAabb = Rectangle.expand(aabb, [32, 32]);
this.quadTreeAabb = expandedAabb; this.quadTreeAabb = expandedAabb;
const points = Rectangle.toPoints(expandedAabb); const points = Rectangle.toPoints(expandedAabb);
this.quadTreeNodes = points.map((point) => [...point, this.entity]); this.quadTreeNodes = points.map((point) => [...point, this.entity, aabb]);
// Add points to quad tree. // Add points to quad tree.
const quadTree = list.quadTree; const quadTree = list.quadTree;
for (const node of this.quadTreeNodes) { for (const node of this.quadTreeNodes) {