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

Properly clamp spatial index calculation

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-02-10 11:16:26 +01:00
parent 504b5b5f9b
commit e654c47446
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,21 +102,17 @@ static BzSpatialGridIndex calculateGridIndex(BzSpatialGrid *grid, f32 posX, f32
(i16) (maxY / grid->cellHeight), (i16) (maxY / grid->cellHeight),
}; };
if (index.minX > index.maxX) { index.minX = BZ_MAX(index.minX, 0);
i32 tmp = index.minX; index.maxX = BZ_MAX(index.maxX, 0);
index.minX = index.maxX; index.minY = BZ_MAX(index.minY, 0);
index.maxX = tmp; index.maxY = BZ_MAX(index.maxY, 0);
}
if (index.minY > index.maxY) {
i32 tmp = index.minY;
index.minY = index.maxY;
index.maxX = tmp;
}
if (index.minX < 0) index.minX = 0; const i32 maxWidth = grid->width - 1;
if (index.minY < 0) index.minY = 0; const i32 maxHeight = grid->height - 1;
if (index.maxX >= grid->width) index.maxX = grid->width - 1; index.minX = BZ_MIN(index.minX, maxWidth);
if (index.maxY >= grid->height) index.maxY = grid->height - 1; index.maxX = BZ_MIN(index.maxX, maxWidth);
index.minY = BZ_MIN(index.minY, maxHeight);
index.maxY = BZ_MIN(index.maxY, maxHeight);
return index; return index;
} }
@@ -194,6 +190,7 @@ void bzSpatialGridRemove(BzSpatialGrid *grid, BzSpatialGridID id) {
BzSpatialGridIter bzSpatialGridIter(BzSpatialGrid *grid, f32 posX, f32 posY, f32 sizeX, f32 sizeY) { BzSpatialGridIter bzSpatialGridIter(BzSpatialGrid *grid, f32 posX, f32 posY, f32 sizeX, f32 sizeY) {
BzSpatialGridIndex index = calculateGridIndex(grid, posX, posY, sizeX, sizeY); BzSpatialGridIndex index = calculateGridIndex(grid, posX, posY, sizeX, sizeY);
BZ_ASSERT(index.minX < grid->width && index.minY < grid->height);
BzSpatialGridIter it = { BzSpatialGridIter it = {
.index=index, .index=index,
._grid=grid, ._grid=grid,