Change Storage to tag (since we have global storage)

This commit is contained in:
2023-12-29 14:59:40 +01:00
parent 681080f3ed
commit 5190c86316
4 changed files with 12 additions and 22 deletions

View File

@@ -7,7 +7,7 @@
static ecs_entity_t findNearestStorage(Position pos, ResourceType type, Position *outPos) {
ecs_filter_t *storageFilter = ecs_filter(ECS, {
.terms = {{ecs_id(Storage)}, {ecs_id(Position)} }
.terms = {{ecs_id(Position)}, {ecs_id(Storage)}},
});
ecs_iter_t it = ecs_filter_iter(ECS, storageFilter);
@@ -15,12 +15,11 @@ static ecs_entity_t findNearestStorage(Position pos, ResourceType type, Position
f32 closestDst = INFINITY;
Position closestPos = Vector2Zero();
while (ecs_filter_next(&it)) {
Storage *storage = ecs_field(&it, Storage, 1);
Position *storagePos = ecs_field(&it, Position, 2);
Position *storagePos = ecs_field(&it, Position, 1);
for (i32 i = 0; i < it.count; i++) {
f32 dst = Vector2Distance(pos, storagePos[i]);
if (storage[i].capacity[type] && dst < closestDst) {
if (dst < closestDst) {
closest = it.entities[i];
closestDst = dst;
closestPos = storagePos[i];