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

Move system initialization in systems.c, properly delete all entities when unloading map

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-12-29 17:18:06 +01:00
parent 5190c86316
commit cc66f15131
8 changed files with 84 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
game/map_init.c
View File

@@ -44,8 +44,8 @@ bool initEntityObjectsLayer(BzTileMap *map, BzTileObjectGroup *objectGroup) {
*/
bzLogInfo("%d %.2f %.2f", object.gid, object.shape.sizeX, object.shape.sizeY);
//EntityArms arms = {
// .left=ecs_new_id(ECS),
// .right=ecs_new_id(ECS),
// .left=createEntity(ECS),
// .right=createEntity(ECS),
//};
//ecs_set_ptr(ECS, e, EntityArms, &arms);
}
@@ -76,7 +76,7 @@ bool initBuildingsLayer(BzTileMap *map, BzTileLayer *layer) {
const i32 tileWidth = map->tileWidth;
const i32 tileHeight = map->tileHeight;
ecs_entity_t e = ecs_new_id(ECS);
ecs_entity_t e = entityCreate(ECS);
Size size = {.x = tileSize.sizeX * tileWidth, .y = tileSize.sizeY * tileHeight };
ecs_set_ptr(ECS, e, Size, &size);
ecs_set(ECS, e, Position, {
@@ -117,7 +117,7 @@ bool initTreesLayer(BzTileMap *map, BzTileLayer *layer) {
f32 sizeY = tileset->tileHeight;
f32 posX = layer->offsetX + x * sizeX;
f32 posY = layer->offsetY + y * sizeY;
ecs_entity_t e = ecs_new_id(ECS);
ecs_entity_t e = entityCreate(ECS);
SpatialGridID gridID = bzSpatialGridInsert(game->entityGrid, &e, posX, posY, sizeX, sizeY);
ecs_set(ECS, e, SpatialGridID, {gridID});
posX += sizeX * 0.5f;
@@ -137,7 +137,7 @@ bool initTreesLayer(BzTileMap *map, BzTileLayer *layer) {
}
ecs_entity_t createWorker(Position position, Size size, BzSpatialGrid *grid, BzTileset *tileset, BzTile gid) {
ecs_entity_t e = ecs_new_id(ECS);
ecs_entity_t e = entityCreate(ECS);
ecs_set_ptr(ECS, e, Position, &position);
ecs_set_ptr(ECS, e, Size, &size);
BzSpatialGridID spatialID = bzSpatialGridInsert(grid, &e,