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

Fix iteration

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-11-22 08:47:29 +01:00
parent 38544221af
commit 433b012715
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/breeze/utils/spatial_grid.c
View File

@@ -94,12 +94,17 @@ static BzSpatialGridIndex calculateGridIndex(BzSpatialGrid *grid, f32 posX, f32
i32 minY = (i32) floorf(posY); i32 minY = (i32) floorf(posY);
i32 maxX = (i32) ceilf(posX + sizeX); i32 maxX = (i32) ceilf(posX + sizeX);
i32 maxY = (i32) ceilf(posY + sizeY); i32 maxY = (i32) ceilf(posY + sizeY);
return (BzSpatialGridIndex) { BzSpatialGridIndex index = {
(i16) (minX / grid->cellWidth), (i16) (minX / grid->cellWidth),
(i16) (minY / grid->cellHeight), (i16) (minY / grid->cellHeight),
(i16) (maxX / grid->cellWidth), (i16) (maxX / grid->cellWidth),
(i16) (maxY / grid->cellHeight), (i16) (maxY / grid->cellHeight),
}; };
if (index.minX < 0) index.minX = 0;
if (index.minY < 0) index.minY = 0;
if (index.maxX >= grid->width) index.maxX = grid->width - 1;
if (index.maxY >= grid->height) index.maxY = grid->height - 1;
return index;
} }
BzSpatialGridID bzSpatialGridInsert(BzSpatialGrid *grid, void *data, f32 posX, f32 posY, f32 sizeX, f32 sizeY) { BzSpatialGridID bzSpatialGridInsert(BzSpatialGrid *grid, void *data, f32 posX, f32 posY, f32 sizeX, f32 sizeY) {
@@ -188,16 +193,17 @@ 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);
if (it->_cellIdx >= bzArraySize(*cell)) { while (it->_cellIdx >= bzArraySize(*cell)) {
it->_cellIdx = 0; it->_cellIdx = 0;
it->_x++; it->_x++;
if (it->_x > it->index.maxX) { if (it->_x > it->index.maxX) {
if (it->_y > it->index.maxX) { it->_x = it->index.minX;
it->_y++; it->_y++;
if (it->_y > it->index.maxY) if (it->_y > it->index.maxY) {
return false; return false;
} }
} }
cell = getCell(it->_grid, it->_x, it->_y);
} }
BzSpatialGridID id = bzArrayGet(*cell, it->_cellIdx); BzSpatialGridID id = bzArrayGet(*cell, it->_cellIdx);