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

Fix bounds for inserting into spatial grid

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-01-08 16:41:54 +01:00
parent 88cbfe4a37
commit 5486c3189f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/buildings.c
View File

@@ -65,7 +65,7 @@ ecs_entity_t placeBuilding(Game *game, BuildingType type,
ecs_set(ECS, building, Rotation, {0}); ecs_set(ECS, building, Rotation, {0});
SpatialGridID gridID = bzSpatialGridInsert(game->entityGrid, &building, SpatialGridID gridID = bzSpatialGridInsert(game->entityGrid, &building,
pos.x, pos.y, pos.x - size.x * 0.5f, pos.y - size.y * 0.5f,
size.x, size.y); size.x, size.y);
ecs_set_ptr(ECS, building, SpatialGridID, &gridID); ecs_set_ptr(ECS, building, SpatialGridID, &gridID);
ecs_set_ptr(ECS, building, Owner, &owner); ecs_set_ptr(ECS, building, Owner, &owner);

2
game/entity_factory.c
View File

@@ -14,7 +14,7 @@ ecs_entity_t entityCreateWorker(const Position position, Game *game) {
ecs_set_ptr(ECS, e, Position, &position); ecs_set_ptr(ECS, e, Position, &position);
ecs_set_ptr(ECS, e, Size, &size); ecs_set_ptr(ECS, e, Size, &size);
BzSpatialGridID spatialID = bzSpatialGridInsert(game->entityGrid, &e, BzSpatialGridID spatialID = bzSpatialGridInsert(game->entityGrid, &e,
position.x, position.y, position.x - size.x * 0.5f, position.y - size.y * 0.5f,
size.x, size.y); size.x, size.y);
ecs_set(ECS, e, SpatialGridID, { spatialID }); ecs_set(ECS, e, SpatialGridID, { spatialID });
ecs_set(ECS, e, Rotation, { 0.0f }); ecs_set(ECS, e, Rotation, { 0.0f });

2
game/systems/s_input.c
View File

@@ -61,7 +61,7 @@ void inputPrimaryAction(Game *game, InputState *input) {
type = INPUT_SELECTED_UNITS; type = INPUT_SELECTED_UNITS;
else if (selectEntity(game->entityGrid, input->mouseDownWorld, ecs_id(Harvestable))) else if (selectEntity(game->entityGrid, input->mouseDownWorld, ecs_id(Harvestable)))
type = INPUT_SELECTED_OBJECT; type = INPUT_SELECTED_OBJECT;
else if (selectEntity(game->entityGrid, input->mouseDownWorld, ecs_id(Buildable))) else if (selectEntity(game->entityGrid, input->mouseDownWorld, ecs_id(Building)))
type = INPUT_SELECTED_BUILDING; type = INPUT_SELECTED_BUILDING;
selectedCount = ecs_query_entity_count(input->queries.selected); selectedCount = ecs_query_entity_count(input->queries.selected);
if (selectedCount > 0) { if (selectedCount > 0) {