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

Clamp spatial index to grid size

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-02-10 11:06:41 +01:00
parent 0e6e1d5a2d
commit 504b5b5f9b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ void *bzSpatialGridGetData(const BzSpatialGrid *grid, BzSpatialGridID id) {
static BzSpatialGridID **getCell(const BzSpatialGrid *grid, i32 x, i32 y) { static BzSpatialGridID **getCell(const BzSpatialGrid *grid, i32 x, i32 y) {
BZ_ASSERT(x >= 0 && y >= 0 && x < grid->width && y < grid->height);
return grid->cells + y * grid->width + x; return grid->cells + y * grid->width + x;
} }
@@ -100,10 +101,6 @@ static BzSpatialGridIndex calculateGridIndex(BzSpatialGrid *grid, f32 posX, f32
(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;
if (index.minX > index.maxX) { if (index.minX > index.maxX) {
i32 tmp = index.minX; i32 tmp = index.minX;
@@ -115,6 +112,12 @@ static BzSpatialGridIndex calculateGridIndex(BzSpatialGrid *grid, f32 posX, f32
index.minY = index.maxY; index.minY = index.maxY;
index.maxX = tmp; index.maxX = tmp;
} }
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; return index;
} }