KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure each entity is iterated only once

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-11-23 15:38:32 +01:00
parent 5ff0fbb26f
commit 1dd764e28b
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/breeze/util/spatial_grid.c
View File

@@ -193,6 +193,11 @@ BzSpatialGridIter bzSpatialGridIter(BzSpatialGrid *grid, f32 posX, f32 posY, f32
} }
bool bzSpatialGridQueryNext(BzSpatialGridIter *it) { bool bzSpatialGridQueryNext(BzSpatialGridIter *it) {
BzSpatialGridID **cell = getCell(it->_grid, it->_x, it->_y); BzSpatialGridID **cell = getCell(it->_grid, it->_x, it->_y);
BzSpatialGridID id;
BzSpatialGridEntry *entry;
bool foundUnprocessed = false;
while (!foundUnprocessed) {
while (it->_cellIdx >= bzArraySize(*cell)) { while (it->_cellIdx >= bzArraySize(*cell)) {
it->_cellIdx = 0; it->_cellIdx = 0;
it->_x++; it->_x++;
@@ -205,15 +210,19 @@ bool bzSpatialGridQueryNext(BzSpatialGridIter *it) {
} }
cell = getCell(it->_grid, it->_x, it->_y); cell = getCell(it->_grid, it->_x, it->_y);
} }
id = bzArrayGet(*cell, it->_cellIdx);
BzSpatialGridID id = bzArrayGet(*cell, it->_cellIdx); entry = bzObjectPoolGetObject(it->_grid->entriesPool, id);
BzSpatialGridEntry *entry = bzObjectPoolGetObject(it->_grid->entriesPool, id);
BZ_ASSERT(entry && id == entry->id); BZ_ASSERT(entry && id == entry->id);
if (entry->queryIdx != it->_queryIdx) {
entry->queryIdx = it->_queryIdx;
foundUnprocessed = true;
}
it->_cellIdx++;
}
it->entry = *entry; it->entry = *entry;
it->data = (void *) (entry + 1); it->data = (void *) (entry + 1);
it->_cellIdx++;
return true; return true;
} }