From bb8ffca65c7b4d3ce7b67e1c0c6b2121d397f445 Mon Sep 17 00:00:00 2001 From: Sander Mertens Date: Thu, 4 Apr 2024 20:04:21 -0700 Subject: [PATCH] Change field index to start from 0 --- README.md | 4 +- docs/Manual.md | 6 +- docs/Queries.md | 90 +- docs/Quickstart.md | 10 +- docs/Relationships.md | 8 +- docs/Systems.md | 18 +- examples/c/entities/basics/src/main.c | 2 +- examples/c/hello_world/src/main.c | 4 +- examples/c/modules/simple_module/src/main.c | 2 +- .../modules/simple_module/src/simple_module.c | 4 +- examples/c/observers/basics/src/main.c | 2 +- .../observers/enqueue_entity_event/src/main.c | 4 +- examples/c/observers/entity_event/src/main.c | 4 +- examples/c/observers/propagate/src/main.c | 4 +- .../c/observers/two_components/src/main.c | 4 +- .../c/observers/yield_existing/src/main.c | 2 +- examples/c/prefabs/basics/src/main.c | 2 +- examples/c/prefabs/variant/src/main.c | 8 +- examples/c/queries/basics/src/main.c | 8 +- examples/c/queries/change_tracking/src/main.c | 4 +- examples/c/queries/group_by/src/main.c | 2 +- .../c/queries/group_by_callbacks/src/main.c | 2 +- examples/c/queries/group_by_custom/src/main.c | 2 +- examples/c/queries/hierarchies/src/main.c | 8 +- examples/c/queries/instancing/src/main.c | 6 +- .../c/queries/setting_variables/src/main.c | 2 +- examples/c/queries/singleton/src/main.c | 4 +- examples/c/queries/sorting/src/main.c | 2 +- examples/c/queries/wildcards/src/main.c | 4 +- .../c/reflection/world_ser_deser/src/main.c | 4 +- .../relation_component/src/main.c | 2 +- examples/c/relationships/union/src/main.c | 4 +- examples/c/systems/basics/src/main.c | 4 +- examples/c/systems/custom_runner/src/main.c | 4 +- examples/c/systems/mutate_entity/src/main.c | 4 +- examples/c/systems/pipeline/src/main.c | 2 +- examples/c/systems/sync_point/src/main.c | 2 +- .../c/systems/sync_point_delete/src/main.c | 4 +- examples/c/systems/system_ctx/src/main.c | 8 +- examples/cpp/queries/instancing/src/main.cpp | 2 +- .../queries/setting_variables/src/main.cpp | 2 +- examples/cpp/queries/wildcards/src/main.cpp | 2 +- .../relationships/enum_relations/src/main.cpp | 4 +- examples/cpp/relationships/union/src/main.cpp | 4 +- flecs.c | 212 +- flecs.h | 8 +- include/flecs.h | 2 +- include/flecs/addons/cpp/delegate.hpp | 4 +- include/flecs/addons/cpp/iter.hpp | 2 +- src/addons/alerts.c | 12 +- src/addons/json/serialize.c | 20 +- src/addons/json/serialize_iter_rows.c | 8 +- src/addons/meta/meta.c | 16 +- src/addons/metrics.c | 22 +- src/addons/monitor.c | 18 +- src/addons/plecs.c | 4 +- src/addons/rest.c | 6 +- src/addons/timer.c | 12 +- src/bootstrap.c | 10 +- src/entity_name.c | 2 +- src/iter.c | 74 +- src/query/cache.c | 2 +- src/query/cache_iter.c | 2 +- src/query/engine.c | 4 +- test/addons/src/MultiThread.c | 8 +- test/addons/src/MultiThreadStaging.c | 6 +- test/addons/src/Pipeline.c | 27 +- test/addons/src/Run.c | 12 +- test/addons/src/SystemCascade.c | 12 +- test/addons/src/SystemManual.c | 10 +- test/addons/src/SystemMisc.c | 34 +- test/addons/src/SystemPeriodic.c | 28 +- test/addons/src/System_w_Empty.c | 6 +- test/addons/src/System_w_FromEntity.c | 12 +- test/addons/src/System_w_FromParent.c | 30 +- test/addons/src/System_w_FromSystem.c | 20 +- test/addons/src/util.c | 6 +- test/api/src/Commands.c | 8 +- test/api/src/ComponentLifecycle.c | 8 +- test/api/src/Delete.c | 2 +- test/api/src/Each.c | 52 +- test/api/src/Get_component.c | 12 +- test/api/src/Has.c | 2 +- test/api/src/Internals.c | 8 +- test/api/src/Iter.c | 222 +- test/api/src/Monitor.c | 2 +- test/api/src/Observer.c | 22 +- test/api/src/ObserverOnSet.c | 4 +- test/api/src/OnDelete.c | 6 +- test/api/src/Pairs.c | 62 +- test/api/src/Poly.c | 2 +- test/api/src/Prefab.c | 64 +- test/api/src/SingleThreadStaging.c | 38 +- test/api/src/Singleton.c | 2 +- test/api/src/Stresstests.c | 2 +- test/api/src/Trigger.c | 16 +- test/api/src/TriggerOnAdd.c | 18 +- test/api/src/TriggerOnRemove.c | 8 +- test/api/src/TriggerOnSet.c | 12 +- test/api/src/World.c | 60 +- test/api/src/util.c | 6 +- test/cpp_api/src/Enum.cpp | 10 +- test/cpp_api/src/Misc.cpp | 10 +- test/cpp_api/src/Observer.cpp | 2 +- test/cpp_api/src/Pairs.cpp | 4 +- test/cpp_api/src/Query.cpp | 54 +- test/cpp_api/src/QueryBuilder.cpp | 86 +- test/cpp_api/src/Singleton.cpp | 2 +- test/cpp_api/src/System.cpp | 32 +- test/cpp_api/src/SystemBuilder.cpp | 4 +- test/cpp_api/src/WorldFactory.cpp | 8 +- test/custom_builds/c/pipeline/src/main.c | 4 +- .../c/pipeline_w_system/src/main.c | 4 +- test/custom_builds/c/system/src/main.c | 4 +- test/custom_builds/c/timer/src/main.c | 4 +- test/meta/src/SerializeIterToJson.c | 24 +- test/query/src/Basic.c | 2076 +++++------ test/query/src/BuiltinPredicates.c | 416 +-- test/query/src/Cached.c | 502 +-- test/query/src/Cascade.c | 436 +-- test/query/src/ChangeDetection.c | 60 +- test/query/src/ComponentInheritance.c | 1702 ++++----- test/query/src/GroupBy.c | 22 +- test/query/src/MemberTarget.c | 1050 +++--- test/query/src/Operators.c | 2420 ++++++------- test/query/src/OrderBy.c | 30 +- test/query/src/OrderByEntireTable.c | 30 +- test/query/src/Recycled.c | 46 +- test/query/src/Scopes.c | 66 +- test/query/src/Toggle.c | 1594 ++++----- test/query/src/Transitive.c | 1958 +++++------ test/query/src/Traversal.c | 3040 ++++++++--------- test/query/src/Variables.c | 2492 +++++++------- test/query/src/util.c | 4 +- 134 files changed, 9904 insertions(+), 9855 deletions(-) diff --git a/README.md b/README.md index 8bd399a60..484dfcf59 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i++) { p[i].x += v[i].x; diff --git a/docs/Manual.md b/docs/Manual.md index fc7b7da97..2c9580332 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -60,8 +60,8 @@ typedef struct Velocity { // System names ('Move') use PascalCase. API types use snake_case_t void Move(ecs_iter_t *it) { // Functions use snake_case - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i++) { p[i].x += v[i].x; @@ -710,7 +710,7 @@ The implementation of the observer looks similar to a system: ```c void AddPosition(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i++) { p[i].x = 10; diff --git a/docs/Queries.md b/docs/Queries.md index b5d1ce482..b869f54ae 100644 --- a/docs/Queries.md +++ b/docs/Queries.md @@ -67,8 +67,8 @@ Flecs has different query types, which are optimized for different kinds of use ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x; @@ -98,8 +98,8 @@ ecs_query_t *q = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x; @@ -129,8 +129,8 @@ ecs_query_impl_t *r = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, r); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x; @@ -287,8 +287,8 @@ ecs_iter_t it = ecs_query_iter(world, f); // Outer loop: matching tables while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); // 1st term - Velocity *v = ecs_field(&it, Velocity, 2); // 2nd term + Position *p = ecs_field(&it, Position, 0); // 1st term + Velocity *v = ecs_field(&it, Velocity, 1); // 2nd term // Inner loop: entities in table for (int i = 0; i < it.count; i ++) { @@ -336,7 +336,7 @@ auto f = world.query_builder() f.each([](flecs::iter& it, size_t index, Position& p) { flecs::entity e = it.entity(index); std::cout << e.name() << ": " - << it.id(2).str() // prints pair + << it.id(1).str() // prints pair << std::endl; }); ``` @@ -404,8 +404,8 @@ The component arguments may be omitted, and can be obtained from the iterator ob auto f = world.query(); f.iter([](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(2); + auto p = it.field(0); + auto v = it.field(1); for (auto i : it) { p[i].x += v[i].x; @@ -420,8 +420,8 @@ This can be combined with an untyped variant of the `field` method to access com auto f = world.query(); f.iter([](flecs::iter& it) { - void *ptr = it.field(1); - flecs::id type_id = it.id(1); + void *ptr = it.field(0); + flecs::id type_id = it.id(0); // ... }); @@ -810,7 +810,7 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - ecs_id_t id = ecs_field_id(&it, 1); + ecs_id_t id = ecs_field_id(&it, 0); ecs_entity_t second = ecs_pair_second(world, id); for (int i = 0; i < it.count; i ++) { @@ -899,7 +899,7 @@ flecs::query<> f = world.query_builder() .build(); f.each([](flecs::iter& it, size_t index) { - flecs::entity second = it.pair(1).second(); + flecs::entity second = it.pair(0).second(); flecs::entity e = it.entity(index); std::cout << "entity " << e.name() @@ -1011,10 +1011,10 @@ flecs::query<> f = world.query_builder() .build(); f.iter([](flecs::iter& it) { - auto p = it.field(1); // OK - auto p = it.field(1); // OK - auto v = it.field(2); // OK - auto v = it.field(2); // Throws assert + auto p = it.field(0); // OK + auto p = it.field(0); // OK + auto v = it.field(1); // OK + auto v = it.field(1); // Throws assert }); ``` @@ -1140,10 +1140,10 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Mass *m = ecs_field(&it, Mass, 3); // not 4, because of the Or expression + Position *p = ecs_field(&it, Position, 0); + Mass *m = ecs_field(&it, Mass, 2); // not 4, because of the Or expression - ecs_id_t vs_id = ecs_field_id(&it, 2); + ecs_id_t vs_id = ecs_field_id(&it, 1); if (vs_id == ecs_id(Velocity)) { // We can only use ecs_field if the field type is the same for all results, // but we can get the table column directly. @@ -1169,10 +1169,10 @@ flecs::query<> f = world.query_builder() .build(); f.iter([&](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(3); // not 4, because of the Or expression + auto p = it.field(0); + auto v = it.field(2); // not 4, because of the Or expression - flecs::id vs_id = it.id(2); + flecs::id vs_id = it.id(1); if (vs_id == world.id()) { // We can only use ecs_field if the field type is the same for all results, // but we can use range() to get the table column directly. @@ -1280,9 +1280,9 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - if (ecs_field_is_set(&it, 2)) { - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + if (ecs_field_is_set(&it, 1)) { + Velocity *v = ecs_field(&it, Velocity, 1); // iterate as usual } else { // iterate as usual @@ -1300,10 +1300,10 @@ flecs::query<> f = world.query_builder() .build(); f.iter([&](flecs::iter& it) { - auto p = it.field(1); + auto p = it.field(0); - if (it.is_set(2)) { - auto v = it.field(2); + if (it.is_set(1)) { + auto v = it.field(1); // iterate as usual } else if (vs_id == world.id()) { // iterate as usual @@ -1559,9 +1559,9 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); - SimTime *st = ecs_field(&it, SimTime, 3); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); + SimTime *st = ecs_field(&it, SimTime, 2); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x * st[i].value; @@ -1598,8 +1598,8 @@ ecs_query_t *f = ecs_query(world, { }); while (ecs_query_next(&it)) { - ecs_entity_t src_1 = ecs_field_src(&it, 1); // Returns 0, meaning entity is stored in it.entities - ecs_entity_t src_2 = ecs_field_src(&it, 2); // Returns Game + ecs_entity_t src_1 = ecs_field_src(&it, 0); // Returns 0, meaning entity is stored in it.entities + ecs_entity_t src_2 = ecs_field_src(&it, 1); // Returns Game for (int i = 0; i < it.count; i ++) { printf("$This = %s, src_2 = %s\n", @@ -1625,9 +1625,9 @@ flecs::query<> f = world.query_builder() .build(); f.iter([](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(2); - auto st = it.field(3); + auto p = it.field(0); + auto v = it.field(1); + auto st = it.field(2); for (auto i : it) { p[i].x += v[i].x * st[i].value; @@ -2209,10 +2209,10 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, &it); while (ecs_query_next(&it)) { // Fetch components as usual - Position *p = ecs_field(&it, Position, 1); - Mass *m = ecs_field(&it, Mass, 2); + Position *p = ecs_field(&it, Position, 0); + Mass *m = ecs_field(&it, Mass, 1); - if (ecs_field_is_self(&it, 2)) { + if (ecs_field_is_self(&it, 1)) { // Mass is matched on self, access as array for (int i = 0; i < it.count; i ++) { p[i].x += 1.0 / m[i].value; @@ -2243,7 +2243,7 @@ flecs::query f = world.query_builder() .build(); f.iter([](flecs::iter& it, Position *p, Mass *v) { - if (it.is_self(2)) { + if (it.is_self(1)) { // Mass is matched on self, access as array for (auto i : it) { p[i].x += 1.0 / m[i].value; @@ -3074,8 +3074,8 @@ ecs_add(world, e, Velocity); // Iterate the tables in the cache ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x; diff --git a/docs/Quickstart.md b/docs/Quickstart.md index 3cb396df9..c4c3472d7 100644 --- a/docs/Quickstart.md +++ b/docs/Quickstart.md @@ -795,8 +795,8 @@ ecs_query_t *q = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Position *p_parent = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 0); + Position *p_parent = ecs_field(&it, Position, 1); for (int i = 0; i < it.count; i++) { // Do the thing } @@ -1116,7 +1116,7 @@ ecs_query_t *f = ecs_query_init(world, &(ecs_query_desc_t){ ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { // Each type has its own set of component arrays - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); // Iterate all entities for the type for (int i = 0; i < it.count; i++) { @@ -1307,8 +1307,8 @@ ecs_run(world, move_sys, delta_time, NULL); // Run system // The callback code (same for both options) void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i++) { p[i].x += v[i].x * it->delta_time; diff --git a/docs/Relationships.md b/docs/Relationships.md index 53588c145..aa019e5d2 100644 --- a/docs/Relationships.md +++ b/docs/Relationships.md @@ -219,7 +219,7 @@ ecs_query_t *f = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, f); while (ecs_query_next(&it)) { - ecs_id_t pair_id = ecs_field_id(&it, 1); + ecs_id_t pair_id = ecs_field_id(&it, 0); ecs_entity_t food = ecs_pair_second(world, pair_id); // Apples, ... for (int i = 0; i < it.count; i ++) { // Iterate as usual @@ -232,7 +232,7 @@ world.query_builder() .term(Eats, flecs::Wildcard) .build() .each([](flecs::iter& it, size_t i) { - flecs::entity food = it.pair(1).second(); // Apples, ... + flecs::entity food = it.pair(0).second(); // Apples, ... flecs::entity e = it.entity(i); // Iterate as usual }); @@ -386,7 +386,7 @@ ecs_query_t *q = ecs_query(world, { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - ecs_id_t id = ecs_field_id(&it, 1); // Obtain pair id + ecs_id_t id = ecs_field_id(&it, 0); // Obtain pair id // Get relationship & target ecs_entity_t rel = ecs_pair_first(world, id); @@ -406,7 +406,7 @@ auto q = world.query_builder() .build(); q.iter([](flecs::iter& it) { - auto id = it.pair(1); + auto id = it.pair(0); for (auto i : it) { cout << "entity " << it.entity(i) << " has relationship " diff --git a/docs/Systems.md b/docs/Systems.md index a11b567a3..e4abfa224 100644 --- a/docs/Systems.md +++ b/docs/Systems.md @@ -10,8 +10,8 @@ An example of a simple system: // System implementation void Move(ecs_iter_t *it) { // Get fields from system query - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); // Iterate matched entities for (int i = 0; i < it->count, i++) { @@ -161,8 +161,8 @@ ecs_iter_t it = ecs_query_iter(world, q); // Iterate tables matched by query while (ecs_query_next(&it)) { // Get fields from query - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); // Iterate matched entities for (int i = 0; i < it->count, i++) { @@ -174,8 +174,8 @@ while (ecs_query_next(&it)) { // System code void Move(ecs_iter_t *it) { // Get fields from system query - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); // Iterate matched entities for (int i = 0; i < it->count, i++) { @@ -265,8 +265,8 @@ A system provides a `delta_time` which contains the time passed since the last f
  • C ```c -Position *p = ecs_field(it, Position, 1); -Velocity *v = ecs_field(it, Velocity, 2); +Position *p = ecs_field(it, Position, 0); +Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count, i++) { p[i].x += v[i].x * it->delta_time; @@ -433,7 +433,7 @@ Tasks may query for components from a fixed source or singleton: // System function void PrintTime(ecs_iter_t *it) { // Get singleton component - Game *g = ecs_field(it, Game, 1); + Game *g = ecs_field(it, Game, 0); printf("Time: %f\n", g->time); } diff --git a/examples/c/entities/basics/src/main.c b/examples/c/entities/basics/src/main.c index c0e86b1e0..bd97625d6 100644 --- a/examples/c/entities/basics/src/main.c +++ b/examples/c/entities/basics/src/main.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { // Iterate all entities with Position ecs_iter_t it = ecs_each(ecs, Position); while (ecs_each_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); for (int i = 0; i < it.count; i ++) { printf("%s: {%f, %f}\n", ecs_get_name(ecs, it.entities[i]), p[i].x, p[i].y); diff --git a/examples/c/hello_world/src/main.c b/examples/c/hello_world/src/main.c index 812c420d5..d4b6caf00 100644 --- a/examples/c/hello_world/src/main.c +++ b/examples/c/hello_world/src/main.c @@ -10,8 +10,8 @@ typedef struct { * as entities are grouped in tables by which components they have, and each * table has its own set of component arrays. */ void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); /* Print the set of components for the iterated over entities */ char *type_str = ecs_table_str(it->world, it->table); diff --git a/examples/c/modules/simple_module/src/main.c b/examples/c/modules/simple_module/src/main.c index 6ee2b169d..aec2a00c8 100644 --- a/examples/c/modules/simple_module/src/main.c +++ b/examples/c/modules/simple_module/src/main.c @@ -2,7 +2,7 @@ #include void PrintPosition(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { printf("p = {%f, %f} (system)\n", p[i].x, p[i].y); diff --git a/examples/c/modules/simple_module/src/simple_module.c b/examples/c/modules/simple_module/src/simple_module.c index 2c1dbf3ad..1d48babaa 100644 --- a/examples/c/modules/simple_module/src/simple_module.c +++ b/examples/c/modules/simple_module/src/simple_module.c @@ -4,8 +4,8 @@ ECS_COMPONENT_DECLARE(Position); ECS_COMPONENT_DECLARE(Velocity); void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/examples/c/observers/basics/src/main.c b/examples/c/observers/basics/src/main.c index 2adfa28ce..ed429beaa 100644 --- a/examples/c/observers/basics/src/main.c +++ b/examples/c/observers/basics/src/main.c @@ -37,7 +37,7 @@ void Observer(ecs_iter_t *it) { ecs_entity_t event_id = it->event_id; // Get component values as usual - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; diff --git a/examples/c/observers/enqueue_entity_event/src/main.c b/examples/c/observers/enqueue_entity_event/src/main.c index 19b2712fe..39a1e4a32 100644 --- a/examples/c/observers/enqueue_entity_event/src/main.c +++ b/examples/c/observers/enqueue_entity_event/src/main.c @@ -19,7 +19,7 @@ ECS_COMPONENT_DECLARE(Resize); void OnClick(ecs_iter_t *it) { // The event source can be obtained with ecs_field_src(1). This allows the // same event function to be used for different entities. - char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 1)); + char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 0)); printf("clicked on %s!\n", path); ecs_os_free(path); } @@ -27,7 +27,7 @@ void OnClick(ecs_iter_t *it) { void OnResize(ecs_iter_t *it) { // Event payload can be obtained from the it->param member Resize *p = it->param; - char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 1)); + char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 0)); printf("resized %s to {%.0f, %.0f}!\n", path, p->width, p->height); ecs_os_free(path); } diff --git a/examples/c/observers/entity_event/src/main.c b/examples/c/observers/entity_event/src/main.c index d61a272e9..d40805ed4 100644 --- a/examples/c/observers/entity_event/src/main.c +++ b/examples/c/observers/entity_event/src/main.c @@ -26,7 +26,7 @@ ECS_COMPONENT_DECLARE(Resize); void OnClick(ecs_iter_t *it) { // The event source can be obtained with ecs_field_src(1). This allows the // same event function to be used for different entities. - char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 1)); + char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 0)); printf("clicked on %s!\n", path); ecs_os_free(path); } @@ -34,7 +34,7 @@ void OnClick(ecs_iter_t *it) { void OnResize(ecs_iter_t *it) { // Event payload can be obtained from the it->param member Resize *p = it->param; - char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 1)); + char *path = ecs_get_fullpath(it->world, ecs_field_src(it, 0)); printf("resized %s to {%.0f, %.0f}!\n", path, p->width, p->height); ecs_os_free(path); } diff --git a/examples/c/observers/propagate/src/main.c b/examples/c/observers/propagate/src/main.c index 95d423f94..102a376f0 100644 --- a/examples/c/observers/propagate/src/main.c +++ b/examples/c/observers/propagate/src/main.c @@ -26,8 +26,8 @@ void Observer(ecs_iter_t *it) { ecs_entity_t event_id = it->event_id; // Grab Position from self and parent - Position *p_self = ecs_field(it, Position, 1); - Position *p_parent = ecs_field(it, Position, 2); + Position *p_self = ecs_field(it, Position, 0); + Position *p_parent = ecs_field(it, Position, 1); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; diff --git a/examples/c/observers/two_components/src/main.c b/examples/c/observers/two_components/src/main.c index 214ea4c57..d28310221 100644 --- a/examples/c/observers/two_components/src/main.c +++ b/examples/c/observers/two_components/src/main.c @@ -15,8 +15,8 @@ void Observer(ecs_iter_t *it) { ecs_entity_t event = it->event; ecs_entity_t event_id = it->event_id; - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; diff --git a/examples/c/observers/yield_existing/src/main.c b/examples/c/observers/yield_existing/src/main.c index b381c8f5f..0d4135193 100644 --- a/examples/c/observers/yield_existing/src/main.c +++ b/examples/c/observers/yield_existing/src/main.c @@ -17,7 +17,7 @@ void Observer(ecs_iter_t *it) { ecs_entity_t event = it->event; ecs_entity_t event_id = it->event_id; - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; diff --git a/examples/c/prefabs/basics/src/main.c b/examples/c/prefabs/basics/src/main.c index eb9162d66..0299153ce 100644 --- a/examples/c/prefabs/basics/src/main.c +++ b/examples/c/prefabs/basics/src/main.c @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) { ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Defense *d = ecs_field(&it, Defense, 1); + Defense *d = ecs_field(&it, Defense, 0); for (int i = 0; i < it.count; i ++) { printf("%s: defense: %f\n", ecs_get_name(ecs, it.entities[i]), d[i].value); diff --git a/examples/c/prefabs/variant/src/main.c b/examples/c/prefabs/variant/src/main.c index 38ae5d718..0fb23ef71 100644 --- a/examples/c/prefabs/variant/src/main.c +++ b/examples/c/prefabs/variant/src/main.c @@ -73,10 +73,10 @@ int main(int argc, char *argv[]) { ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - ImpulseSpeed *s = ecs_field(&it, ImpulseSpeed, 2); - Defense *d = ecs_field(&it, Defense, 3); - FreightCapacity *c = ecs_field(&it, FreightCapacity, 4); + Position *p = ecs_field(&it, Position, 0); + ImpulseSpeed *s = ecs_field(&it, ImpulseSpeed, 1); + Defense *d = ecs_field(&it, Defense, 2); + FreightCapacity *c = ecs_field(&it, FreightCapacity, 3); for (int i = 0; i < it.count; i ++) { printf("%s:\n", ecs_get_name(ecs, it.entities[i])); diff --git a/examples/c/queries/basics/src/main.c b/examples/c/queries/basics/src/main.c index 506432682..47d5db48a 100644 --- a/examples/c/queries/basics/src/main.c +++ b/examples/c/queries/basics/src/main.c @@ -39,8 +39,8 @@ int main(int argc, char *argv[]) { // Outer loop, iterates archetypes while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - const Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + const Velocity *v = ecs_field(&it, Velocity, 1); // Inner loop, iterates entities in archetype for (int i = 0; i < it.count; i ++) { @@ -64,8 +64,8 @@ int main(int argc, char *argv[]) { it = ecs_query_iter(ecs, f); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - const Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + const Velocity *v = ecs_field(&it, Velocity, 1); for (int i = 0; i < it.count; i ++) { p[i].x += v[i].x; diff --git a/examples/c/queries/change_tracking/src/main.c b/examples/c/queries/change_tracking/src/main.c index 0fa6c4528..59f62ad67 100644 --- a/examples/c/queries/change_tracking/src/main.c +++ b/examples/c/queries/change_tracking/src/main.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) { // iterating the query will write to the dirty state of iterated tables. it = ecs_query_iter(world, q_write); while (ecs_query_next(&it)) { - Dirty *dirty = ecs_field(&it, Dirty, 1); + Dirty *dirty = ecs_field(&it, Dirty, 0); char *table_str = ecs_table_str(world, it.table); printf("iterate table [%s]\n", table_str); @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) { continue; } - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); // For all other tables the dirty state will be set. for (int i = 0; i < it.count; i ++) { diff --git a/examples/c/queries/group_by/src/main.c b/examples/c/queries/group_by/src/main.c index 4994e822b..236f1d9e7 100644 --- a/examples/c/queries/group_by/src/main.c +++ b/examples/c/queries/group_by/src/main.c @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { // Iterate query, print position & table components ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); char *table_str = ecs_table_str(ecs, it.table); char *group_str = ecs_get_fullpath(ecs, it.group_id); diff --git a/examples/c/queries/group_by_callbacks/src/main.c b/examples/c/queries/group_by_callbacks/src/main.c index 3f87fc1b7..0b26afd5a 100644 --- a/examples/c/queries/group_by_callbacks/src/main.c +++ b/examples/c/queries/group_by_callbacks/src/main.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { // Iterate query, print position & table components ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); char *table_str = ecs_table_str(ecs, it.table); char *group_str = ecs_get_fullpath(ecs, it.group_id); group_ctx *ctx = ecs_query_get_group_ctx(q, it.group_id); diff --git a/examples/c/queries/group_by_custom/src/main.c b/examples/c/queries/group_by_custom/src/main.c index a24a0b9dd..aa3e4a8be 100644 --- a/examples/c/queries/group_by_custom/src/main.c +++ b/examples/c/queries/group_by_custom/src/main.c @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) { // Iterate query, print position & table components ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); char *table_str = ecs_table_str(ecs, it.table); char *group_str = ecs_get_fullpath(ecs, it.group_id); diff --git a/examples/c/queries/hierarchies/src/main.c b/examples/c/queries/hierarchies/src/main.c index 20d8906d2..dd5d369b4 100644 --- a/examples/c/queries/hierarchies/src/main.c +++ b/examples/c/queries/hierarchies/src/main.c @@ -64,9 +64,9 @@ int main(int argc, char *argv[]) { // Do the transform ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - const Position *p = ecs_field(&it, Position, 1); - Position *p_out = ecs_field(&it, Position, 2); - const Position *p_parent = ecs_field(&it, Position, 3); + const Position *p = ecs_field(&it, Position, 0); + Position *p_out = ecs_field(&it, Position, 1); + const Position *p_parent = ecs_field(&it, Position, 2); // Inner loop, iterates entities in archetype for (int i = 0; i < it.count; i ++) { @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { // Print ecs positions it = ecs_each_pair_t(ecs, Position, World); while (ecs_each_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); for (int i = 0; i < it.count; i ++) { printf("%s: {%f, %f}\n", ecs_get_name(ecs, it.entities[i]), p[i].x, p[i].y); diff --git a/examples/c/queries/instancing/src/main.c b/examples/c/queries/instancing/src/main.c index 3f08f17bf..370005561 100644 --- a/examples/c/queries/instancing/src/main.c +++ b/examples/c/queries/instancing/src/main.c @@ -76,12 +76,12 @@ int main(int argc, char *argv[]) { // in the case of a shared field, it is accessed as a pointer. ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); // Check if Velocity is owned, in which case it's accessed as array. // Position will always be owned, since we set the term to Self. - if (ecs_field_is_self(&it, 2)) { // Velocity is term 2 + if (ecs_field_is_self(&it, 1)) { // Velocity is term 2 printf("Velocity is owned\n"); for (int i = 0; i < it.count; i ++) { // If Velocity is shared, access the field as an array. diff --git a/examples/c/queries/setting_variables/src/main.c b/examples/c/queries/setting_variables/src/main.c index 84b6b44f3..afe91f164 100644 --- a/examples/c/queries/setting_variables/src/main.c +++ b/examples/c/queries/setting_variables/src/main.c @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) { ecs_entity_t player = ecs_iter_get_var(&it, player_var); ecs_entity_t platoon = ecs_iter_get_var(&it, platoon_var); char *platoon_str = ecs_get_fullpath(ecs, platoon); - char *class_str = ecs_id_str(ecs, ecs_field_id(&it, 1)); + char *class_str = ecs_id_str(ecs, ecs_field_id(&it, 0)); for (int i = 0; i < it.count; i ++) { char *unit_str = ecs_get_fullpath(ecs, it.entities[i]); diff --git a/examples/c/queries/singleton/src/main.c b/examples/c/queries/singleton/src/main.c index f7996e4da..c68c256e7 100644 --- a/examples/c/queries/singleton/src/main.c +++ b/examples/c/queries/singleton/src/main.c @@ -49,8 +49,8 @@ int main(int argc, char *argv[]) { ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Velocity *v = ecs_field(&it, Velocity, 1); - Gravity *g = ecs_field(&it, Gravity, 2); + Velocity *v = ecs_field(&it, Velocity, 0); + Gravity *g = ecs_field(&it, Gravity, 1); for (int i = 0; i < it.count; i ++) { // Make sure to access g as a pointer, as we only have a single diff --git a/examples/c/queries/sorting/src/main.c b/examples/c/queries/sorting/src/main.c index 1be6c0aae..bfefaa48b 100644 --- a/examples/c/queries/sorting/src/main.c +++ b/examples/c/queries/sorting/src/main.c @@ -18,7 +18,7 @@ int compare_position( } void print_position(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { printf("{%.1f, %.1f}\n", p[i].x, p[i].y); } diff --git a/examples/c/queries/wildcards/src/main.c b/examples/c/queries/wildcards/src/main.c index fe13cfe0d..858ea1e66 100644 --- a/examples/c/queries/wildcards/src/main.c +++ b/examples/c/queries/wildcards/src/main.c @@ -31,8 +31,8 @@ int main(int argc, char *argv[]) { // Iterate the query ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - Eats *eats = ecs_field(&it, Eats, 1); - ecs_id_t pair = ecs_field_id(&it, 1); + Eats *eats = ecs_field(&it, Eats, 0); + ecs_id_t pair = ecs_field_id(&it, 0); ecs_entity_t food = ecs_pair_second(ecs, pair); for (int i = 0; i < it.count; i ++) { diff --git a/examples/c/reflection/world_ser_deser/src/main.c b/examples/c/reflection/world_ser_deser/src/main.c index bbb79c9cf..74543c852 100644 --- a/examples/c/reflection/world_ser_deser/src/main.c +++ b/examples/c/reflection/world_ser_deser/src/main.c @@ -9,8 +9,8 @@ ECS_COMPONENT_DECLARE(Position); ECS_COMPONENT_DECLARE(Velocity); void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - const Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + const Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/examples/c/relationships/relation_component/src/main.c b/examples/c/relationships/relation_component/src/main.c index ec3357675..5c8d4c7e4 100644 --- a/examples/c/relationships/relation_component/src/main.c +++ b/examples/c/relationships/relation_component/src/main.c @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) { // When iterating, always use the pair type: ecs_iter_t it = ecs_query_iter(ecs, q); while (ecs_query_next(&it)) { - r = ecs_field(&it, Requires, 1); + r = ecs_field(&it, Requires, 0); for (int i = 0; i < it.count; i ++) { printf("requires %.2f gigawatts\n", r[i].amount); } diff --git a/examples/c/relationships/union/src/main.c b/examples/c/relationships/union/src/main.c index 9d9c9e1fc..ff976d1bc 100644 --- a/examples/c/relationships/union/src/main.c +++ b/examples/c/relationships/union/src/main.c @@ -57,8 +57,8 @@ int main(int argc, char *argv[]) { // Iterate query as usual ecs_iter_t it = ecs_query_iter(world, q); while (ecs_iter_next(&it)) { - ecs_entity_t *movement = ecs_field(&it, ecs_entity_t, 1); - ecs_entity_t *direction = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *movement = ecs_field(&it, ecs_entity_t, 0); + ecs_entity_t *direction = ecs_field(&it, ecs_entity_t, 1); for (int i = 0; i < it.count; i ++) { printf("%s: Movement: %s, Direction: %s\n", diff --git a/examples/c/systems/basics/src/main.c b/examples/c/systems/basics/src/main.c index 14824ac17..09a512c4b 100644 --- a/examples/c/systems/basics/src/main.c +++ b/examples/c/systems/basics/src/main.c @@ -6,8 +6,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - const Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + const Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/examples/c/systems/custom_runner/src/main.c b/examples/c/systems/custom_runner/src/main.c index 5a2adc4e7..e5ed73c88 100644 --- a/examples/c/systems/custom_runner/src/main.c +++ b/examples/c/systems/custom_runner/src/main.c @@ -19,8 +19,8 @@ void Move(ecs_iter_t *it) { // Note that this code looks the same as iterating a query. while (ecs_query_next(it)) { // Inside the loop the code looks the same as for a regular system - Position *p = ecs_field(it, Position, 1); - const Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + const Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/examples/c/systems/mutate_entity/src/main.c b/examples/c/systems/mutate_entity/src/main.c index e3e8e154f..119128de6 100644 --- a/examples/c/systems/mutate_entity/src/main.c +++ b/examples/c/systems/mutate_entity/src/main.c @@ -7,7 +7,7 @@ typedef struct { // System that deletes an entity after a timeout expires void Expire(ecs_iter_t *it) { - Timeout *t = ecs_field(it, Timeout, 1); + Timeout *t = ecs_field(it, Timeout, 0); for (int i = 0; i < it->count; i ++) { t[i].value -= (double)it->delta_time; @@ -31,7 +31,7 @@ void Expire(ecs_iter_t *it) { // System that prints remaining expiry time void PrintExpire(ecs_iter_t *it) { - Timeout *t = ecs_field(it, Timeout, 1); + Timeout *t = ecs_field(it, Timeout, 0); for (int i = 0; i < it->count; i ++) { printf("PrintExpire: %s has %.2f seconds left\n", ecs_get_name( diff --git a/examples/c/systems/pipeline/src/main.c b/examples/c/systems/pipeline/src/main.c index 70092c789..9a88f4836 100644 --- a/examples/c/systems/pipeline/src/main.c +++ b/examples/c/systems/pipeline/src/main.c @@ -6,7 +6,7 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); const Velocity *v = ecs_field(it, const Velocity, 2); for (int i = 0; i < it->count; i ++) { diff --git a/examples/c/systems/sync_point/src/main.c b/examples/c/systems/sync_point/src/main.c index 907268113..c836055a6 100644 --- a/examples/c/systems/sync_point/src/main.c +++ b/examples/c/systems/sync_point/src/main.c @@ -16,7 +16,7 @@ void SetVelocity(ecs_iter_t *it) { } void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); const Velocity *v = ecs_field(it, const Velocity, 2); for (int i = 0; i < it->count; i ++) { diff --git a/examples/c/systems/sync_point_delete/src/main.c b/examples/c/systems/sync_point_delete/src/main.c index e26d76afb..f4d785ca7 100644 --- a/examples/c/systems/sync_point_delete/src/main.c +++ b/examples/c/systems/sync_point_delete/src/main.c @@ -6,7 +6,7 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); const Velocity *v = ecs_field(it, const Velocity, 2); for (int i = 0; i < it->count; i ++) { @@ -16,7 +16,7 @@ void Move(ecs_iter_t *it) { } void DeleteEntity(ecs_iter_t *it) { - const Position *p = ecs_field(it, Position, 1); + const Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { if (p[i].x >= 3) { diff --git a/examples/c/systems/system_ctx/src/main.c b/examples/c/systems/system_ctx/src/main.c index fb3777ddf..dbe22145d 100644 --- a/examples/c/systems/system_ctx/src/main.c +++ b/examples/c/systems/system_ctx/src/main.c @@ -26,8 +26,8 @@ double distance_sqr(const Position *p1, const Position *p2) { void Collide(ecs_iter_t *it) { ecs_query_t *q_collide = it->ctx; // Get query from system context - const Position *p1 = ecs_field(it, Position, 1); - const Radius *r1 = ecs_field(it, Radius, 2); + const Position *p1 = ecs_field(it, Position, 0); + const Radius *r1 = ecs_field(it, Radius, 1); for (int i = 0; i < it->count; i ++) { ecs_entity_t e1 = it->entities[i]; @@ -35,8 +35,8 @@ void Collide(ecs_iter_t *it) { // For each matching entity, iterate the query ecs_iter_t qit = ecs_query_iter(it->world, q_collide); while (ecs_query_next(&qit)) { - const Position *p2 = ecs_field(&qit, Position, 1); - const Radius *r2 = ecs_field(&qit, Radius, 2); + const Position *p2 = ecs_field(&qit, Position, 0); + const Radius *r2 = ecs_field(&qit, Radius, 1); for (int j = 0; j < qit.count; j ++) { ecs_entity_t e2 = qit.entities[j]; if (e1 == e2) { diff --git a/examples/cpp/queries/instancing/src/main.cpp b/examples/cpp/queries/instancing/src/main.cpp index a153d495a..163c33cb0 100644 --- a/examples/cpp/queries/instancing/src/main.cpp +++ b/examples/cpp/queries/instancing/src/main.cpp @@ -75,7 +75,7 @@ int main(int, char *[]) { // Check if Velocity is owned, in which case it's accessed as array. // Position will always be owned, since we set the term to Self. - if (it.is_self(2)) { // Velocity is term 2 + if (it.is_self(1)) { // Velocity is term 2 std::cout << "Velocity is owned\n"; for (auto i : it) { p[i].x += v[i].x; diff --git a/examples/cpp/queries/setting_variables/src/main.cpp b/examples/cpp/queries/setting_variables/src/main.cpp index 3ec142d38..b019803fa 100644 --- a/examples/cpp/queries/setting_variables/src/main.cpp +++ b/examples/cpp/queries/setting_variables/src/main.cpp @@ -88,7 +88,7 @@ int main(int, char *[]) { .each([&](flecs::iter& it, size_t index, RangedUnit) { flecs::entity unit = it.entity(index); std::cout << "Unit " << unit.path() << " of class " - << it.id(1).str() << " in platoon " + << it.id(0).str() << " in platoon " << it.get_var(platoon_var).path() << " for player " << it.get_var(player_var).path() << "\n"; }); diff --git a/examples/cpp/queries/wildcards/src/main.cpp b/examples/cpp/queries/wildcards/src/main.cpp index 7a767980f..2d1543dbd 100644 --- a/examples/cpp/queries/wildcards/src/main.cpp +++ b/examples/cpp/queries/wildcards/src/main.cpp @@ -31,7 +31,7 @@ int main(int, char *[]) { // the pair that we are currently matched with. q.each([](flecs::iter& it, size_t index, Eats& eats) { flecs::entity e = it.entity(index); - flecs::entity food = it.pair(1).second(); + flecs::entity food = it.pair(0).second(); std::cout << e.name() << " eats " << eats.amount << " " << food.name() << std::endl; diff --git a/examples/cpp/relationships/enum_relations/src/main.cpp b/examples/cpp/relationships/enum_relations/src/main.cpp index 80eb2c795..97073eeb7 100644 --- a/examples/cpp/relationships/enum_relations/src/main.cpp +++ b/examples/cpp/relationships/enum_relations/src/main.cpp @@ -62,7 +62,7 @@ int main(int, char *[]) { .with(flecs::Wildcard) .build() .each([&](flecs::iter& it, size_t) { - flecs::entity tile_constant = it.pair(1).second(); + flecs::entity tile_constant = it.pair(0).second(); printf("%s\n", tile_constant.path().c_str()); }); @@ -77,7 +77,7 @@ int main(int, char *[]) { .with(TileStatus::Occupied) .build() .each([&](flecs::iter& it, size_t) { - flecs::entity tile_constant = it.pair(1).second(); + flecs::entity tile_constant = it.pair(0).second(); printf("%s\n", tile_constant.path().c_str()); }); diff --git a/examples/cpp/relationships/union/src/main.cpp b/examples/cpp/relationships/union/src/main.cpp index 3dfc0fe6f..d37692dc7 100644 --- a/examples/cpp/relationships/union/src/main.cpp +++ b/examples/cpp/relationships/union/src/main.cpp @@ -64,8 +64,8 @@ int main(int argc, char *argv[]) { q.iter([&](const flecs::iter& it) { // Get the column with direction states. This is stored as an array // with identifiers to the individual states - auto movement = it.field(1); - auto direction = it.field(2); + auto movement = it.field(0); + auto direction = it.field(1); for (auto i : it) { // Movement will always be Walking, Direction can be any state diff --git a/flecs.c b/flecs.c index 6aa418b8d..2c3e9a031 100644 --- a/flecs.c +++ b/flecs.c @@ -3057,7 +3057,7 @@ static ECS_MOVE(EcsIdentifier, dst, src, { static void ecs_on_set(EcsIdentifier)(ecs_iter_t *it) { - EcsIdentifier *ptr = ecs_field(it, EcsIdentifier, 1); + EcsIdentifier *ptr = ecs_field(it, EcsIdentifier, 0); ecs_world_t *world = it->real_world; ecs_entity_t evt = it->event; @@ -3284,7 +3284,7 @@ void flecs_register_final(ecs_iter_t *it) { static void flecs_register_on_delete(ecs_iter_t *it) { - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); flecs_register_id_flag_for_relation(it, EcsOnDelete, ECS_ID_ON_DELETE_FLAG(ECS_PAIR_SECOND(id)), EcsIdOnDeleteMask, @@ -3293,7 +3293,7 @@ void flecs_register_on_delete(ecs_iter_t *it) { static void flecs_register_on_delete_object(ecs_iter_t *it) { - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); flecs_register_id_flag_for_relation(it, EcsOnDeleteTarget, ECS_ID_ON_DELETE_TARGET_FLAG(ECS_PAIR_SECOND(id)), EcsIdOnDeleteObjectMask, @@ -3361,7 +3361,7 @@ void flecs_register_with(ecs_iter_t *it) { static void flecs_on_symmetric_add_remove(ecs_iter_t *it) { - ecs_entity_t pair = ecs_field_id(it, 1); + ecs_entity_t pair = ecs_field_id(it, 0); if (!ECS_HAS_ID_FLAG(pair, PAIR)) { /* If relationship was not added as a pair, there's nothing to do */ @@ -3411,7 +3411,7 @@ void flecs_register_symmetric(ecs_iter_t *it) { static void flecs_on_component(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsComponent *c = ecs_field(it, EcsComponent, 1); + EcsComponent *c = ecs_field(it, EcsComponent, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -9113,7 +9113,7 @@ ecs_entity_t flecs_get_parent_from_path( static void flecs_on_set_symbol(ecs_iter_t *it) { - EcsIdentifier *n = ecs_field(it, EcsIdentifier, 1); + EcsIdentifier *n = ecs_field(it, EcsIdentifier, 0); ecs_world_t *world = it->world; int i; @@ -9868,14 +9868,14 @@ void* ecs_field_w_size( int32_t index) { ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); ecs_check(!size || ecs_field_size(it, index) == size || - (!ecs_field_size(it, index) && (!it->ptrs[index - 1])), + (!ecs_field_size(it, index) && (!it->ptrs[index])), ECS_INVALID_PARAMETER, NULL); (void)size; - return it->ptrs[index - 1]; + return it->ptrs[index]; error: return NULL; } @@ -9887,8 +9887,9 @@ bool ecs_field_is_readonly( ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query != NULL, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query->terms != NULL, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - const ecs_term_t *term = &it->query->terms[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + const ecs_term_t *term = &it->query->terms[index]; if (term->inout == EcsIn) { return true; @@ -9913,8 +9914,10 @@ bool ecs_field_is_writeonly( ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query != NULL, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query->terms != NULL, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - const ecs_term_t *term = &it->query->terms[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + const ecs_term_t *term = &it->query->terms[index]; return term->inout == EcsOut; error: return false; @@ -9925,9 +9928,10 @@ bool ecs_field_is_set( int32_t index) { ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); - ecs_check(index >= 1, ECS_INVALID_PARAMETER, NULL); - ecs_check(index <= it->field_count, ECS_INVALID_PARAMETER, NULL); - return it->set_fields & (1llu << (index - 1)); + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->set_fields & (1llu << (index)); error: return false; } @@ -9936,44 +9940,64 @@ bool ecs_field_is_self( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->sources == NULL || it->sources[index - 1] == 0; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->sources == NULL || it->sources[index] == 0; +error: + return false; } ecs_id_t ecs_field_id( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->ids[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->ids[index]; +error: + return 0; } -int32_t ecs_field_column_index( +int32_t ecs_field_column( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->columns[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->columns[index]; +error: + return 0; } ecs_entity_t ecs_field_src( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + if (it->sources) { - return it->sources[index - 1]; + return it->sources[index]; } else { return 0; } +error: + return 0; } size_t ecs_field_size( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return (size_t)it->sizes[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return (size_t)it->sizes[index]; +error: + return 0; } char* ecs_iter_str( @@ -9990,7 +10014,7 @@ char* ecs_iter_str( if (it->field_count) { ecs_strbuf_list_push(&buf, "id: ", ","); for (i = 0; i < it->field_count; i ++) { - ecs_id_t id = ecs_field_id(it, i + 1); + ecs_id_t id = ecs_field_id(it, i); char *str = ecs_id_str(world, id); ecs_strbuf_list_appendstr(&buf, str); ecs_os_free(str); @@ -9999,7 +10023,7 @@ char* ecs_iter_str( ecs_strbuf_list_push(&buf, "src: ", ","); for (i = 0; i < it->field_count; i ++) { - ecs_entity_t subj = ecs_field_src(it, i + 1); + ecs_entity_t subj = ecs_field_src(it, i); char *str = ecs_get_fullpath(world, subj); ecs_strbuf_list_appendstr(&buf, str); ecs_os_free(str); @@ -10008,7 +10032,7 @@ char* ecs_iter_str( ecs_strbuf_list_push(&buf, "set: ", ","); for (i = 0; i < it->field_count; i ++) { - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { ecs_strbuf_list_appendlit(&buf, "true"); } else { ecs_strbuf_list_appendlit(&buf, "false"); @@ -18214,8 +18238,8 @@ ecs_entity_t flecs_alert_out_of_range_kind( static void MonitorAlerts(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsAlert *alert = ecs_field(it, EcsAlert, 1); - EcsPoly *poly = ecs_field(it, EcsPoly, 2); + EcsAlert *alert = ecs_field(it, EcsAlert, 0); + EcsPoly *poly = ecs_field(it, EcsPoly, 1); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -18325,10 +18349,10 @@ void MonitorAlerts(ecs_iter_t *it) { static void MonitorAlertInstances(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsAlertInstance *alert_instance = ecs_field(it, EcsAlertInstance, 1); - EcsMetricSource *source = ecs_field(it, EcsMetricSource, 2); - EcsMetricValue *value = ecs_field(it, EcsMetricValue, 3); - EcsAlertTimeout *timeout = ecs_field(it, EcsAlertTimeout, 4); + EcsAlertInstance *alert_instance = ecs_field(it, EcsAlertInstance, 0); + EcsMetricSource *source = ecs_field(it, EcsMetricSource, 1); + EcsMetricValue *value = ecs_field(it, EcsMetricValue, 2); + EcsAlertTimeout *timeout = ecs_field(it, EcsAlertTimeout, 3); /* Get alert component from alert instance parent (the alert) */ ecs_id_t childof_pair; @@ -23107,7 +23131,7 @@ static ECS_MOVE(EcsMetricCountTargets, dst, src, { static void flecs_metrics_on_member_metric(ecs_iter_t *it) { ecs_world_t *world = it->world; ecs_member_metric_ctx_t *ctx = it->ctx; - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -23176,7 +23200,7 @@ static void flecs_metrics_on_oneof_metric(ecs_iter_t *it) { #ifdef FLECS_DOC static void SetMetricDocName(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetricSource *src = ecs_field(it, EcsMetricSource, 1); + EcsMetricSource *src = ecs_field(it, EcsMetricSource, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -23192,7 +23216,7 @@ static void SetMetricDocName(ecs_iter_t *it) { /** Delete metric instances for entities that are no longer alive */ static void ClearMetricInstance(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetricSource *src = ecs_field(it, EcsMetricSource, 1); + EcsMetricSource *src = ecs_field(it, EcsMetricSource, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -23206,8 +23230,8 @@ static void ClearMetricInstance(ecs_iter_t *it) { /** Update member metric */ static void UpdateMemberInstance(ecs_iter_t *it, bool counter) { ecs_world_t *world = it->real_world; - EcsMetricValue *m = ecs_field(it, EcsMetricValue, 1); - EcsMetricMemberInstance *mi = ecs_field(it, EcsMetricMemberInstance, 2); + EcsMetricValue *m = ecs_field(it, EcsMetricValue, 0); + EcsMetricMemberInstance *mi = ecs_field(it, EcsMetricMemberInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -23248,8 +23272,8 @@ static void UpdateCounterIncrementMemberInstance(ecs_iter_t *it) { /** Update id metric */ static void UpdateIdInstance(ecs_iter_t *it, bool counter) { ecs_world_t *world = it->real_world; - EcsMetricValue *m = ecs_field(it, EcsMetricValue, 1); - EcsMetricIdInstance *mi = ecs_field(it, EcsMetricIdInstance, 2); + EcsMetricValue *m = ecs_field(it, EcsMetricValue, 0); + EcsMetricIdInstance *mi = ecs_field(it, EcsMetricIdInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -23293,7 +23317,7 @@ static void UpdateOneOfInstance(ecs_iter_t *it, bool counter) { ecs_table_t *table = it->table; void *m = ecs_table_get_column(table, ecs_table_type_to_column_index(table, it->columns[0]), it->offset); - EcsMetricOneOfInstance *mi = ecs_field(it, EcsMetricOneOfInstance, 2); + EcsMetricOneOfInstance *mi = ecs_field(it, EcsMetricOneOfInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -23350,7 +23374,7 @@ static void UpdateCounterOneOfInstance(ecs_iter_t *it) { static void UpdateCountTargets(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsMetricCountTargets *m = ecs_field(it, EcsMetricCountTargets, 1); + EcsMetricCountTargets *m = ecs_field(it, EcsMetricCountTargets, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -23381,8 +23405,8 @@ static void UpdateCountTargets(ecs_iter_t *it) { static void UpdateCountIds(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsMetricCountIds *m = ecs_field(it, EcsMetricCountIds, 1); - EcsMetricValue *v = ecs_field(it, EcsMetricValue, 2); + EcsMetricCountIds *m = ecs_field(it, EcsMetricCountIds, 0); + EcsMetricValue *v = ecs_field(it, EcsMetricValue, 1); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -24195,7 +24219,7 @@ ECS_DTOR(EcsPipelineStats, ptr, { static void UpdateWorldSummary(ecs_iter_t *it) { - EcsWorldSummary *summary = ecs_field(it, EcsWorldSummary, 1); + EcsWorldSummary *summary = ecs_field(it, EcsWorldSummary, 0); const ecs_world_info_t *info = ecs_get_world_info(it->world); @@ -24232,8 +24256,8 @@ static void MonitorStats(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsStatsHeader *hdr = ecs_field_w_size(it, 0, 1); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + EcsStatsHeader *hdr = ecs_field_w_size(it, 0, 0); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); void *stats = ECS_OFFSET_T(hdr, EcsStatsHeader); ecs_ftime_t elapsed = hdr->elapsed; @@ -24291,10 +24315,10 @@ void MonitorStats(ecs_iter_t *it) { static void ReduceStats(ecs_iter_t *it) { - void *dst = ecs_field_w_size(it, 0, 1); - void *src = ecs_field_w_size(it, 0, 2); + void *dst = ecs_field_w_size(it, 0, 0); + void *src = ecs_field_w_size(it, 0, 1); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); dst = ECS_OFFSET_T(dst, EcsStatsHeader); src = ECS_OFFSET_T(src, EcsStatsHeader); @@ -24310,13 +24334,13 @@ static void AggregateStats(ecs_iter_t *it) { int32_t interval = *(int32_t*)it->ctx; - EcsStatsHeader *dst_hdr = ecs_field_w_size(it, 0, 1); - EcsStatsHeader *src_hdr = ecs_field_w_size(it, 0, 2); + EcsStatsHeader *dst_hdr = ecs_field_w_size(it, 0, 0); + EcsStatsHeader *src_hdr = ecs_field_w_size(it, 0, 1); void *dst = ECS_OFFSET_T(dst_hdr, EcsStatsHeader); void *src = ECS_OFFSET_T(src_hdr, EcsStatsHeader); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); ecs_world_stats_t last_world = {0}; ecs_pipeline_stats_t last_pipeline = {0}; @@ -24721,7 +24745,7 @@ void flecs_assembly_on_set( } ecs_world_t *world = it->world; - ecs_entity_t assembly = ecs_field_id(it, 1); + ecs_entity_t assembly = ecs_field_id(it, 0); const char *name = ecs_get_name(world, assembly); ecs_record_t *r = ecs_record_find(world, assembly); @@ -24744,7 +24768,7 @@ void flecs_assembly_on_set( return; } - void *data = ecs_field_w_size(it, flecs_ito(size_t, ct->size), 1); + void *data = ecs_field_w_size(it, flecs_ito(size_t, ct->size), 0); int32_t i, m; for (i = 0; i < it->count; i ++) { @@ -28115,7 +28139,7 @@ void flecs_on_set_rest(ecs_iter_t *it) { static void DequeueRest(ecs_iter_t *it) { - EcsRest *rest = ecs_field(it, EcsRest, 1); + EcsRest *rest = ecs_field(it, EcsRest, 0); if (it->delta_system_time > (ecs_ftime_t)1.0) { ecs_warn( @@ -28142,7 +28166,7 @@ void DisableRest(ecs_iter_t *it) { if (it->event == EcsOnAdd) { /* REST module was disabled */ while (ecs_each_next(&rit)) { - EcsRest *rest = ecs_field(&rit, EcsRest, 1); + EcsRest *rest = ecs_field(&rit, EcsRest, 0); int i; for (i = 0; i < rit.count; i ++) { ecs_rest_ctx_t *ctx = rest[i].impl; @@ -28152,7 +28176,7 @@ void DisableRest(ecs_iter_t *it) { } else if (it->event == EcsOnRemove) { /* REST module was enabled */ while (ecs_each_next(&rit)) { - EcsRest *rest = ecs_field(&rit, EcsRest, 1); + EcsRest *rest = ecs_field(&rit, EcsRest, 0); int i; for (i = 0; i < rit.count; i ++) { ecs_rest_ctx_t *ctx = rest[i].impl; @@ -29210,8 +29234,8 @@ void AddTickSource(ecs_iter_t *it) { static void ProgressTimers(ecs_iter_t *it) { - EcsTimer *timer = ecs_field(it, EcsTimer, 1); - EcsTickSource *tick_source = ecs_field(it, EcsTickSource, 2); + EcsTimer *timer = ecs_field(it, EcsTimer, 0); + EcsTickSource *tick_source = ecs_field(it, EcsTickSource, 1); ecs_assert(timer != NULL, ECS_INTERNAL_ERROR, NULL); @@ -29249,8 +29273,8 @@ void ProgressTimers(ecs_iter_t *it) { static void ProgressRateFilters(ecs_iter_t *it) { - EcsRateFilter *filter = ecs_field(it, EcsRateFilter, 1); - EcsTickSource *tick_dst = ecs_field(it, EcsTickSource, 2); + EcsRateFilter *filter = ecs_field(it, EcsRateFilter, 0); + EcsTickSource *tick_dst = ecs_field(it, EcsTickSource, 1); int i; for (i = 0; i < it->count; i ++) { @@ -29288,7 +29312,7 @@ void ProgressRateFilters(ecs_iter_t *it) { static void ProgressTickSource(ecs_iter_t *it) { - EcsTickSource *tick_src = ecs_field(it, EcsTickSource, 1); + EcsTickSource *tick_src = ecs_field(it, EcsTickSource, 0); /* If tick source has no filters, tick unconditionally */ int i; @@ -29453,7 +29477,7 @@ void ecs_set_tick_source( static void RandomizeTimers(ecs_iter_t *it) { - EcsTimer *timer = ecs_field(it, EcsTimer, 1); + EcsTimer *timer = ecs_field(it, EcsTimer, 0); int32_t i; for (i = 0; i < it->count; i ++) { timer[i].time = @@ -34947,7 +34971,7 @@ void flecs_query_cache_set_table_match( /* Initialize storage columns for faster access to component storage */ for (i = 0; i < field_count; i ++) { int32_t column = it->columns[i]; - if (!ecs_field_is_set(it, i + 1) || terms[i].inout == EcsInOutNone) { + if (!ecs_field_is_set(it, i) || terms[i].inout == EcsInOutNone) { qm->storage_columns[i] = -1; continue; } @@ -35935,7 +35959,7 @@ void flecs_query_populate_ptrs_w_shared( } ecs_size_t size = it->sizes[field_index]; - if (!ecs_field_is_set(it, i + 1) || !size) { + if (!ecs_field_is_set(it, i) || !size) { /* Tag / no data */ it->ptrs[field_index] = NULL; continue; @@ -42909,7 +42933,7 @@ bool flecs_query_if_set( ecs_query_ctrl_ctx_t *op_ctx = flecs_op_ctx(ctx, ctrl); if (!redo) { - op_ctx->is_set = ecs_field_is_set(it, field_index + 1); + op_ctx->is_set = ecs_field_is_set(it, field_index); } if (!op_ctx->is_set) { @@ -42958,7 +42982,7 @@ void flecs_query_populate_field( { int32_t index = it->columns[field_index]; ecs_assert(index >= 0, ECS_INTERNAL_ERROR, NULL); - ecs_assert(ecs_field_is_set(it, field_index + 1), ECS_INTERNAL_ERROR, NULL); + ecs_assert(ecs_field_is_set(it, field_index), ECS_INTERNAL_ERROR, NULL); ecs_entity_t src = it->sources[field_index]; if (!src) { @@ -58887,9 +58911,9 @@ void flecs_json_serialize_query_profile( int32_t f, field_count = qit.field_count; for (f = 0; f < field_count; f ++) { - size_t size = ecs_field_size(&qit, f + 1); - if (ecs_field_is_set(&qit, f + 1) && size) { - if (ecs_field_is_self(&qit, f + 1)) { + size_t size = ecs_field_size(&qit, f); + if (ecs_field_is_set(&qit, f) && size) { + if (ecs_field_is_self(&qit, f)) { component_bytes += flecs_uto(ecs_size_t, size) * qit.count; } else { @@ -58985,7 +59009,7 @@ void flecs_json_serialize_iter_result_ids( for (int i = 0; i < it->field_count; i ++) { flecs_json_next(buf); - flecs_json_serialize_id(world, ecs_field_id(it, i + 1), buf); + flecs_json_serialize_id(world, ecs_field_id(it, i), buf); } flecs_json_array_pop(buf); @@ -59002,7 +59026,7 @@ void flecs_json_serialize_iter_result_id_labels( for (int i = 0; i < it->field_count; i ++) { flecs_json_next(buf); - flecs_json_serialize_id_label(world, ecs_field_id(it, i + 1), buf); + flecs_json_serialize_id_label(world, ecs_field_id(it, i), buf); } flecs_json_array_pop(buf); @@ -59100,7 +59124,7 @@ bool flecs_json_serialize_iter_result_is_set( for (int i = 0; i < it->field_count; i ++) { ecs_strbuf_list_next(buf); - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { flecs_json_true(buf); } else { flecs_json_false(buf); @@ -59405,13 +59429,13 @@ int flecs_json_serialize_iter_result_values( if (!ptr) { /* No data in column. Append 0 if this is not an optional term */ - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { ecs_strbuf_appendch(buf, '0'); continue; } } - if (ecs_field_is_writeonly(it, i + 1)) { + if (ecs_field_is_writeonly(it, i)) { ecs_strbuf_appendch(buf, '0'); continue; } @@ -59442,13 +59466,13 @@ int flecs_json_serialize_iter_result_values( /* If term is not set, append empty array. This indicates that the term * could have had data but doesn't */ - if (!ecs_field_is_set(it, i + 1)) { + if (!ecs_field_is_set(it, i)) { flecs_json_array_push(buf); flecs_json_array_pop(buf); continue; } - if (ecs_field_is_self(it, i + 1)) { + if (ecs_field_is_self(it, i)) { int32_t count = it->count; if (array_to_json_buf_w_type_data(world, ptr, count, buf, comp, ser)) { return -1; @@ -59924,7 +59948,7 @@ bool flecs_json_serialize_row_tags( int32_t tag_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -59966,7 +59990,7 @@ bool flecs_json_serialize_row_pairs( int32_t pair_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -60260,7 +60284,7 @@ int flecs_json_serialize_row_components( int32_t f, field_count = it->field_count, component_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -60269,7 +60293,7 @@ int flecs_json_serialize_row_components( continue; } - if (ecs_field_is_self(it, f + 1)) { + if (ecs_field_is_self(it, f)) { ptr = ECS_ELEM(ptr, it->sizes[f], row); } @@ -64672,7 +64696,7 @@ int flecs_add_constant_to_bitmask( static void flecs_set_primitive(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsPrimitive *type = ecs_field(it, EcsPrimitive, 1); + EcsPrimitive *type = ecs_field(it, EcsPrimitive, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -64739,7 +64763,7 @@ void flecs_set_primitive(ecs_iter_t *it) { static void flecs_set_member(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMember *member = ecs_field(it, EcsMember, 1); + EcsMember *member = ecs_field(it, EcsMember, 0); EcsMemberRanges *ranges = ecs_table_get_id(world, it->table, ecs_id(EcsMemberRanges), it->offset); @@ -64760,7 +64784,7 @@ void flecs_set_member(ecs_iter_t *it) { static void flecs_set_member_ranges(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMemberRanges *ranges = ecs_field(it, EcsMemberRanges, 1); + EcsMemberRanges *ranges = ecs_field(it, EcsMemberRanges, 0); EcsMember *member = ecs_table_get_id(world, it->table, ecs_id(EcsMember), it->offset); if (!member) { @@ -64837,7 +64861,7 @@ void flecs_add_constant(ecs_iter_t *it) { static void flecs_set_array(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsArray *array = ecs_field(it, EcsArray, 1); + EcsArray *array = ecs_field(it, EcsArray, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -64867,7 +64891,7 @@ void flecs_set_array(ecs_iter_t *it) { static void flecs_set_vector(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsVector *array = ecs_field(it, EcsVector, 1); + EcsVector *array = ecs_field(it, EcsVector, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -64888,7 +64912,7 @@ void flecs_set_vector(ecs_iter_t *it) { static void flecs_set_custom_type(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsOpaque *serialize = ecs_field(it, EcsOpaque, 1); + EcsOpaque *serialize = ecs_field(it, EcsOpaque, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -65037,7 +65061,7 @@ bool flecs_unit_validate( static void flecs_set_unit(ecs_iter_t *it) { - EcsUnit *u = ecs_field(it, EcsUnit, 1); + EcsUnit *u = ecs_field(it, EcsUnit, 0); ecs_world_t *world = it->world; @@ -65069,7 +65093,7 @@ void flecs_unit_quantity_monitor(ecs_iter_t *it) { static void ecs_meta_type_init_default_ctor(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetaType *type = ecs_field(it, EcsMetaType, 1); + EcsMetaType *type = ecs_field(it, EcsMetaType, 0); int i; for (i = 0; i < it->count; i ++) { diff --git a/flecs.h b/flecs.h index 5e098e15e..9bd590acf 100644 --- a/flecs.h +++ b/flecs.h @@ -7640,7 +7640,7 @@ ecs_id_t ecs_field_id( * @return The index of the matched column, -1 if not matched. */ FLECS_API -int32_t ecs_field_column_index( +int32_t ecs_field_column( const ecs_iter_t *it, int32_t index); @@ -20960,7 +20960,7 @@ struct iter { * @param index The field index. */ int32_t column_index(int32_t index) const { - return ecs_field_column_index(m_iter, index); + return ecs_field_column(m_iter, index); } /** Convert current iterator result to string. @@ -24442,7 +24442,7 @@ struct entity_observer_delegate : delegate { static void invoke(ecs_iter_t *iter) { auto self = static_cast(iter->binding_ctx); ecs_assert(self != nullptr, ECS_INTERNAL_ERROR, NULL); - self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 1))); + self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 0))); } template ::value == 0> = 0> @@ -24487,7 +24487,7 @@ struct entity_payload_observer_delegate : delegate { "entity observer invoked without payload"); Event *data = static_cast(iter->param); - self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 1)), *data); + self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 0)), *data); } Func m_func; diff --git a/include/flecs.h b/include/flecs.h index 2e8e09e1e..fbe099c8e 100644 --- a/include/flecs.h +++ b/include/flecs.h @@ -4733,7 +4733,7 @@ ecs_id_t ecs_field_id( * @return The index of the matched column, -1 if not matched. */ FLECS_API -int32_t ecs_field_column_index( +int32_t ecs_field_column( const ecs_iter_t *it, int32_t index); diff --git a/include/flecs/addons/cpp/delegate.hpp b/include/flecs/addons/cpp/delegate.hpp index dc228dd44..4e54e0e3f 100644 --- a/include/flecs/addons/cpp/delegate.hpp +++ b/include/flecs/addons/cpp/delegate.hpp @@ -602,7 +602,7 @@ struct entity_observer_delegate : delegate { static void invoke(ecs_iter_t *iter) { auto self = static_cast(iter->binding_ctx); ecs_assert(self != nullptr, ECS_INTERNAL_ERROR, NULL); - self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 1))); + self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 0))); } template ::value == 0> = 0> @@ -647,7 +647,7 @@ struct entity_payload_observer_delegate : delegate { "entity observer invoked without payload"); Event *data = static_cast(iter->param); - self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 1)), *data); + self->m_func(flecs::entity(iter->world, ecs_field_src(iter, 0)), *data); } Func m_func; diff --git a/include/flecs/addons/cpp/iter.hpp b/include/flecs/addons/cpp/iter.hpp index e97a33b11..14b379e3f 100644 --- a/include/flecs/addons/cpp/iter.hpp +++ b/include/flecs/addons/cpp/iter.hpp @@ -217,7 +217,7 @@ struct iter { * @param index The field index. */ int32_t column_index(int32_t index) const { - return ecs_field_column_index(m_iter, index); + return ecs_field_column(m_iter, index); } /** Convert current iterator result to string. diff --git a/src/addons/alerts.c b/src/addons/alerts.c index f2cf45d9c..e2cd937fe 100644 --- a/src/addons/alerts.c +++ b/src/addons/alerts.c @@ -239,8 +239,8 @@ ecs_entity_t flecs_alert_out_of_range_kind( static void MonitorAlerts(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsAlert *alert = ecs_field(it, EcsAlert, 1); - EcsPoly *poly = ecs_field(it, EcsPoly, 2); + EcsAlert *alert = ecs_field(it, EcsAlert, 0); + EcsPoly *poly = ecs_field(it, EcsPoly, 1); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -350,10 +350,10 @@ void MonitorAlerts(ecs_iter_t *it) { static void MonitorAlertInstances(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsAlertInstance *alert_instance = ecs_field(it, EcsAlertInstance, 1); - EcsMetricSource *source = ecs_field(it, EcsMetricSource, 2); - EcsMetricValue *value = ecs_field(it, EcsMetricValue, 3); - EcsAlertTimeout *timeout = ecs_field(it, EcsAlertTimeout, 4); + EcsAlertInstance *alert_instance = ecs_field(it, EcsAlertInstance, 0); + EcsMetricSource *source = ecs_field(it, EcsMetricSource, 1); + EcsMetricValue *value = ecs_field(it, EcsMetricValue, 2); + EcsAlertTimeout *timeout = ecs_field(it, EcsAlertTimeout, 3); /* Get alert component from alert instance parent (the alert) */ ecs_id_t childof_pair; diff --git a/src/addons/json/serialize.c b/src/addons/json/serialize.c index 5ed2c066f..9fa98431f 100644 --- a/src/addons/json/serialize.c +++ b/src/addons/json/serialize.c @@ -1544,9 +1544,9 @@ void flecs_json_serialize_query_profile( int32_t f, field_count = qit.field_count; for (f = 0; f < field_count; f ++) { - size_t size = ecs_field_size(&qit, f + 1); - if (ecs_field_is_set(&qit, f + 1) && size) { - if (ecs_field_is_self(&qit, f + 1)) { + size_t size = ecs_field_size(&qit, f); + if (ecs_field_is_set(&qit, f) && size) { + if (ecs_field_is_self(&qit, f)) { component_bytes += flecs_uto(ecs_size_t, size) * qit.count; } else { @@ -1642,7 +1642,7 @@ void flecs_json_serialize_iter_result_ids( for (int i = 0; i < it->field_count; i ++) { flecs_json_next(buf); - flecs_json_serialize_id(world, ecs_field_id(it, i + 1), buf); + flecs_json_serialize_id(world, ecs_field_id(it, i), buf); } flecs_json_array_pop(buf); @@ -1659,7 +1659,7 @@ void flecs_json_serialize_iter_result_id_labels( for (int i = 0; i < it->field_count; i ++) { flecs_json_next(buf); - flecs_json_serialize_id_label(world, ecs_field_id(it, i + 1), buf); + flecs_json_serialize_id_label(world, ecs_field_id(it, i), buf); } flecs_json_array_pop(buf); @@ -1757,7 +1757,7 @@ bool flecs_json_serialize_iter_result_is_set( for (int i = 0; i < it->field_count; i ++) { ecs_strbuf_list_next(buf); - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { flecs_json_true(buf); } else { flecs_json_false(buf); @@ -2062,13 +2062,13 @@ int flecs_json_serialize_iter_result_values( if (!ptr) { /* No data in column. Append 0 if this is not an optional term */ - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { ecs_strbuf_appendch(buf, '0'); continue; } } - if (ecs_field_is_writeonly(it, i + 1)) { + if (ecs_field_is_writeonly(it, i)) { ecs_strbuf_appendch(buf, '0'); continue; } @@ -2099,13 +2099,13 @@ int flecs_json_serialize_iter_result_values( /* If term is not set, append empty array. This indicates that the term * could have had data but doesn't */ - if (!ecs_field_is_set(it, i + 1)) { + if (!ecs_field_is_set(it, i)) { flecs_json_array_push(buf); flecs_json_array_pop(buf); continue; } - if (ecs_field_is_self(it, i + 1)) { + if (ecs_field_is_self(it, i)) { int32_t count = it->count; if (array_to_json_buf_w_type_data(world, ptr, count, buf, comp, ser)) { return -1; diff --git a/src/addons/json/serialize_iter_rows.c b/src/addons/json/serialize_iter_rows.c index 667ee521b..70f7fa15f 100644 --- a/src/addons/json/serialize_iter_rows.c +++ b/src/addons/json/serialize_iter_rows.c @@ -19,7 +19,7 @@ bool flecs_json_serialize_row_tags( int32_t tag_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -61,7 +61,7 @@ bool flecs_json_serialize_row_pairs( int32_t pair_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -355,7 +355,7 @@ int flecs_json_serialize_row_components( int32_t f, field_count = it->field_count, component_count = 0; for (f = 0; f < field_count; f ++) { - if (!ecs_field_is_set(it, f + 1)) { + if (!ecs_field_is_set(it, f)) { continue; } @@ -364,7 +364,7 @@ int flecs_json_serialize_row_components( continue; } - if (ecs_field_is_self(it, f + 1)) { + if (ecs_field_is_self(it, f)) { ptr = ECS_ELEM(ptr, it->sizes[f], row); } diff --git a/src/addons/meta/meta.c b/src/addons/meta/meta.c index ff7ca6853..99a498305 100644 --- a/src/addons/meta/meta.c +++ b/src/addons/meta/meta.c @@ -709,7 +709,7 @@ int flecs_add_constant_to_bitmask( static void flecs_set_primitive(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsPrimitive *type = ecs_field(it, EcsPrimitive, 1); + EcsPrimitive *type = ecs_field(it, EcsPrimitive, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -776,7 +776,7 @@ void flecs_set_primitive(ecs_iter_t *it) { static void flecs_set_member(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMember *member = ecs_field(it, EcsMember, 1); + EcsMember *member = ecs_field(it, EcsMember, 0); EcsMemberRanges *ranges = ecs_table_get_id(world, it->table, ecs_id(EcsMemberRanges), it->offset); @@ -797,7 +797,7 @@ void flecs_set_member(ecs_iter_t *it) { static void flecs_set_member_ranges(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMemberRanges *ranges = ecs_field(it, EcsMemberRanges, 1); + EcsMemberRanges *ranges = ecs_field(it, EcsMemberRanges, 0); EcsMember *member = ecs_table_get_id(world, it->table, ecs_id(EcsMember), it->offset); if (!member) { @@ -874,7 +874,7 @@ void flecs_add_constant(ecs_iter_t *it) { static void flecs_set_array(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsArray *array = ecs_field(it, EcsArray, 1); + EcsArray *array = ecs_field(it, EcsArray, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -904,7 +904,7 @@ void flecs_set_array(ecs_iter_t *it) { static void flecs_set_vector(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsVector *array = ecs_field(it, EcsVector, 1); + EcsVector *array = ecs_field(it, EcsVector, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -925,7 +925,7 @@ void flecs_set_vector(ecs_iter_t *it) { static void flecs_set_custom_type(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsOpaque *serialize = ecs_field(it, EcsOpaque, 1); + EcsOpaque *serialize = ecs_field(it, EcsOpaque, 0); int i, count = it->count; for (i = 0; i < count; i ++) { @@ -1074,7 +1074,7 @@ bool flecs_unit_validate( static void flecs_set_unit(ecs_iter_t *it) { - EcsUnit *u = ecs_field(it, EcsUnit, 1); + EcsUnit *u = ecs_field(it, EcsUnit, 0); ecs_world_t *world = it->world; @@ -1106,7 +1106,7 @@ void flecs_unit_quantity_monitor(ecs_iter_t *it) { static void ecs_meta_type_init_default_ctor(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetaType *type = ecs_field(it, EcsMetaType, 1); + EcsMetaType *type = ecs_field(it, EcsMetaType, 0); int i; for (i = 0; i < it->count; i ++) { diff --git a/src/addons/metrics.c b/src/addons/metrics.c index e3cb7b40d..70d4db006 100644 --- a/src/addons/metrics.c +++ b/src/addons/metrics.c @@ -153,7 +153,7 @@ static ECS_MOVE(EcsMetricCountTargets, dst, src, { static void flecs_metrics_on_member_metric(ecs_iter_t *it) { ecs_world_t *world = it->world; ecs_member_metric_ctx_t *ctx = it->ctx; - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -222,7 +222,7 @@ static void flecs_metrics_on_oneof_metric(ecs_iter_t *it) { #ifdef FLECS_DOC static void SetMetricDocName(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetricSource *src = ecs_field(it, EcsMetricSource, 1); + EcsMetricSource *src = ecs_field(it, EcsMetricSource, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -238,7 +238,7 @@ static void SetMetricDocName(ecs_iter_t *it) { /** Delete metric instances for entities that are no longer alive */ static void ClearMetricInstance(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsMetricSource *src = ecs_field(it, EcsMetricSource, 1); + EcsMetricSource *src = ecs_field(it, EcsMetricSource, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -252,8 +252,8 @@ static void ClearMetricInstance(ecs_iter_t *it) { /** Update member metric */ static void UpdateMemberInstance(ecs_iter_t *it, bool counter) { ecs_world_t *world = it->real_world; - EcsMetricValue *m = ecs_field(it, EcsMetricValue, 1); - EcsMetricMemberInstance *mi = ecs_field(it, EcsMetricMemberInstance, 2); + EcsMetricValue *m = ecs_field(it, EcsMetricValue, 0); + EcsMetricMemberInstance *mi = ecs_field(it, EcsMetricMemberInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -294,8 +294,8 @@ static void UpdateCounterIncrementMemberInstance(ecs_iter_t *it) { /** Update id metric */ static void UpdateIdInstance(ecs_iter_t *it, bool counter) { ecs_world_t *world = it->real_world; - EcsMetricValue *m = ecs_field(it, EcsMetricValue, 1); - EcsMetricIdInstance *mi = ecs_field(it, EcsMetricIdInstance, 2); + EcsMetricValue *m = ecs_field(it, EcsMetricValue, 0); + EcsMetricIdInstance *mi = ecs_field(it, EcsMetricIdInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -339,7 +339,7 @@ static void UpdateOneOfInstance(ecs_iter_t *it, bool counter) { ecs_table_t *table = it->table; void *m = ecs_table_get_column(table, ecs_table_type_to_column_index(table, it->columns[0]), it->offset); - EcsMetricOneOfInstance *mi = ecs_field(it, EcsMetricOneOfInstance, 2); + EcsMetricOneOfInstance *mi = ecs_field(it, EcsMetricOneOfInstance, 1); ecs_ftime_t dt = it->delta_time; int32_t i, count = it->count; @@ -396,7 +396,7 @@ static void UpdateCounterOneOfInstance(ecs_iter_t *it) { static void UpdateCountTargets(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsMetricCountTargets *m = ecs_field(it, EcsMetricCountTargets, 1); + EcsMetricCountTargets *m = ecs_field(it, EcsMetricCountTargets, 0); int32_t i, count = it->count; for (i = 0; i < count; i ++) { @@ -427,8 +427,8 @@ static void UpdateCountTargets(ecs_iter_t *it) { static void UpdateCountIds(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsMetricCountIds *m = ecs_field(it, EcsMetricCountIds, 1); - EcsMetricValue *v = ecs_field(it, EcsMetricValue, 2); + EcsMetricCountIds *m = ecs_field(it, EcsMetricCountIds, 0); + EcsMetricValue *v = ecs_field(it, EcsMetricValue, 1); int32_t i, count = it->count; for (i = 0; i < count; i ++) { diff --git a/src/addons/monitor.c b/src/addons/monitor.c index e2f0b5ff1..da7a75b61 100644 --- a/src/addons/monitor.c +++ b/src/addons/monitor.c @@ -42,7 +42,7 @@ ECS_DTOR(EcsPipelineStats, ptr, { static void UpdateWorldSummary(ecs_iter_t *it) { - EcsWorldSummary *summary = ecs_field(it, EcsWorldSummary, 1); + EcsWorldSummary *summary = ecs_field(it, EcsWorldSummary, 0); const ecs_world_info_t *info = ecs_get_world_info(it->world); @@ -79,8 +79,8 @@ static void MonitorStats(ecs_iter_t *it) { ecs_world_t *world = it->real_world; - EcsStatsHeader *hdr = ecs_field_w_size(it, 0, 1); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + EcsStatsHeader *hdr = ecs_field_w_size(it, 0, 0); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); void *stats = ECS_OFFSET_T(hdr, EcsStatsHeader); ecs_ftime_t elapsed = hdr->elapsed; @@ -138,10 +138,10 @@ void MonitorStats(ecs_iter_t *it) { static void ReduceStats(ecs_iter_t *it) { - void *dst = ecs_field_w_size(it, 0, 1); - void *src = ecs_field_w_size(it, 0, 2); + void *dst = ecs_field_w_size(it, 0, 0); + void *src = ecs_field_w_size(it, 0, 1); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); dst = ECS_OFFSET_T(dst, EcsStatsHeader); src = ECS_OFFSET_T(src, EcsStatsHeader); @@ -157,13 +157,13 @@ static void AggregateStats(ecs_iter_t *it) { int32_t interval = *(int32_t*)it->ctx; - EcsStatsHeader *dst_hdr = ecs_field_w_size(it, 0, 1); - EcsStatsHeader *src_hdr = ecs_field_w_size(it, 0, 2); + EcsStatsHeader *dst_hdr = ecs_field_w_size(it, 0, 0); + EcsStatsHeader *src_hdr = ecs_field_w_size(it, 0, 1); void *dst = ECS_OFFSET_T(dst_hdr, EcsStatsHeader); void *src = ECS_OFFSET_T(src_hdr, EcsStatsHeader); - ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 1)); + ecs_id_t kind = ecs_pair_first(it->world, ecs_field_id(it, 0)); ecs_world_stats_t last_world = {0}; ecs_pipeline_stats_t last_pipeline = {0}; diff --git a/src/addons/plecs.c b/src/addons/plecs.c index 0fd30e8de..d0c9e7629 100644 --- a/src/addons/plecs.c +++ b/src/addons/plecs.c @@ -175,7 +175,7 @@ void flecs_assembly_on_set( } ecs_world_t *world = it->world; - ecs_entity_t assembly = ecs_field_id(it, 1); + ecs_entity_t assembly = ecs_field_id(it, 0); const char *name = ecs_get_name(world, assembly); ecs_record_t *r = ecs_record_find(world, assembly); @@ -198,7 +198,7 @@ void flecs_assembly_on_set( return; } - void *data = ecs_field_w_size(it, flecs_ito(size_t, ct->size), 1); + void *data = ecs_field_w_size(it, flecs_ito(size_t, ct->size), 0); int32_t i, m; for (i = 0; i < it->count; i ++) { diff --git a/src/addons/rest.c b/src/addons/rest.c index bedffb2aa..d38b5ac0e 100644 --- a/src/addons/rest.c +++ b/src/addons/rest.c @@ -1310,7 +1310,7 @@ void flecs_on_set_rest(ecs_iter_t *it) { static void DequeueRest(ecs_iter_t *it) { - EcsRest *rest = ecs_field(it, EcsRest, 1); + EcsRest *rest = ecs_field(it, EcsRest, 0); if (it->delta_system_time > (ecs_ftime_t)1.0) { ecs_warn( @@ -1337,7 +1337,7 @@ void DisableRest(ecs_iter_t *it) { if (it->event == EcsOnAdd) { /* REST module was disabled */ while (ecs_each_next(&rit)) { - EcsRest *rest = ecs_field(&rit, EcsRest, 1); + EcsRest *rest = ecs_field(&rit, EcsRest, 0); int i; for (i = 0; i < rit.count; i ++) { ecs_rest_ctx_t *ctx = rest[i].impl; @@ -1347,7 +1347,7 @@ void DisableRest(ecs_iter_t *it) { } else if (it->event == EcsOnRemove) { /* REST module was enabled */ while (ecs_each_next(&rit)) { - EcsRest *rest = ecs_field(&rit, EcsRest, 1); + EcsRest *rest = ecs_field(&rit, EcsRest, 0); int i; for (i = 0; i < rit.count; i ++) { ecs_rest_ctx_t *ctx = rest[i].impl; diff --git a/src/addons/timer.c b/src/addons/timer.c index 8e8791a7b..b55affe92 100644 --- a/src/addons/timer.c +++ b/src/addons/timer.c @@ -19,8 +19,8 @@ void AddTickSource(ecs_iter_t *it) { static void ProgressTimers(ecs_iter_t *it) { - EcsTimer *timer = ecs_field(it, EcsTimer, 1); - EcsTickSource *tick_source = ecs_field(it, EcsTickSource, 2); + EcsTimer *timer = ecs_field(it, EcsTimer, 0); + EcsTickSource *tick_source = ecs_field(it, EcsTickSource, 1); ecs_assert(timer != NULL, ECS_INTERNAL_ERROR, NULL); @@ -58,8 +58,8 @@ void ProgressTimers(ecs_iter_t *it) { static void ProgressRateFilters(ecs_iter_t *it) { - EcsRateFilter *filter = ecs_field(it, EcsRateFilter, 1); - EcsTickSource *tick_dst = ecs_field(it, EcsTickSource, 2); + EcsRateFilter *filter = ecs_field(it, EcsRateFilter, 0); + EcsTickSource *tick_dst = ecs_field(it, EcsTickSource, 1); int i; for (i = 0; i < it->count; i ++) { @@ -97,7 +97,7 @@ void ProgressRateFilters(ecs_iter_t *it) { static void ProgressTickSource(ecs_iter_t *it) { - EcsTickSource *tick_src = ecs_field(it, EcsTickSource, 1); + EcsTickSource *tick_src = ecs_field(it, EcsTickSource, 0); /* If tick source has no filters, tick unconditionally */ int i; @@ -262,7 +262,7 @@ void ecs_set_tick_source( static void RandomizeTimers(ecs_iter_t *it) { - EcsTimer *timer = ecs_field(it, EcsTimer, 1); + EcsTimer *timer = ecs_field(it, EcsTimer, 0); int32_t i; for (i = 0; i < it->count; i ++) { timer[i].time = diff --git a/src/bootstrap.c b/src/bootstrap.c index 16787275a..9187a5e67 100644 --- a/src/bootstrap.c +++ b/src/bootstrap.c @@ -48,7 +48,7 @@ static ECS_MOVE(EcsIdentifier, dst, src, { static void ecs_on_set(EcsIdentifier)(ecs_iter_t *it) { - EcsIdentifier *ptr = ecs_field(it, EcsIdentifier, 1); + EcsIdentifier *ptr = ecs_field(it, EcsIdentifier, 0); ecs_world_t *world = it->real_world; ecs_entity_t evt = it->event; @@ -275,7 +275,7 @@ void flecs_register_final(ecs_iter_t *it) { static void flecs_register_on_delete(ecs_iter_t *it) { - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); flecs_register_id_flag_for_relation(it, EcsOnDelete, ECS_ID_ON_DELETE_FLAG(ECS_PAIR_SECOND(id)), EcsIdOnDeleteMask, @@ -284,7 +284,7 @@ void flecs_register_on_delete(ecs_iter_t *it) { static void flecs_register_on_delete_object(ecs_iter_t *it) { - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); flecs_register_id_flag_for_relation(it, EcsOnDeleteTarget, ECS_ID_ON_DELETE_TARGET_FLAG(ECS_PAIR_SECOND(id)), EcsIdOnDeleteObjectMask, @@ -352,7 +352,7 @@ void flecs_register_with(ecs_iter_t *it) { static void flecs_on_symmetric_add_remove(ecs_iter_t *it) { - ecs_entity_t pair = ecs_field_id(it, 1); + ecs_entity_t pair = ecs_field_id(it, 0); if (!ECS_HAS_ID_FLAG(pair, PAIR)) { /* If relationship was not added as a pair, there's nothing to do */ @@ -402,7 +402,7 @@ void flecs_register_symmetric(ecs_iter_t *it) { static void flecs_on_component(ecs_iter_t *it) { ecs_world_t *world = it->world; - EcsComponent *c = ecs_field(it, EcsComponent, 1); + EcsComponent *c = ecs_field(it, EcsComponent, 0); int i, count = it->count; for (i = 0; i < count; i ++) { diff --git a/src/entity_name.c b/src/entity_name.c index 6bea05a75..460c72a97 100644 --- a/src/entity_name.c +++ b/src/entity_name.c @@ -212,7 +212,7 @@ ecs_entity_t flecs_get_parent_from_path( static void flecs_on_set_symbol(ecs_iter_t *it) { - EcsIdentifier *n = ecs_field(it, EcsIdentifier, 1); + EcsIdentifier *n = ecs_field(it, EcsIdentifier, 0); ecs_world_t *world = it->world; int i; diff --git a/src/iter.c b/src/iter.c index 044e0333b..cf4876394 100644 --- a/src/iter.c +++ b/src/iter.c @@ -168,14 +168,14 @@ void* ecs_field_w_size( int32_t index) { ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); ecs_check(!size || ecs_field_size(it, index) == size || - (!ecs_field_size(it, index) && (!it->ptrs[index - 1])), + (!ecs_field_size(it, index) && (!it->ptrs[index])), ECS_INVALID_PARAMETER, NULL); (void)size; - return it->ptrs[index - 1]; + return it->ptrs[index]; error: return NULL; } @@ -187,8 +187,9 @@ bool ecs_field_is_readonly( ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query != NULL, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query->terms != NULL, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - const ecs_term_t *term = &it->query->terms[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + const ecs_term_t *term = &it->query->terms[index]; if (term->inout == EcsIn) { return true; @@ -213,8 +214,10 @@ bool ecs_field_is_writeonly( ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query != NULL, ECS_INVALID_PARAMETER, NULL); ecs_check(it->query->terms != NULL, ECS_INVALID_PARAMETER, NULL); - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - const ecs_term_t *term = &it->query->terms[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + const ecs_term_t *term = &it->query->terms[index]; return term->inout == EcsOut; error: return false; @@ -225,9 +228,10 @@ bool ecs_field_is_set( int32_t index) { ecs_check(it->flags & EcsIterIsValid, ECS_INVALID_PARAMETER, NULL); - ecs_check(index >= 1, ECS_INVALID_PARAMETER, NULL); - ecs_check(index <= it->field_count, ECS_INVALID_PARAMETER, NULL); - return it->set_fields & (1llu << (index - 1)); + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->set_fields & (1llu << (index)); error: return false; } @@ -236,44 +240,64 @@ bool ecs_field_is_self( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->sources == NULL || it->sources[index - 1] == 0; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->sources == NULL || it->sources[index] == 0; +error: + return false; } ecs_id_t ecs_field_id( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->ids[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->ids[index]; +error: + return 0; } -int32_t ecs_field_column_index( +int32_t ecs_field_column( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return it->columns[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return it->columns[index]; +error: + return 0; } ecs_entity_t ecs_field_src( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + if (it->sources) { - return it->sources[index - 1]; + return it->sources[index]; } else { return 0; } +error: + return 0; } size_t ecs_field_size( const ecs_iter_t *it, int32_t index) { - ecs_assert(index >= 1, ECS_INVALID_PARAMETER, NULL); - return (size_t)it->sizes[index - 1]; + ecs_check(index >= 0, ECS_INVALID_PARAMETER, NULL); + ecs_check(index < it->field_count, ECS_INVALID_PARAMETER, NULL); + + return (size_t)it->sizes[index]; +error: + return 0; } char* ecs_iter_str( @@ -290,7 +314,7 @@ char* ecs_iter_str( if (it->field_count) { ecs_strbuf_list_push(&buf, "id: ", ","); for (i = 0; i < it->field_count; i ++) { - ecs_id_t id = ecs_field_id(it, i + 1); + ecs_id_t id = ecs_field_id(it, i); char *str = ecs_id_str(world, id); ecs_strbuf_list_appendstr(&buf, str); ecs_os_free(str); @@ -299,7 +323,7 @@ char* ecs_iter_str( ecs_strbuf_list_push(&buf, "src: ", ","); for (i = 0; i < it->field_count; i ++) { - ecs_entity_t subj = ecs_field_src(it, i + 1); + ecs_entity_t subj = ecs_field_src(it, i); char *str = ecs_get_fullpath(world, subj); ecs_strbuf_list_appendstr(&buf, str); ecs_os_free(str); @@ -308,7 +332,7 @@ char* ecs_iter_str( ecs_strbuf_list_push(&buf, "set: ", ","); for (i = 0; i < it->field_count; i ++) { - if (ecs_field_is_set(it, i + 1)) { + if (ecs_field_is_set(it, i)) { ecs_strbuf_list_appendlit(&buf, "true"); } else { ecs_strbuf_list_appendlit(&buf, "false"); diff --git a/src/query/cache.c b/src/query/cache.c index bd39562c8..b32f8f18b 100644 --- a/src/query/cache.c +++ b/src/query/cache.c @@ -544,7 +544,7 @@ void flecs_query_cache_set_table_match( /* Initialize storage columns for faster access to component storage */ for (i = 0; i < field_count; i ++) { int32_t column = it->columns[i]; - if (!ecs_field_is_set(it, i + 1) || terms[i].inout == EcsInOutNone) { + if (!ecs_field_is_set(it, i) || terms[i].inout == EcsInOutNone) { qm->storage_columns[i] = -1; continue; } diff --git a/src/query/cache_iter.c b/src/query/cache_iter.c index b1e5e270f..9d84b1288 100644 --- a/src/query/cache_iter.c +++ b/src/query/cache_iter.c @@ -120,7 +120,7 @@ void flecs_query_populate_ptrs_w_shared( } ecs_size_t size = it->sizes[field_index]; - if (!ecs_field_is_set(it, i + 1) || !size) { + if (!ecs_field_is_set(it, i) || !size) { /* Tag / no data */ it->ptrs[field_index] = NULL; continue; diff --git a/src/query/engine.c b/src/query/engine.c index 01484d275..6a931755e 100644 --- a/src/query/engine.c +++ b/src/query/engine.c @@ -3148,7 +3148,7 @@ bool flecs_query_if_set( ecs_query_ctrl_ctx_t *op_ctx = flecs_op_ctx(ctx, ctrl); if (!redo) { - op_ctx->is_set = ecs_field_is_set(it, field_index + 1); + op_ctx->is_set = ecs_field_is_set(it, field_index); } if (!op_ctx->is_set) { @@ -3197,7 +3197,7 @@ void flecs_query_populate_field( { int32_t index = it->columns[field_index]; ecs_assert(index >= 0, ECS_INTERNAL_ERROR, NULL); - ecs_assert(ecs_field_is_set(it, field_index + 1), ECS_INTERNAL_ERROR, NULL); + ecs_assert(ecs_field_is_set(it, field_index), ECS_INTERNAL_ERROR, NULL); ecs_entity_t src = it->sources[field_index]; if (!src) { diff --git a/test/addons/src/MultiThread.c b/test/addons/src/MultiThread.c index cee4a78a1..c520eda91 100644 --- a/test/addons/src/MultiThread.c +++ b/test/addons/src/MultiThread.c @@ -18,7 +18,7 @@ void set_worker_kind(ecs_world_t *world, int32_t thread_count) { } void Progress(ecs_iter_t *it) { - Position *pos = ecs_field(it, Position, 1); + Position *pos = ecs_field(it, Position, 0); int row; for (row = 0; row < it->count; row ++) { Position *p = &pos[row]; @@ -736,7 +736,7 @@ void TestSubset(ecs_world_t *world, ecs_query_t *q, int32_t offset, int32_t coun static void TestAll(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { @@ -1017,7 +1017,7 @@ void ReactiveDummySystem(ecs_iter_t * it) { static void PeriodicDummySystem(ecs_iter_t * it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i++ ) { @@ -1062,7 +1062,7 @@ void MultiThread_fini_after_set_threads(void) { static void SingleThreadedSystem(ecs_iter_t * it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i++ ) { diff --git a/test/addons/src/MultiThreadStaging.c b/test/addons/src/MultiThreadStaging.c index e8cd436ae..f9163fb5f 100644 --- a/test/addons/src/MultiThreadStaging.c +++ b/test/addons/src/MultiThreadStaging.c @@ -244,7 +244,7 @@ void MultiThreadStaging_6_threads_add_to_current(void) { static void InitVelocity(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); + Velocity *v = ecs_field(it, Velocity, 0); int i; for (i = 0; i < it->count; i ++) { @@ -255,7 +255,7 @@ void InitVelocity(ecs_iter_t *it) { static void AddVelocity(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -302,7 +302,7 @@ void MultiThreadStaging_2_threads_on_add(void) { static void New_w_count(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); ecs_bulk_new(it->world, Position, 10); } diff --git a/test/addons/src/Pipeline.c b/test/addons/src/Pipeline.c index f3e597dc5..d22c4c96f 100644 --- a/test/addons/src/Pipeline.c +++ b/test/addons/src/Pipeline.c @@ -376,7 +376,7 @@ static int sys_out_invoked; static int sys_in_invoked; static void SysOut(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); sys_out_invoked ++; @@ -387,7 +387,7 @@ static void SysOut(ecs_iter_t *it) { } static void SysOutMain(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 2); + Velocity *v = ecs_field(it, Velocity, 1); sys_out_invoked ++; @@ -399,7 +399,7 @@ static void SysOutMain(ecs_iter_t *it) { } static void SysIn(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 0); test_assert(sys_out_invoked != 0); sys_in_invoked ++; @@ -416,8 +416,8 @@ static void SysIn(ecs_iter_t *it) { } static void SysInMain(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); + Velocity *v = ecs_field(it, Velocity, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 0); test_assert(sys_out_invoked != 0); sys_in_invoked ++; @@ -750,7 +750,7 @@ void Pipeline_3_systems_3_types(void) { static void RandomWrite(ecs_iter_t *it) { - ecs_entity_t ecs_id(Position) = ecs_field_id(it, 2); + ecs_entity_t ecs_id(Position) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -801,7 +801,7 @@ void RandomReadAfterRW(ecs_iter_t *it) { static void RandomRead_Not(ecs_iter_t *it) { - ecs_entity_t ecs_id(Position) = ecs_field_id(it, 2); + ecs_entity_t ecs_id(Position) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -1317,7 +1317,7 @@ void Pipeline_mixed_staging(void) { static void WritePosition(ecs_iter_t *it) { if (*(bool*)it->ctx) { - ecs_entity_t ecs_id(Position) = ecs_field_id(it, 2); + ecs_entity_t ecs_id(Position) = ecs_field_id(it, 1); for (int i = 0; i < it->count; i ++) { ecs_add(it->world, it->entities[i], Position); } @@ -1555,6 +1555,7 @@ static void CreateQuery(ecs_iter_t *it) { test_assert(it->real_world == it->world); q_result = ecs_query(it->world, { .expr = "Position" }); + ecs_query_fini(q_result); } void Pipeline_no_staging_system_create_query(void) { @@ -1766,7 +1767,7 @@ void Pipeline_stack_allocator_after_progress_w_pipeline_change(void) { static void Sys_w_MainWorldIter(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); ecs_query_t *f = ecs_query(it->real_world, { .terms = {{ ecs_id(Position) }} }); @@ -2192,7 +2193,7 @@ static int foo_system_invoked = 0; static void AddId(ecs_iter_t *it) { ecs_world_t *world = it->world; - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i++) { @@ -2245,7 +2246,7 @@ void Pipeline_multi_threaded_tasks_pipeline_change_w_only_singlethreaded(void) { } static void SetPosition(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { p[i].x = 10; @@ -2306,7 +2307,7 @@ static int add_pair_invoked = 0; static void AddPair(ecs_iter_t *it) { ecs_world_t *world = it->world; - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i++) { @@ -2877,7 +2878,7 @@ void Pipeline_inactive_middle_system_merge_count(void) { static void CreateEntity(ecs_iter_t *it) { - ecs_id_t tag = ecs_field_id(it, 1); + ecs_id_t tag = ecs_field_id(it, 0); ecs_new_w_id(it->world, tag); } diff --git a/test/addons/src/Run.c b/test/addons/src/Run.c index 8217b01c4..53f1e45f3 100644 --- a/test/addons/src/Run.c +++ b/test/addons/src/Run.c @@ -6,16 +6,16 @@ void Run_setup(void) { static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; Mass *m = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } if (it->field_count >= 3) { - m = ecs_field(it, Mass, 3); + m = ecs_field(it, Mass, 2); } int *param = it->param; @@ -178,9 +178,9 @@ static void AddVelocity(ecs_iter_t *it) { ecs_world_t *world = it->world; - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { diff --git a/test/addons/src/SystemCascade.c b/test/addons/src/SystemCascade.c index 22a2a7c38..9e65c024d 100644 --- a/test/addons/src/SystemCascade.c +++ b/test/addons/src/SystemCascade.c @@ -2,10 +2,10 @@ static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Position *p_parent = ecs_field(it, Position, 2); + Position *p = ecs_field(it, Position, 0); + Position *p_parent = ecs_field(it, Position, 1); - test_assert(!p_parent || !ecs_field_is_self(it, 2)); + test_assert(!p_parent || !ecs_field_is_self(it, 1)); probe_iter(it); @@ -251,10 +251,10 @@ void SystemCascade_cascade_depth_2_new_syntax(void) { static void AddParent(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Position *p_parent = ecs_field(it, Position, 2); + Position *p = ecs_field(it, Position, 0); + Position *p_parent = ecs_field(it, Position, 1); - test_assert(!p_parent || !ecs_field_is_self(it, 2)); + test_assert(!p_parent || !ecs_field_is_self(it, 1)); probe_iter(it); diff --git a/test/addons/src/SystemManual.c b/test/addons/src/SystemManual.c index b44da5771..58a340fba 100644 --- a/test/addons/src/SystemManual.c +++ b/test/addons/src/SystemManual.c @@ -6,16 +6,16 @@ void SystemManual_setup(void) { static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; Mass *m = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } if (it->field_count >= 3) { - m = ecs_field(it, Mass, 3); + m = ecs_field(it, Mass, 2); } probe_iter(it); @@ -84,7 +84,7 @@ void SystemManual_1_type_1_component(void) { static void AddVelocity(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -95,7 +95,7 @@ void AddVelocity(ecs_iter_t *it) { static int dummy_ran = 0; void DummySystem(ecs_iter_t *it) { - ecs_entity_t Tag = ecs_field_id(it, 1); + ecs_entity_t Tag = ecs_field_id(it, 0); ecs_add_id(it->world, Tag, Tag); dummy_ran ++; } diff --git a/test/addons/src/SystemMisc.c b/test/addons/src/SystemMisc.c index ae494e8ab..7cb1b9404 100644 --- a/test/addons/src/SystemMisc.c +++ b/test/addons/src/SystemMisc.c @@ -315,11 +315,11 @@ void SystemMisc_system_w_or_disabled_and_prefab(void) { static void TableColumns(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); const ecs_type_t *type = ecs_table_get_type(it->table); test_int(2, type->count); @@ -405,7 +405,7 @@ void SystemMisc_dont_enable_after_rematch(void) { static void SysA(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); ecs_add(it->world, it->entities[0], Velocity); } @@ -809,8 +809,8 @@ void SystemMisc_rw_in_implicit_any(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == false); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -832,8 +832,8 @@ void SystemMisc_rw_in_implicit_shared(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); - test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); + test_assert(ecs_field_is_readonly(&it, 1) == true); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -854,8 +854,8 @@ void SystemMisc_rw_in_implicit_from_empty(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); - test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); + test_assert(ecs_field_is_readonly(&it, 1) == true); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -877,8 +877,8 @@ void SystemMisc_rw_in_implicit_from_entity(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); - test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); + test_assert(ecs_field_is_readonly(&it, 1) == true); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -899,8 +899,8 @@ void SystemMisc_rw_out_explicit_any(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == false); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -922,8 +922,8 @@ void SystemMisc_rw_out_explicit_shared(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == false); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -944,8 +944,8 @@ void SystemMisc_rw_out_explicit_from_empty(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == false); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -967,8 +967,8 @@ void SystemMisc_rw_out_explicit_from_entity(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it) == true); + test_assert(ecs_field_is_readonly(&it, 0) == false); test_assert(ecs_field_is_readonly(&it, 1) == false); - test_assert(ecs_field_is_readonly(&it, 2) == false); test_assert(ecs_query_next(&it) == false); ecs_query_fini(q); @@ -1025,7 +1025,7 @@ void SystemMisc_get_query(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); int i; diff --git a/test/addons/src/SystemPeriodic.c b/test/addons/src/SystemPeriodic.c index 709f9c7c0..b226c4099 100644 --- a/test/addons/src/SystemPeriodic.c +++ b/test/addons/src/SystemPeriodic.c @@ -2,19 +2,19 @@ static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; Mass *m = NULL; if (it->field_count >= 2) { - if (ecs_field_size(it, 2) == sizeof(Velocity)) { - v = ecs_field(it, Velocity, 2); + if (ecs_field_size(it, 1) == sizeof(Velocity)) { + v = ecs_field(it, Velocity, 1); } } if (it->field_count >= 3) { - if (ecs_field_size(it, 3) == sizeof(Mass)) { - m = ecs_field(it, Mass, 3); + if (ecs_field_size(it, 2) == sizeof(Mass)) { + m = ecs_field(it, Mass, 2); } } @@ -972,8 +972,8 @@ void SystemPeriodic_match_2_systems_w_populated_table(void) { } void TestOptional_w_column(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); test_assert(p != NULL); test_assert(v == NULL); @@ -982,8 +982,8 @@ void TestOptional_w_column(ecs_iter_t *it) { } void TestOptional_w_shared(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); test_assert(p != NULL); test_assert(v == NULL); @@ -1236,11 +1236,11 @@ void SystemPeriodic_disabled_nested_feature(void) { } void TwoRefs(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); + test_assert(!ecs_field_is_self(it, 0)); test_assert(!ecs_field_is_self(it, 1)); - test_assert(!ecs_field_is_self(it, 2)); (void)p; (void)v; @@ -1419,7 +1419,7 @@ void SystemPeriodic_match_prefab_and_normal(void) { static void TestIsSharedOnNotSet(ecs_iter_t *it) { - test_assert(ecs_field_is_self(it, 2) != false); + test_assert(ecs_field_is_self(it, 1) != false); } void SystemPeriodic_is_shared_on_column_not_set(void) { @@ -1805,7 +1805,7 @@ static void AssertReadonly(ecs_iter_t *it) { test_assert(dummy_invoked == 0); dummy_invoked = it->entities[0]; - test_assert( ecs_field_is_readonly(it, 1) == true); + test_assert( ecs_field_is_readonly(it, 0) == true); } void SystemPeriodic_shared_only(void) { diff --git a/test/addons/src/System_w_Empty.c b/test/addons/src/System_w_Empty.c index 75d0e80c1..b9cfd8201 100644 --- a/test/addons/src/System_w_Empty.c +++ b/test/addons/src/System_w_Empty.c @@ -2,7 +2,7 @@ static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); probe_iter(it); @@ -78,9 +78,9 @@ void System_w_Empty_3_column_2_from_id(void) { static void CheckColumnType(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - test_assert(ecs_id(Position) == ecs_field_id(it, 1)); + test_assert(ecs_id(Position) == ecs_field_id(it, 0)); probe_iter(it); } diff --git a/test/addons/src/System_w_FromEntity.c b/test/addons/src/System_w_FromEntity.c index 8e300612c..66bd048d3 100644 --- a/test/addons/src/System_w_FromEntity.c +++ b/test/addons/src/System_w_FromEntity.c @@ -2,20 +2,20 @@ static void Iter(ecs_iter_t *it) { - Mass *m_ptr = ecs_field(it, Mass, 1); + Mass *m_ptr = ecs_field(it, Mass, 0); Position *p = NULL; Velocity *v = NULL; if (it->field_count >= 2) { - p = ecs_field(it, Position, 2); + p = ecs_field(it, Position, 1); } if (it->field_count >= 3) { - v = ecs_field(it, Velocity, 3); + v = ecs_field(it, Velocity, 2); } - test_assert(!m_ptr || !ecs_field_is_self(it, 1)); + test_assert(!m_ptr || !ecs_field_is_self(it, 0)); probe_iter(it); @@ -88,8 +88,8 @@ void dummy_reset(void) { static void Dummy(ecs_iter_t *it) { dummy_invoked = 1; - dummy_component = ecs_field_id(it, 1); - dummy_source = ecs_field_src(it, 1); + dummy_component = ecs_field_id(it, 0); + dummy_source = ecs_field_src(it, 0); } void System_w_FromEntity_task_from_entity(void) { diff --git a/test/addons/src/System_w_FromParent.c b/test/addons/src/System_w_FromParent.c index e4f2528ae..79bc96bc3 100644 --- a/test/addons/src/System_w_FromParent.c +++ b/test/addons/src/System_w_FromParent.c @@ -6,22 +6,22 @@ void System_w_FromParent_setup(void) { static void Iter(ecs_iter_t *it) { - Mass *m_ptr = ecs_field(it, Mass, 1); + Mass *m_ptr = ecs_field(it, Mass, 0); bool shared = false; if (m_ptr) { - shared = !ecs_field_is_self(it, 1); + shared = !ecs_field_is_self(it, 0); } Position *p = NULL; Velocity *v = NULL; if (it->field_count >= 2) { - p = ecs_field(it, Position, 2); + p = ecs_field(it, Position, 1); } if (it->field_count >= 3) { - v = ecs_field(it, Velocity, 3); + v = ecs_field(it, Velocity, 2); } probe_iter(it); @@ -185,22 +185,22 @@ void System_w_FromParent_2_column_1_from_container(void) { static void Iter_2_shared(ecs_iter_t *it) { - Mass *m_ptr = ecs_field(it, Mass, 1); + Mass *m_ptr = ecs_field(it, Mass, 0); Rotation *r_ptr = NULL; Position *p = NULL; Velocity *v = NULL; if (it->field_count >= 2) { - r_ptr = ecs_field(it, Rotation, 2); + r_ptr = ecs_field(it, Rotation, 1); } if (it->field_count >= 3) { - p = ecs_field(it, Position, 3); + p = ecs_field(it, Position, 2); } if (it->field_count >= 4) { - v = ecs_field(it, Velocity, 4); + v = ecs_field(it, Velocity, 3); } probe_iter(it); @@ -555,10 +555,10 @@ void System_w_FromParent_2_column_1_from_container_w_or(void) { static void Dummy(ecs_iter_t *it) { - Mass *m_ptr = ecs_field(it, Mass, 1); - Position *p = ecs_field(it, Position, 2); + Mass *m_ptr = ecs_field(it, Mass, 0); + Position *p = ecs_field(it, Position, 1); - test_assert(!m_ptr || !ecs_field_is_self(it, 1)); + test_assert(!m_ptr || !ecs_field_is_self(it, 0)); probe_iter(it); @@ -750,7 +750,7 @@ void System_w_FromParent_add_component_after_match_and_rematch_w_entity_type_exp static void SetMass(ecs_iter_t *it) { - ecs_id_t ecs_id(Mass) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Mass) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -1147,10 +1147,10 @@ void System_w_FromParent_new_child_after_match(void) { } void IterSame(ecs_iter_t *it) { - Position *p_parent = ecs_field(it, Position, 1); - Position *p = ecs_field(it, Position, 2); + Position *p_parent = ecs_field(it, Position, 0); + Position *p = ecs_field(it, Position, 1); - test_assert(!ecs_field_is_self(it, 1)); + test_assert(!ecs_field_is_self(it, 0)); probe_iter(it); diff --git a/test/addons/src/System_w_FromSystem.c b/test/addons/src/System_w_FromSystem.c index 673dcabd2..5126888cd 100644 --- a/test/addons/src/System_w_FromSystem.c +++ b/test/addons/src/System_w_FromSystem.c @@ -1,7 +1,7 @@ #include void InitVelocity(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); + Velocity *v = ecs_field(it, Velocity, 0); int i; for (i = 0; i < it->count; i ++) { @@ -11,7 +11,7 @@ void InitVelocity(ecs_iter_t *it) { } void InitMass(ecs_iter_t *it) { - Mass *m = ecs_field(it, Mass, 1); + Mass *m = ecs_field(it, Mass, 0); int i; for (i = 0; i < it->count; i ++) { m[i] = 3; @@ -19,19 +19,19 @@ void InitMass(ecs_iter_t *it) { } void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; Mass *m = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); - test_assert(!ecs_field_is_self(it, 2)); + v = ecs_field(it, Velocity, 1); + test_assert(!ecs_field_is_self(it, 1)); } if (it->field_count >= 3) { - m = ecs_field(it, Mass, 3); - test_assert(!m || !ecs_field_is_self(it, 3)); + m = ecs_field(it, Mass, 2); + test_assert(!m || !ecs_field_is_self(it, 2)); } probe_iter(it); @@ -152,14 +152,14 @@ void System_w_FromSystem_3_column_2_from_system(void) { } void Iter_reactive(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = it->param; Mass *m = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); - test_assert(!ecs_field_is_self(it, 2)); + v = ecs_field(it, Velocity, 1); + test_assert(!ecs_field_is_self(it, 1)); } probe_iter(it); diff --git a/test/addons/src/util.c b/test/addons/src/util.c index bb9edd211..e614d5842 100644 --- a/test/addons/src/util.c +++ b/test/addons/src/util.c @@ -20,9 +20,9 @@ void probe_system_w_ctx( int i; for (i = 0; i < ctx->term_count; i ++) { ctx->c[ctx->invoked][i] = it->ids[i]; - ctx->s[ctx->invoked][i] = ecs_field_src(it, i + 1); + ctx->s[ctx->invoked][i] = ecs_field_src(it, i); - ecs_id_t e = ecs_field_id(it, i + 1); + ecs_id_t e = ecs_field_id(it, i); test_assert(e != 0); } @@ -179,7 +179,7 @@ bool test_iter( expect_ptr = ECS_OFFSET(expect_ptr, size * entity_index); - void *component_ptr = ecs_field_w_size(it, size, t + 1); + void *component_ptr = ecs_field_w_size(it, size, t); if (!if_test_assert(component_ptr != NULL)) { return false; } diff --git a/test/api/src/Commands.c b/test/api/src/Commands.c index edfeac473..88927df97 100644 --- a/test/api/src/Commands.c +++ b/test/api/src/Commands.c @@ -363,7 +363,7 @@ void Commands_defer_twice_in_progress(void) { static void AddVelocity(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); ecs_defer_begin(it->world); @@ -1883,7 +1883,7 @@ static void update_counter(ecs_iter_t *it) { } static void remove_counter(ecs_iter_t *it) { - Counter *ptr = ecs_field(it, Counter, 1); + Counter *ptr = ecs_field(it, Counter, 0); for (int i = 0; i < it->count; i ++) { test_int(ptr[i].value, 0); @@ -2704,8 +2704,8 @@ void PositionVelocityObserver(ecs_iter_t *it) { position_velocity_observer_invoked ++; test_int(it->count, 1); - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); diff --git a/test/api/src/ComponentLifecycle.c b/test/api/src/ComponentLifecycle.c index dc2180905..b79eaac87 100644 --- a/test/api/src/ComponentLifecycle.c +++ b/test/api/src/ComponentLifecycle.c @@ -128,7 +128,7 @@ static void ecs_on_add(Position)(ecs_iter_t *it) { test_assert(it->count >= 1); test_assert(it->event == EcsOnAdd); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { on_add_position ++; test_int(p[i].x, 0); @@ -1941,7 +1941,7 @@ static void ecs_on_remove(Position)(ecs_iter_t *it) { test_assert(it->count >= 1); test_assert(it->event == EcsOnRemove); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { on_remove_position ++; test_int(p[i].x, 10); @@ -2787,7 +2787,7 @@ static Position hook_w_offset_position; static void hook_w_offset(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(it->count, 1); hook_w_offset_offset = it->offset; hook_w_offset_invoked ++; @@ -2887,7 +2887,7 @@ static int on_set_position_invoked = 0; static void on_set_position(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(it->count, 1); test_int(p->x, 10); diff --git a/test/api/src/Delete.c b/test/api/src/Delete.c index ef1794534..797e0f286 100644 --- a/test/api/src/Delete.c +++ b/test/api/src/Delete.c @@ -230,7 +230,7 @@ void Delete_delete_3_of_3(void) { static void CreateEntity(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); const ecs_entity_t *ids = ecs_bulk_new(it->world, Position, 10); test_assert(ids != NULL); } diff --git a/test/api/src/Each.c b/test/api/src/Each.c index 04cd4a6c4..0d81bb884 100644 --- a/test/api/src/Each.c +++ b/test/api/src/Each.c @@ -16,14 +16,14 @@ void Each_each_tag(void) { test_int(2, it.count); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_iter_next(&it)); ecs_fini(world); @@ -45,10 +45,10 @@ void Each_each_component(void) { test_int(2, it.count); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); @@ -57,11 +57,11 @@ void Each_each_component(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_iter_next(&it)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -88,14 +88,14 @@ void Each_each_pair(void) { test_int(2, it.count); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_iter_next(&it)); ecs_fini(world); @@ -120,20 +120,20 @@ void Each_each_pair_rel_wildcard(void) { test_int(2, it.count); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_iter_next(&it)); ecs_fini(world); @@ -158,20 +158,20 @@ void Each_each_pair_tgt_wildcard(void) { test_int(2, it.count); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_iter_next(&it)); ecs_fini(world); diff --git a/test/api/src/Get_component.c b/test/api/src/Get_component.c index f8ca01533..322750189 100644 --- a/test/api/src/Get_component.c +++ b/test/api/src/Get_component.c @@ -73,7 +73,7 @@ void Get_component_get_2_from_3(void) { static void Test_main_stage(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; @@ -101,7 +101,7 @@ void Add_in_progress(ecs_iter_t *it) { ecs_id_t ecs_id(Velocity) = 0; if (it->field_count >= 2) { - ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id(Velocity) = ecs_field_id(it, 1); } for (int i = 0; i < it->count; i ++) { @@ -131,8 +131,8 @@ void Get_component_get_1_from_2_add_in_progress(void) { static void Add_in_progress_test_main(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; @@ -163,8 +163,8 @@ void Get_component_get_both_from_2_add_in_progress(void) { static void Add_remove_in_progress_test_main(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); for (int i = 0; i < it->count; i ++) { ecs_entity_t e = it->entities[i]; diff --git a/test/api/src/Has.c b/test/api/src/Has.c index c90eeb8a2..25b813160 100644 --- a/test/api/src/Has.c +++ b/test/api/src/Has.c @@ -67,7 +67,7 @@ void Has_1_of_empty(void) { } void TestHas(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { diff --git a/test/api/src/Internals.c b/test/api/src/Internals.c index b6f546fe3..381f5cefc 100644 --- a/test/api/src/Internals.c +++ b/test/api/src/Internals.c @@ -6,9 +6,9 @@ void Internals_setup(void) { static void Iter(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); - Mass *m = ecs_field(it, Mass, 3); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); + Mass *m = ecs_field(it, Mass, 2); probe_iter(it); @@ -140,7 +140,7 @@ static int invoked = 0; static void CreateNewTable(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int32_t i; for (i = 0; i < it->count; i ++) { diff --git a/test/api/src/Iter.c b/test/api/src/Iter.c index 830f39517..1a6a6828a 100644 --- a/test/api/src/Iter.c +++ b/test/api/src/Iter.c @@ -32,7 +32,7 @@ void Iter_page_iter_0_0(void) { test_int(pit.entities[1], e2); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); test_int(ptr[1].value, e2); @@ -46,7 +46,7 @@ void Iter_page_iter_0_0(void) { test_int(pit.entities[1], e4); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); test_int(ptr[1].value, e4); @@ -59,7 +59,7 @@ void Iter_page_iter_0_0(void) { test_int(pit.entities[0], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -101,7 +101,7 @@ void Iter_page_iter_1_0(void) { test_int(pit.entities[0], e2); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e2); } @@ -113,7 +113,7 @@ void Iter_page_iter_1_0(void) { test_int(pit.entities[1], e4); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); test_int(ptr[1].value, e4); @@ -125,7 +125,7 @@ void Iter_page_iter_1_0(void) { test_int(pit.entities[0], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -167,7 +167,7 @@ void Iter_page_iter_0_1(void) { test_int(pit.entities[0], e1); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); } @@ -208,7 +208,7 @@ void Iter_page_iter_n_0(void) { test_int(pit.entities[0], e3); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); } @@ -219,7 +219,7 @@ void Iter_page_iter_n_0(void) { test_int(pit.entities[0], e4); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); } @@ -230,7 +230,7 @@ void Iter_page_iter_n_0(void) { test_int(pit.entities[0], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -272,7 +272,7 @@ void Iter_page_iter_0_n(void) { test_int(pit.entities[1], e2); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); test_int(ptr[1].value, e2); @@ -316,7 +316,7 @@ void Iter_page_iter_m_n(void) { test_int(pit.entities[0], e3); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); } @@ -327,7 +327,7 @@ void Iter_page_iter_m_n(void) { test_int(pit.entities[1], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); test_int(ptr[1].value, e5); @@ -371,7 +371,7 @@ void Iter_page_iter_skip_1_table(void) { test_int(pit.entities[1], e4); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); test_int(ptr[1].value, e4); @@ -383,7 +383,7 @@ void Iter_page_iter_skip_1_table(void) { test_int(pit.entities[0], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -426,7 +426,7 @@ void Iter_page_iter_skip_2_tables(void) { test_int(pit.entities[1], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); test_int(ptr[1].value, e5); @@ -470,7 +470,7 @@ void Iter_worker_iter_1(void) { test_int(pit.entities[1], e2); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); test_int(ptr[1].value, e2); @@ -483,7 +483,7 @@ void Iter_worker_iter_1(void) { test_int(pit.entities[1], e4); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); test_int(ptr[1].value, e4); @@ -495,7 +495,7 @@ void Iter_worker_iter_1(void) { test_int(pit.entities[0], e5); test_int(pit.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -540,7 +540,7 @@ void Iter_worker_iter_2(void) { test_int(pit_1.entities[0], e1); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); } @@ -551,7 +551,7 @@ void Iter_worker_iter_2(void) { test_int(pit_1.entities[0], e3); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); } @@ -562,7 +562,7 @@ void Iter_worker_iter_2(void) { test_int(pit_1.entities[0], e5); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -576,7 +576,7 @@ void Iter_worker_iter_2(void) { test_int(pit_2.entities[0], e2); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e2); } @@ -587,7 +587,7 @@ void Iter_worker_iter_2(void) { test_int(pit_2.entities[0], e4); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); } @@ -635,7 +635,7 @@ void Iter_worker_iter_3(void) { test_int(pit_1.entities[0], e1); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); } @@ -646,7 +646,7 @@ void Iter_worker_iter_3(void) { test_int(pit_1.entities[0], e4); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); } @@ -657,7 +657,7 @@ void Iter_worker_iter_3(void) { test_int(pit_1.entities[0], e6); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e6); } @@ -671,7 +671,7 @@ void Iter_worker_iter_3(void) { test_int(pit_2.entities[0], e2); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e2); } @@ -682,7 +682,7 @@ void Iter_worker_iter_3(void) { test_int(pit_2.entities[0], e5); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -696,7 +696,7 @@ void Iter_worker_iter_3(void) { test_int(pit_3.entities[0], e3); test_int(pit_3.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_3, Self, 1); + Self *ptr = ecs_field(&pit_3, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); } @@ -751,7 +751,7 @@ void Iter_worker_iter_4(void) { test_int(pit_1.entities[0], e1); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); } @@ -762,7 +762,7 @@ void Iter_worker_iter_4(void) { test_int(pit_1.entities[0], e5); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); } @@ -773,7 +773,7 @@ void Iter_worker_iter_4(void) { test_int(pit_1.entities[0], e8); test_int(pit_1.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e8); } @@ -787,7 +787,7 @@ void Iter_worker_iter_4(void) { test_int(pit_2.entities[0], e2); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e2); } @@ -798,7 +798,7 @@ void Iter_worker_iter_4(void) { test_int(pit_2.entities[0], e6); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e6); } @@ -809,7 +809,7 @@ void Iter_worker_iter_4(void) { test_int(pit_2.entities[0], e9); test_int(pit_2.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e9); } @@ -823,7 +823,7 @@ void Iter_worker_iter_4(void) { test_int(pit_3.entities[0], e3); test_int(pit_3.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_3, Self, 1); + Self *ptr = ecs_field(&pit_3, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); } @@ -834,7 +834,7 @@ void Iter_worker_iter_4(void) { test_int(pit_3.entities[0], e7); test_int(pit_3.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_3, Self, 1); + Self *ptr = ecs_field(&pit_3, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e7); } @@ -848,7 +848,7 @@ void Iter_worker_iter_4(void) { test_int(pit_4.entities[0], e4); test_int(pit_4.ids[0], ecs_id(Self)); - Self *ptr = ecs_field(&pit_4, Self, 1); + Self *ptr = ecs_field(&pit_4, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); } @@ -898,12 +898,12 @@ void Iter_paged_iter_w_shared_comp(void) { test_int(pit.sources[0], 0); test_int(pit.sources[1], foo); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); test_int(ptr[1].value, e2); - Position *pptr = ecs_field(&pit, Position, 2); + Position *pptr = ecs_field(&pit, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -918,12 +918,12 @@ void Iter_paged_iter_w_shared_comp(void) { test_int(pit.sources[0], 0); test_int(pit.sources[1], foo); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); test_int(ptr[1].value, e4); - Position *pptr = ecs_field(&pit, Position, 2); + Position *pptr = ecs_field(&pit, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -937,11 +937,11 @@ void Iter_paged_iter_w_shared_comp(void) { test_int(pit.sources[0], 0); test_int(pit.sources[1], foo); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); - Position *pptr = ecs_field(&pit, Position, 2); + Position *pptr = ecs_field(&pit, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -993,11 +993,11 @@ void Iter_worker_iter_w_shared_comp(void) { test_int(pit_1.sources[0], 0); test_int(pit_1.sources[1], foo); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e1); - Position *pptr = ecs_field(&pit_1, Position, 2); + Position *pptr = ecs_field(&pit_1, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -1011,11 +1011,11 @@ void Iter_worker_iter_w_shared_comp(void) { test_int(pit_1.sources[0], 0); test_int(pit_1.sources[1], foo); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e3); - Position *pptr = ecs_field(&pit_1, Position, 2); + Position *pptr = ecs_field(&pit_1, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -1029,11 +1029,11 @@ void Iter_worker_iter_w_shared_comp(void) { test_int(pit_1.sources[0], 0); test_int(pit_1.sources[1], foo); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e5); - Position *pptr = ecs_field(&pit_1, Position, 2); + Position *pptr = ecs_field(&pit_1, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -1050,11 +1050,11 @@ void Iter_worker_iter_w_shared_comp(void) { test_int(pit_2.sources[0], 0); test_int(pit_2.sources[1], foo); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e2); - Position *pptr = ecs_field(&pit_2, Position, 2); + Position *pptr = ecs_field(&pit_2, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -1068,11 +1068,11 @@ void Iter_worker_iter_w_shared_comp(void) { test_int(pit_2.sources[0], 0); test_int(pit_2.sources[1], foo); - Self *ptr = ecs_field(&pit_2, Self, 1); + Self *ptr = ecs_field(&pit_2, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, e4); - Position *pptr = ecs_field(&pit_2, Position, 2); + Position *pptr = ecs_field(&pit_2, Position, 1); test_int(pptr->x, 10); test_int(pptr->y, 20); } @@ -1104,7 +1104,7 @@ void Iter_paged_iter_w_task_query(void) { test_int(pit.ids[0], ecs_id(Self)); test_int(pit.sources[0], foo); - Self *ptr = ecs_field(&pit, Self, 1); + Self *ptr = ecs_field(&pit, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, foo); } @@ -1139,7 +1139,7 @@ void Iter_worker_iter_w_task_query(void) { test_int(pit_1.ids[0], ecs_id(Self)); test_int(pit_1.sources[0], foo); - Self *ptr = ecs_field(&pit_1, Self, 1); + Self *ptr = ecs_field(&pit_1, Self, 0); test_assert(ptr != NULL); test_int(ptr[0].value, foo); } @@ -1177,7 +1177,7 @@ void Iter_worker_iter_w_singleton(void) { test_int(wit_1.count, 2); test_int(wit_1.entities[0], e1); test_int(wit_1.entities[1], e2); - p = ecs_field(&wit_1, Position, 1); + p = ecs_field(&wit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -1189,7 +1189,7 @@ void Iter_worker_iter_w_singleton(void) { test_int(wit_2.count, 2); test_int(wit_2.entities[0], e3); test_int(wit_2.entities[1], e4); - p = ecs_field(&wit_2, Position, 1); + p = ecs_field(&wit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); @@ -1225,20 +1225,20 @@ void Iter_worker_iter_w_singleton_component(void) { test_bool(ecs_worker_next(&wit_1), true); test_int(wit_1.count, 1); test_int(wit_1.entities[0], e1); - p = ecs_field(&wit_1, Position, 1); + p = ecs_field(&wit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); - v = ecs_field(&wit_1, Velocity, 2); + v = ecs_field(&wit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_worker_next(&wit_1), true); test_int(wit_1.count, 1); test_int(wit_1.entities[0], e2); - p = ecs_field(&wit_1, Position, 1); + p = ecs_field(&wit_1, Position, 0); test_int(p[0].x, 20); test_int(p[0].y, 30); - v = ecs_field(&wit_1, Velocity, 2); + v = ecs_field(&wit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); @@ -1249,20 +1249,20 @@ void Iter_worker_iter_w_singleton_component(void) { test_bool(ecs_worker_next(&wit_2), true); test_int(wit_2.count, 1); test_int(wit_2.entities[0], e3); - p = ecs_field(&wit_2, Position, 1); + p = ecs_field(&wit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); - v = ecs_field(&wit_2, Velocity, 2); + v = ecs_field(&wit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_worker_next(&wit_2), true); test_int(wit_2.count, 1); test_int(wit_2.entities[0], e4); - p = ecs_field(&wit_2, Position, 1); + p = ecs_field(&wit_2, Position, 0); test_int(p[0].x, 40); test_int(p[0].y, 50); - v = ecs_field(&wit_2, Velocity, 2); + v = ecs_field(&wit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); @@ -1298,7 +1298,7 @@ void Iter_worker_iter_w_singleton_instanced(void) { test_int(wit_1.count, 2); test_int(wit_1.entities[0], e1); test_int(wit_1.entities[1], e2); - p = ecs_field(&wit_1, Position, 1); + p = ecs_field(&wit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -1311,7 +1311,7 @@ void Iter_worker_iter_w_singleton_instanced(void) { test_int(wit_2.count, 2); test_int(wit_2.entities[0], e3); test_int(wit_2.entities[1], e4); - p = ecs_field(&wit_2, Position, 1); + p = ecs_field(&wit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); @@ -1349,12 +1349,12 @@ void Iter_worker_iter_w_singleton_component_instanced(void) { test_int(wit_1.count, 2); test_int(wit_1.entities[0], e1); test_int(wit_1.entities[1], e2); - p = ecs_field(&wit_1, Position, 1); + p = ecs_field(&wit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); - v = ecs_field(&wit_1, Velocity, 2); + v = ecs_field(&wit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_worker_next(&wit_1), false); @@ -1365,12 +1365,12 @@ void Iter_worker_iter_w_singleton_component_instanced(void) { test_int(wit_2.count, 2); test_int(wit_2.entities[0], e3); test_int(wit_2.entities[1], e4); - p = ecs_field(&wit_2, Position, 1); + p = ecs_field(&wit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); test_int(p[1].y, 50); - v = ecs_field(&wit_2, Velocity, 2); + v = ecs_field(&wit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_worker_next(&wit_2), false); @@ -1402,7 +1402,7 @@ void Iter_paged_iter_w_singleton(void) { test_int(pit_1.count, 2); test_int(pit_1.entities[0], e1); test_int(pit_1.entities[1], e2); - p = ecs_field(&pit_1, Position, 1); + p = ecs_field(&pit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -1415,7 +1415,7 @@ void Iter_paged_iter_w_singleton(void) { test_int(pit_2.count, 2); test_int(pit_2.entities[0], e3); test_int(pit_2.entities[1], e4); - p = ecs_field(&pit_2, Position, 1); + p = ecs_field(&pit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); @@ -1449,19 +1449,19 @@ void Iter_paged_iter_w_singleton_component(void) { test_bool(ecs_page_next(&pit_1), true); test_int(pit_1.count, 1); test_int(pit_1.entities[0], e1); - p = ecs_field(&pit_1, Position, 1); + p = ecs_field(&pit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); - v = ecs_field(&pit_1, Velocity, 2); + v = ecs_field(&pit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_1), true); test_int(pit_1.count, 1); test_int(pit_1.entities[0], e2); - p = ecs_field(&pit_1, Position, 1); + p = ecs_field(&pit_1, Position, 0); test_int(p[0].x, 20); test_int(p[0].y, 30); - v = ecs_field(&pit_1, Velocity, 2); + v = ecs_field(&pit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_1), false); @@ -1471,19 +1471,19 @@ void Iter_paged_iter_w_singleton_component(void) { test_bool(ecs_page_next(&pit_2), true); test_int(pit_2.count, 1); test_int(pit_2.entities[0], e3); - p = ecs_field(&pit_2, Position, 1); + p = ecs_field(&pit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); - v = ecs_field(&pit_2, Velocity, 2); + v = ecs_field(&pit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_2), true); test_int(pit_2.count, 1); test_int(pit_2.entities[0], e4); - p = ecs_field(&pit_2, Position, 1); + p = ecs_field(&pit_2, Position, 0); test_int(p[0].x, 40); test_int(p[0].y, 50); - v = ecs_field(&pit_2, Velocity, 2); + v = ecs_field(&pit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_2), false); @@ -1518,7 +1518,7 @@ void Iter_paged_iter_w_singleton_instanced(void) { test_int(pit_1.count, 2); test_int(pit_1.entities[0], e1); test_int(pit_1.entities[1], e2); - p = ecs_field(&pit_1, Position, 1); + p = ecs_field(&pit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -1531,7 +1531,7 @@ void Iter_paged_iter_w_singleton_instanced(void) { test_int(pit_2.count, 2); test_int(pit_2.entities[0], e3); test_int(pit_2.entities[1], e4); - p = ecs_field(&pit_2, Position, 1); + p = ecs_field(&pit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); @@ -1569,12 +1569,12 @@ void Iter_paged_iter_w_singleton_component_instanced(void) { test_int(pit_1.count, 2); test_int(pit_1.entities[0], e1); test_int(pit_1.entities[1], e2); - p = ecs_field(&pit_1, Position, 1); + p = ecs_field(&pit_1, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); - v = ecs_field(&pit_1, Velocity, 2); + v = ecs_field(&pit_1, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_1), false); @@ -1585,12 +1585,12 @@ void Iter_paged_iter_w_singleton_component_instanced(void) { test_int(pit_2.count, 2); test_int(pit_2.entities[0], e3); test_int(pit_2.entities[1], e4); - p = ecs_field(&pit_2, Position, 1); + p = ecs_field(&pit_2, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_int(p[1].x, 40); test_int(p[1].y, 50); - v = ecs_field(&pit_2, Velocity, 2); + v = ecs_field(&pit_2, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(ecs_page_next(&pit_2), false); @@ -1605,16 +1605,16 @@ void Iter(ecs_world_t *world, ecs_query_t *q, int32_t offset, int32_t limit) { ecs_iter_t it = ecs_query_iter(world, q); ecs_iter_t pit = ecs_page_iter(&it, offset, limit); while (ecs_page_next(&pit)) { - Position *p = ecs_field(&pit, Position, 1); + Position *p = ecs_field(&pit, Position, 0); Velocity *v = NULL; Mass *m = NULL; if (pit.field_count >= 2) { - v = ecs_field(&pit, Velocity, 2); + v = ecs_field(&pit, Velocity, 1); } if (pit.field_count >= 3) { - m = ecs_field(&pit, Mass, 3); + m = ecs_field(&pit, Mass, 2); } int *param = pit.param; @@ -2332,7 +2332,7 @@ static void TestAll(ecs_world_t *world, ecs_query_t *query) { ecs_iter_t it = ecs_query_iter(world, query); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); int i; for (i = 0; i < it.count; i ++) { @@ -2752,16 +2752,16 @@ void Iter_column_index_owned(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_int(1, ecs_field_column_index(&it, 1)); - test_int(2, ecs_field_column_index(&it, 2)); - test_int(0, ecs_field_column_index(&it, 3)); + test_int(1, ecs_field_column(&it, 0)); + test_int(2, ecs_field_column(&it, 1)); + test_int(0, ecs_field_column(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_int(2, ecs_field_column_index(&it, 1)); - test_int(3, ecs_field_column_index(&it, 2)); - test_int(1, ecs_field_column_index(&it, 3)); + test_int(2, ecs_field_column(&it, 0)); + test_int(3, ecs_field_column(&it, 1)); + test_int(1, ecs_field_column(&it, 2)); test_bool(false, ecs_query_next(&it)); @@ -2798,16 +2798,16 @@ void Iter_column_index_shared(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_int(0, ecs_field_column_index(&it, 1)); - test_int(1, ecs_field_column_index(&it, 2)); - test_int(0, ecs_field_column_index(&it, 3)); + test_int(0, ecs_field_column(&it, 0)); + test_int(1, ecs_field_column(&it, 1)); + test_int(0, ecs_field_column(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_int(1, ecs_field_column_index(&it, 1)); - test_int(2, ecs_field_column_index(&it, 2)); - test_int(0, ecs_field_column_index(&it, 3)); + test_int(1, ecs_field_column(&it, 0)); + test_int(2, ecs_field_column(&it, 1)); + test_int(0, ecs_field_column(&it, 2)); test_bool(false, ecs_query_next(&it)); @@ -2840,16 +2840,16 @@ void Iter_column_index_not(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_int(0, ecs_field_column_index(&it, 1)); - test_int(1, ecs_field_column_index(&it, 2)); - test_int(0, ecs_field_column_index(&it, 3)); + test_int(0, ecs_field_column(&it, 0)); + test_int(1, ecs_field_column(&it, 1)); + test_int(0, ecs_field_column(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_int(1, ecs_field_column_index(&it, 1)); - test_int(2, ecs_field_column_index(&it, 2)); - test_int(0, ecs_field_column_index(&it, 3)); + test_int(1, ecs_field_column(&it, 0)); + test_int(2, ecs_field_column(&it, 1)); + test_int(0, ecs_field_column(&it, 2)); test_bool(false, ecs_query_next(&it)); diff --git a/test/api/src/Monitor.c b/test/api/src/Monitor.c index fd18cbd2f..2ac3c1d3c 100644 --- a/test/api/src/Monitor.c +++ b/test/api/src/Monitor.c @@ -681,7 +681,7 @@ static void CheckComponent(ecs_iter_t *it) { test_assert(it->event == ctx->event); - ctx->result = ecs_field(it, Position, 1); + ctx->result = ecs_field(it, Position, 0); ctx->invoked ++; } diff --git a/test/api/src/Observer.c b/test/api/src/Observer.c index 590d42aab..f7c1c5f05 100644 --- a/test/api/src/Observer.c +++ b/test/api/src/Observer.c @@ -13,12 +13,12 @@ void Observer_w_value(ecs_iter_t *it) { test_assert(it->entities != NULL); test_assert(it->entities[0] != 0); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); if (it->field_count > 1) { - Velocity *v = ecs_field(it, Velocity, 2); + Velocity *v = ecs_field(it, Velocity, 1); test_int(v->x, 1); test_int(v->y, 2); } @@ -32,7 +32,7 @@ void Observer_w_1_value(ecs_iter_t *it) { test_assert(it->entities != NULL); test_assert(it->entities[0] != 0); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); } @@ -62,7 +62,7 @@ void Observer_w_1_filter_term(ecs_iter_t *it) { // test_assert(it->ptrs[0] == NULL); test_assert(it->ptrs[1] != NULL); - Velocity *v = ecs_field(it, Velocity, 2); + Velocity *v = ecs_field(it, Velocity, 1); test_int(v->x, 1); test_int(v->y, 2); } @@ -83,7 +83,7 @@ void Observer_w_2_filter_terms(ecs_iter_t *it) { // test_assert(it->ptrs[1] == NULL); test_assert(it->ptrs[2] != NULL); - Mass *m = ecs_field(it, Mass, 3); + Mass *m = ecs_field(it, Mass, 2); test_int(m[0], 100); } @@ -1403,7 +1403,7 @@ void Observer_iter_type_set(void) { void ObserverReadonly(ecs_iter_t *it) { probe_system_w_ctx(it, it->ctx); - test_bool(ecs_field_is_readonly(it, 1), true); + test_bool(ecs_field_is_readonly(it, 0), true); } void Observer_readonly_term(void) { @@ -1995,7 +1995,7 @@ void UnSet_TestComp(ecs_iter_t *it) { test_int(it->count, 1); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -2056,10 +2056,10 @@ void UnSet_WriteComp(ecs_iter_t *it) { test_int(it->count, 1); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(p != NULL); - Velocity *v = ecs_field(it, Velocity, 2); + Velocity *v = ecs_field(it, Velocity, 1); test_int(p->x, 10); test_int(p->y, 20); @@ -4172,7 +4172,7 @@ void OnTagPair(ecs_iter_t *it) { static void OnPair(ecs_iter_t *it) { test_int(it->count, 1); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); pair_x = p->x; pair_column = it->columns[0]; probe_iter(it); @@ -4402,7 +4402,7 @@ void Observer_on_remove_target_from_base_at_offset(void) { static void Observer_base_component(ecs_iter_t *it) { probe_system_w_ctx(it, it->ctx); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(p != NULL); test_int(p->x, 30); test_int(p->y, 40); diff --git a/test/api/src/ObserverOnSet.c b/test/api/src/ObserverOnSet.c index 129244e36..95eabff37 100644 --- a/test/api/src/ObserverOnSet.c +++ b/test/api/src/ObserverOnSet.c @@ -49,8 +49,8 @@ static Probe pv_probe; static void On_PV(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); probe_system_w_ctx(it, &pv_probe); diff --git a/test/api/src/OnDelete.c b/test/api/src/OnDelete.c index a383c517d..f04f72e43 100644 --- a/test/api/src/OnDelete.c +++ b/test/api/src/OnDelete.c @@ -1486,7 +1486,7 @@ typedef struct { static void delete_on_remove(ecs_iter_t *it) { test_int(it->count, 1); - Entity *comp = ecs_field(it, Entity, 1); + Entity *comp = ecs_field(it, Entity, 0); test_assert(comp != NULL); test_assert(comp->other != 0); ecs_delete(it->world, comp->other); @@ -2486,7 +2486,7 @@ static int delete_target_invoked = 0; static void DeleteTarget(ecs_iter_t *it) { - ecs_id_t pair = ecs_field_id(it, 1); + ecs_id_t pair = ecs_field_id(it, 0); test_assert(ecs_id_is_pair(pair)); ecs_delete(it->world, ECS_PAIR_SECOND(pair)); delete_target_invoked ++; @@ -2567,7 +2567,7 @@ void OnDelete_delete_nested_in_on_remove(void) { static void AddRemoved(ecs_iter_t *it) { - ecs_id_t id = ecs_field_id(it, 1); + ecs_id_t id = ecs_field_id(it, 0); for (int i = 0; i < it->count; i ++) { ecs_new_w_id(it->world, id); /* create entity with removed id */ } diff --git a/test/api/src/Pairs.c b/test/api/src/Pairs.c index 34a54ea70..45f8cfd33 100644 --- a/test/api/src/Pairs.c +++ b/test/api/src/Pairs.c @@ -17,7 +17,7 @@ typedef struct Obj { } Obj; void ProcessPairs(ecs_iter_t *it) { - Rel *tr = ecs_field(it, Rel, 1); + Rel *tr = ecs_field(it, Rel, 0); probe_iter(it); @@ -271,7 +271,7 @@ void Pairs_add_tag_pair_for_tag(void) { void ProcessValuePairs(ecs_iter_t *it) { /* Strictly speaking this can be either Position or Velocity, but they have * the same layout. */ - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); probe_iter(it); @@ -338,8 +338,8 @@ void Pairs_add_tag_pair_for_component(void) { } void ProcessTwoPairs(ecs_iter_t *it) { - RelA *tr_a = ecs_field(it, RelA, 1); - RelB *tr_b = ecs_field(it, RelB, 2); + RelA *tr_a = ecs_field(it, RelA, 0); + RelB *tr_b = ecs_field(it, RelB, 1); probe_iter(it); @@ -809,7 +809,7 @@ void Pairs_pair_w_component_query(void) { int32_t count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Rel *t = ecs_field(&it, Rel, 1); + Rel *t = ecs_field(&it, Rel, 0); test_assert(t != NULL); int i; @@ -901,9 +901,9 @@ void Pairs_query_not_pair(void) { int32_t count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *t = ecs_field(&it, Position, 1); + Position *t = ecs_field(&it, Position, 0); test_assert(t == NULL); - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); int i; @@ -1056,7 +1056,7 @@ void Pairs_dsl_pair(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), false); @@ -1100,12 +1100,12 @@ void Pairs_dsl_pair_w_pred_wildcard(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), false); @@ -1149,12 +1149,12 @@ void Pairs_dsl_pair_w_obj_wildcard(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj_2)); test_bool(ecs_query_next(&it), false); @@ -1201,22 +1201,22 @@ void Pairs_dsl_pair_w_both_wildcard(void) { test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e2); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj_2)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj_2)); test_bool(ecs_query_next(&it), false); @@ -1260,7 +1260,7 @@ void Pairs_dsl_pair_w_explicit_subj_this(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), false); @@ -1310,8 +1310,8 @@ void Pairs_dsl_pair_w_explicit_subj(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); - test_int(ecs_field_src(&it, 1), Subj); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); + test_int(ecs_field_src(&it, 0), Subj); test_bool(ecs_query_next(&it), false); @@ -1355,7 +1355,7 @@ void Pairs_api_pair(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), false); @@ -1399,12 +1399,12 @@ void Pairs_api_pair_w_pred_wildcard(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), false); @@ -1448,12 +1448,12 @@ void Pairs_api_pair_w_obj_wildcard(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj_2)); test_bool(ecs_query_next(&it), false); @@ -1500,22 +1500,22 @@ void Pairs_api_pair_w_both_wildcard(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e2); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj_2)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e3); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel_2, Obj_2)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel_2, Obj_2)); test_bool(ecs_query_next(&it), false); @@ -1561,7 +1561,7 @@ void Pairs_api_pair_w_explicit_subj_this(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e1); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); test_bool(ecs_query_next(&it), false); @@ -1611,8 +1611,8 @@ void Pairs_api_pair_w_explicit_subj(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_int(it.entities[0], e4); - test_int(ecs_field_id(&it, 1), ecs_pair(Rel, Obj)); - test_int(ecs_field_src(&it, 1), Subj); + test_int(ecs_field_id(&it, 0), ecs_pair(Rel, Obj)); + test_int(ecs_field_src(&it, 0), Subj); test_bool(ecs_query_next(&it), false); diff --git a/test/api/src/Poly.c b/test/api/src/Poly.c index 02146754d..83ea52411 100644 --- a/test/api/src/Poly.c +++ b/test/api/src/Poly.c @@ -7,7 +7,7 @@ static void PolyTrigger(ecs_iter_t *it) { probe_system_w_ctx(it, it->ctx); - EcsPoly *poly = ecs_field(it, EcsPoly, 1); + EcsPoly *poly = ecs_field(it, EcsPoly, 0); test_int(1, it->count); test_assert(poly->poly != NULL); diff --git a/test/api/src/Prefab.c b/test/api/src/Prefab.c index c9d961273..6ea022e98 100644 --- a/test/api/src/Prefab.c +++ b/test/api/src/Prefab.c @@ -8,14 +8,14 @@ void Prefab_setup(void) { static void Iter(ecs_iter_t *it) { - Mass *m_ptr = ecs_field(it, Mass, 1); - bool shared = !ecs_field_is_self(it, 1); + Mass *m_ptr = ecs_field(it, Mass, 0); + bool shared = !ecs_field_is_self(it, 0); - Position *p = ecs_field(it, Position, 2); + Position *p = ecs_field(it, Position, 1); Velocity *v = NULL; if (it->field_count >= 3) { - v = ecs_field(it, Velocity, 3); + v = ecs_field(it, Velocity, 2); } probe_iter(it); @@ -549,20 +549,20 @@ static void Prefab_w_shared(ecs_iter_t *it) { Velocity *v = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); if (v) { - test_assert(!ecs_field_is_self(it, 2)); + test_assert(!ecs_field_is_self(it, 1)); } } Mass *m = NULL; if (it->field_count >= 3) { - m = ecs_field(it, Mass, 3); + m = ecs_field(it, Mass, 2); } probe_iter(it); - Position *pos = ecs_field(it, Position, 1); + Position *pos = ecs_field(it, Position, 0); for (int i = 0; i < it->count; i ++) { Position *p = &pos[i]; @@ -867,8 +867,8 @@ void Prefab_ignore_prefab_parent_component(void) { static void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); int i; for (i = 0; i < it->count; i ++) { @@ -879,7 +879,7 @@ void Move(ecs_iter_t *it) { static void AddVelocity(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -1472,7 +1472,7 @@ void Prefab_on_set_on_instance(void) { } void InstantiateInProgress(ecs_iter_t *it) { - ecs_id_t Prefab = ecs_field_id(it, 2); + ecs_id_t Prefab = ecs_field_id(it, 1); ecs_entity_t *ids = ecs_get_ctx(it->world); int i; @@ -1514,7 +1514,7 @@ void Prefab_instantiate_in_progress(void) { } void NewInProgress(ecs_iter_t *it) { - ecs_id_t Prefab = ecs_field_id(it, 2); + ecs_id_t Prefab = ecs_field_id(it, 1); ecs_entity_t *ids = ecs_get_ctx(it->world); @@ -1692,7 +1692,7 @@ void Prefab_no_overwrite_on_2nd_add(void) { } void AddPrefab(ecs_iter_t *it) { - ecs_id_t Prefab = ecs_field_id(it, 2); + ecs_id_t Prefab = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -1822,7 +1822,7 @@ void Prefab_no_instantiate_on_2nd_add_in_progress(void) { void NewPrefab_w_count(ecs_iter_t *it) { ecs_entity_t *ids = ecs_get_ctx(it->world); - ecs_id_t Prefab = ecs_field_id(it, 1); + ecs_id_t Prefab = ecs_field_id(it, 0); const ecs_entity_t *new_ids = ecs_bulk_new_w_id(it->world, ecs_pair(EcsIsA, Prefab), 3); test_assert(new_ids != NULL); @@ -1874,8 +1874,8 @@ static int on_set_velocity_invoked; static void OnSetVelocity(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); + Velocity *v = ecs_field(it, Velocity, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 0); on_set_velocity_invoked ++; @@ -1883,7 +1883,7 @@ void OnSetVelocity(ecs_iter_t *it) { for (i = 0; i < it->count; i ++) { ecs_add(it->world, it->entities[i], Velocity); - if (ecs_field_is_self(it, 1)) { + if (ecs_field_is_self(it, 0)) { v[i].x ++; v[i].y ++; } @@ -1938,8 +1938,8 @@ void Prefab_nested_prefab_in_progress_w_count_set_after_override(void) { } void AddPrefabInProgress(ecs_iter_t *it) { - ecs_id_t Prefab = ecs_field_id(it, 2); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 3); + ecs_id_t Prefab = ecs_field_id(it, 1); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); int i; for (i = 0; i < it->count; i ++) { @@ -1984,10 +1984,10 @@ void Prefab_get_ptr_from_prefab_from_new_table_in_progress(void) { } void TestBase(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); - test_assert(!ecs_field_is_self(it, 2)); + test_assert(!ecs_field_is_self(it, 1)); test_assert(p != NULL); test_assert(v != NULL); @@ -2016,7 +2016,7 @@ void Prefab_match_base(void) { static void AddMass(ecs_iter_t *it) { - ecs_id_t ecs_id(Mass) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Mass) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -2114,7 +2114,7 @@ void Prefab_rematch_twice(void) { static void AddPosition(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); ecs_entity_t *base = ecs_get_ctx(it->world); @@ -2169,7 +2169,7 @@ static bool has_cloned = false; static void CloneInOnAdd(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { @@ -2243,7 +2243,7 @@ void Prefab_override_from_nested(void) { static void OnAddEntity(ecs_iter_t *it) { - ecs_entity_t *e = ecs_field(it, ecs_entity_t, 1); + ecs_entity_t *e = ecs_field(it, ecs_entity_t, 0); int i; for (i = 0; i < it->count; i ++) { @@ -2318,7 +2318,7 @@ static ecs_entity_t new_instance_1, new_instance_2; static void CreateInstances(ecs_iter_t *it) { - ecs_id_t Prefab = ecs_field_id(it, 1); + ecs_id_t Prefab = ecs_field_id(it, 0); new_instance_1 = ecs_new_w_pair(it->world, EcsIsA, Prefab); new_instance_2 = ecs_new_w_pair(it->world, EcsIsA, Prefab); @@ -2849,7 +2849,7 @@ void Prefab_rematch_after_add_instanceof_to_parent(void) { test_int(it.count, 1); test_int(it.entities[0], child); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -2892,7 +2892,7 @@ void Prefab_rematch_after_prefab_delete(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -3201,11 +3201,11 @@ void Prefab_rematch_after_add_to_recycled_base(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - test_assert(ecs_field_src(&it, 2) == base); + test_assert(ecs_field_src(&it, 1) == base); test_bool(ecs_query_next(&it), false); ecs_query_fini(q); diff --git a/test/api/src/SingleThreadStaging.c b/test/api/src/SingleThreadStaging.c index 30887ad17..e179df0cf 100644 --- a/test/api/src/SingleThreadStaging.c +++ b/test/api/src/SingleThreadStaging.c @@ -1061,7 +1061,7 @@ void SingleThreadStaging_remove_add_2_same_to_current(void) { static void AddRemoveAdd(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -1969,8 +1969,8 @@ static Probe pv_probe; static void On_PV(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); probe_system_w_ctx(it, &pv_probe); @@ -2027,7 +2027,7 @@ void Set_velocity_on_new(ecs_iter_t *it) { static void On_V(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); + Velocity *v = ecs_field(it, Velocity, 0); probe_iter(it); @@ -2220,7 +2220,7 @@ void SingleThreadStaging_merge_table_w_container_added_on_set_reverse(void) { static void Task(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); ecs_entity_t *e = ecs_get_ctx(it->world); @@ -2247,8 +2247,8 @@ void SingleThreadStaging_merge_after_tasks(void) { static void OverrideAfterRemove(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -2288,7 +2288,7 @@ void SingleThreadStaging_override_after_remove_in_progress(void) { static void GetParentInProgress(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); ecs_world_t *world = it->world; @@ -2324,8 +2324,8 @@ static void AddInProgress(ecs_iter_t *it) { ecs_world_t *world = it->world; - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -2336,8 +2336,8 @@ void AddInProgress(ecs_iter_t *it) { static void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); int i; for (i = 0; i < it->count; i ++) { @@ -2425,8 +2425,8 @@ void SingleThreadStaging_clear_stage_after_merge(void) { void MutableTest(ecs_iter_t *it) { ecs_world_t *world = it->world; - Velocity *v = ecs_field(it, Velocity, 2); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + Velocity *v = ecs_field(it, Velocity, 1); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int32_t i; for (i = 0; i < it->count; i ++) { @@ -2519,9 +2519,9 @@ void SingleThreadStaging_ensureable_from_main(void) { void MutableTest_w_Add(ecs_iter_t *it) { ecs_world_t *world = it->world; - Velocity *v = ecs_field(it, Velocity, 2); - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); - ecs_id_t ecs_id(MyTag) = ecs_field_id(it, 3); + Velocity *v = ecs_field(it, Velocity, 1); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); + ecs_id_t ecs_id(MyTag) = ecs_field_id(it, 2); int32_t i; for (i = 0; i < it->count; i ++) { @@ -2594,7 +2594,7 @@ void SingleThreadStaging_ensureable_w_add(void) { static void OnAdd(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); + Velocity *v = ecs_field(it, Velocity, 0); int i; for (i = 0; i < it->count; i ++) { @@ -2605,7 +2605,7 @@ void OnAdd(ecs_iter_t *it) { static void AddInProgress2(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { diff --git a/test/api/src/Singleton.c b/test/api/src/Singleton.c index 5dd8394e9..0c449f9ce 100644 --- a/test/api/src/Singleton.c +++ b/test/api/src/Singleton.c @@ -66,7 +66,7 @@ void Singleton_ensure_singleton(void) { static void IncSingleton(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); p->x ++; p->y ++; } diff --git a/test/api/src/Stresstests.c b/test/api/src/Stresstests.c index de0d0d0fa..0ecd33efe 100644 --- a/test/api/src/Stresstests.c +++ b/test/api/src/Stresstests.c @@ -59,7 +59,7 @@ void Add_random(ecs_iter_t *it) { static void Set_velocity_callback(ecs_iter_t *it) { - Velocity *v = ecs_field(it, Velocity, 1); + Velocity *v = ecs_field(it, Velocity, 0); int i; for (i = 0; i < it->count; i ++) { diff --git a/test/api/src/Trigger.c b/test/api/src/Trigger.c index add0c2ea2..a2e8a2953 100644 --- a/test/api/src/Trigger.c +++ b/test/api/src/Trigger.c @@ -15,7 +15,7 @@ void Trigger_w_value(ecs_iter_t *it) { test_assert(it->entities != NULL); test_assert(it->entities[0] != 0); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); } @@ -29,7 +29,7 @@ void Trigger_w_value_from_entity(ecs_iter_t *it) { test_assert(it->entities[0] == 0); test_assert(it->sources[0] != 0); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); } @@ -40,7 +40,7 @@ void Trigger_w_value_instanced(ecs_iter_t *it) { test_assert(it->count > 1); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); } @@ -59,7 +59,7 @@ static void Trigger_n_w_values(ecs_iter_t *it) { probe_system_w_ctx(it, it->ctx); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(it->entities != NULL); @@ -2330,10 +2330,10 @@ void Trigger_trigger_w_named_entity(void) { } void RemoveSelf(ecs_iter_t *it) { - Self *s = ecs_field(it, Self, 1); + Self *s = ecs_field(it, Self, 0); test_assert(s != NULL); - ecs_id_t ecs_id(Self) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Self) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -2549,7 +2549,7 @@ void Trigger_iter_type_set(void) { void TriggerReadonly(ecs_iter_t *it) { probe_system_w_ctx(it, it->ctx); - test_bool(ecs_field_is_readonly(it, 1), true); + test_bool(ecs_field_is_readonly(it, 0), true); } void Trigger_readonly_term(void) { @@ -4204,7 +4204,7 @@ void Trigger_w_nonzero_value(ecs_iter_t *it) { test_assert(it->entities != NULL); test_assert(it->entities[0] != 0); - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(p != NULL); } diff --git a/test/api/src/TriggerOnAdd.c b/test/api/src/TriggerOnAdd.c index 1242b147c..1fffc450c 100644 --- a/test/api/src/TriggerOnAdd.c +++ b/test/api/src/TriggerOnAdd.c @@ -5,11 +5,11 @@ void TriggerOnAdd_setup(void) { } void Init(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } probe_iter(it); @@ -473,7 +473,7 @@ void TriggerOnAdd_new_w_count_match_1_of_1(void) { static void AddVelocity(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); ecs_id_t v = 0; if (it->ctx) { @@ -481,7 +481,7 @@ void AddVelocity(ecs_iter_t *it) { } if (!v) { - v = ecs_field_id(it, 2); + v = ecs_field_id(it, 1); } probe_iter(it); @@ -540,7 +540,7 @@ void TriggerOnAdd_override_after_add_in_on_add(void) { static void OnSetPosition(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { @@ -593,7 +593,7 @@ void TriggerOnAdd_set_after_add_in_on_add(void) { static void AddAgain(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -625,7 +625,7 @@ void TriggerOnAdd_add_again_in_progress(void) { static void AddMass(ecs_iter_t *it) { - Mass *m = ecs_field(it, Mass, 1); + Mass *m = ecs_field(it, Mass, 0); int i; for (i = 0; i < it->count; i ++) { @@ -673,7 +673,7 @@ void SystemA(ecs_iter_t *it) { } void SystemB(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -695,7 +695,7 @@ void TriggerOnAdd_2_systems_w_table_creation(void) { } void NewWithPosition(ecs_iter_t *it) { - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); ecs_entity_t e = ecs_new(it->world, Position); test_assert(e != 0); diff --git a/test/api/src/TriggerOnRemove.c b/test/api/src/TriggerOnRemove.c index 00930c590..8bdb01f3c 100644 --- a/test/api/src/TriggerOnRemove.c +++ b/test/api/src/TriggerOnRemove.c @@ -1,11 +1,11 @@ #include void Deinit(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } probe_iter(it); @@ -145,7 +145,7 @@ static Position old_position = {0}; static void RemovePosition(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(it->count == 1); @@ -353,7 +353,7 @@ void OnRemoveHasTag(ecs_iter_t *it) { test_int(it->count, 1); test_assert(it->entities[0] == ctx->ent); - test_assert(ecs_field_id(it, 1) == ctx->tag); + test_assert(ecs_field_id(it, 0) == ctx->tag); test_bool(ecs_has_id(it->world, ctx->ent, ctx->tag), true); dummy_called = true; diff --git a/test/api/src/TriggerOnSet.c b/test/api/src/TriggerOnSet.c index 8c8aee967..25730b919 100644 --- a/test/api/src/TriggerOnSet.c +++ b/test/api/src/TriggerOnSet.c @@ -7,11 +7,11 @@ void Trigger(ecs_iter_t *it) { static void OnSet(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } probe_iter(it); @@ -228,7 +228,7 @@ static bool set_called; static void OnAdd_check_order(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(!add_called); test_assert(!set_called); @@ -246,7 +246,7 @@ void OnAdd_check_order(ecs_iter_t *it) { static void OnSet_check_order(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); probe_iter(it); @@ -302,11 +302,11 @@ void TriggerOnSet_set_and_add_system(void) { static void OnSetShared(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); Velocity *v = NULL; if (it->field_count >= 2) { - v = ecs_field(it, Velocity, 2); + v = ecs_field(it, Velocity, 1); } probe_iter(it); diff --git a/test/api/src/World.c b/test/api/src/World.c index 3807fa983..7ed71c2ff 100644 --- a/test/api/src/World.c +++ b/test/api/src/World.c @@ -7,8 +7,8 @@ void World_setup(void) { static void Move(ecs_iter_t *it) { - Position *pos = ecs_field(it, Position, 1); - Velocity *vel = ecs_field(it, Velocity, 2); + Position *pos = ecs_field(it, Position, 0); + Velocity *vel = ecs_field(it, Velocity, 1); probe_iter(it); int row; @@ -229,7 +229,7 @@ void World_entity_range_add_in_range_staged(void) { } void AddOutOfRange(ecs_iter_t *it) { - ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 2); + ecs_id_t ecs_id(Velocity) = ecs_field_id(it, 1); int i; for (i = 0; i < it->count; i ++) { @@ -333,7 +333,7 @@ void World_dim(void) { static void TOnLoad(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 0); @@ -343,7 +343,7 @@ void TOnLoad(ecs_iter_t *it) { static void TPostLoad(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 1); @@ -353,7 +353,7 @@ void TPostLoad(ecs_iter_t *it) { static void TPreUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 2); @@ -363,7 +363,7 @@ void TPreUpdate(ecs_iter_t *it) { static void TOnUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 3); @@ -373,7 +373,7 @@ void TOnUpdate(ecs_iter_t *it) { static void TOnValidate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 4); @@ -383,7 +383,7 @@ void TOnValidate(ecs_iter_t *it) { static void TPostUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 5); @@ -393,7 +393,7 @@ void TPostUpdate(ecs_iter_t *it) { static void TPreStore(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 6); @@ -403,7 +403,7 @@ void TPreStore(ecs_iter_t *it) { static void TOnStore(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 7); @@ -413,7 +413,7 @@ void TOnStore(ecs_iter_t *it) { static void TManual(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int i; for (i = 0; i < it->count; i ++) { test_int(p[i].x, 8); @@ -487,8 +487,8 @@ void World_phases_match_in_create(void) { static void TMergeOnLoad(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -499,8 +499,8 @@ void TMergeOnLoad(ecs_iter_t *it) { static void TMergePostLoad(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -511,8 +511,8 @@ void TMergePostLoad(ecs_iter_t *it) { static void TMergePreUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -523,8 +523,8 @@ void TMergePreUpdate(ecs_iter_t *it) { static void TMergeOnUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -535,8 +535,8 @@ void TMergeOnUpdate(ecs_iter_t *it) { static void TMergeOnValidate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -547,8 +547,8 @@ void TMergeOnValidate(ecs_iter_t *it) { static void TMergePostUpdate(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -559,8 +559,8 @@ void TMergePostUpdate(ecs_iter_t *it) { static void TMergePreStore(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -571,8 +571,8 @@ void TMergePreStore(ecs_iter_t *it) { static void TMergeOnStore(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { @@ -583,8 +583,8 @@ void TMergeOnStore(ecs_iter_t *it) { static void TMergeManual(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - ecs_id_t ecs_id(Position) = ecs_field_id(it, 1); + Position *p = ecs_field(it, Position, 0); + ecs_id_t ecs_id(Position) = ecs_field_id(it, 0); int i; for (i = 0; i < it->count; i ++) { diff --git a/test/api/src/util.c b/test/api/src/util.c index 870fe7315..c3d0c3b7a 100644 --- a/test/api/src/util.c +++ b/test/api/src/util.c @@ -20,9 +20,9 @@ void probe_system_w_ctx( int i; for (i = 0; i < ctx->term_count; i ++) { ctx->c[ctx->invoked][i] = it->ids[i]; - ctx->s[ctx->invoked][i] = ecs_field_src(it, i + 1); + ctx->s[ctx->invoked][i] = ecs_field_src(it, i); - ecs_id_t field_id = ecs_field_id(it, i + 1); + ecs_id_t field_id = ecs_field_id(it, i); test_assert(field_id != 0); } @@ -179,7 +179,7 @@ bool test_iter( expect_ptr = ECS_OFFSET(expect_ptr, size * entity_index); - void *component_ptr = ecs_field_w_size(it, size, t + 1); + void *component_ptr = ecs_field_w_size(it, size, t); if (!if_test_assert(component_ptr != NULL)) { return false; } diff --git a/test/cpp_api/src/Enum.cpp b/test/cpp_api/src/Enum.cpp index 1c157e4ba..46636e0f5 100644 --- a/test/cpp_api/src/Enum.cpp +++ b/test/cpp_api/src/Enum.cpp @@ -621,15 +621,15 @@ void Enum_query_enum_wildcard(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == e1) { - test_assert(it.pair(1).second() == ecs.id(StandardEnum::Red)); + test_assert(it.pair(0).second() == ecs.id(StandardEnum::Red)); count ++; } if (it.entity(index) == e2) { - test_assert(it.pair(1).second() == ecs.id(StandardEnum::Green)); + test_assert(it.pair(0).second() == ecs.id(StandardEnum::Green)); count ++; } if (it.entity(index) == e3) { - test_assert(it.pair(1).second() == ecs.id(StandardEnum::Blue)); + test_assert(it.pair(0).second() == ecs.id(StandardEnum::Blue)); count ++; } }); @@ -651,7 +651,7 @@ void Enum_query_enum_constant(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == e1); - test_assert(it.pair(1).second() == ecs.id(StandardEnum::Blue)); + test_assert(it.pair(0).second() == ecs.id(StandardEnum::Blue)); count ++; }); @@ -1009,7 +1009,7 @@ void Enum_query_union_enum(void) { // .build(); // q.iter([&](flecs::iter& it) { - // flecs::field colors = it.field(1); + // flecs::field colors = it.field(0); // test_int(it.count(), 3); // test_uint(it.entity(0), e1); // test_uint(it.entity(1), e2); diff --git a/test/cpp_api/src/Misc.cpp b/test/cpp_api/src/Misc.cpp index f4221327b..73e14a32d 100644 --- a/test/cpp_api/src/Misc.cpp +++ b/test/cpp_api/src/Misc.cpp @@ -122,8 +122,8 @@ static int obs_invoked_count = 0; static int trig_invoked_count = 0; void Sys(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); @@ -132,8 +132,8 @@ void Sys(ecs_iter_t *it) { } void Obs(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); @@ -142,7 +142,7 @@ void Obs(ecs_iter_t *it) { } void Trig(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); test_assert(p != NULL); diff --git a/test/cpp_api/src/Observer.cpp b/test/cpp_api/src/Observer.cpp index 78c0c9ede..4a8fa70f2 100644 --- a/test/cpp_api/src/Observer.cpp +++ b/test/cpp_api/src/Observer.cpp @@ -611,7 +611,7 @@ void Observer_get_query(void) { auto q = sys.query(); q.iter([&](flecs::iter &it) { - auto pos = it.field(1); + auto pos = it.field(0); for (auto i : it) { test_int(i, pos[i].x); count ++; diff --git a/test/cpp_api/src/Pairs.cpp b/test/cpp_api/src/Pairs.cpp index c709124c6..4b04a3221 100644 --- a/test/cpp_api/src/Pairs.cpp +++ b/test/cpp_api/src/Pairs.cpp @@ -147,7 +147,7 @@ void Pairs_system_1_pair_instance(void) { ecs.system<>() .expr("(Pair, *)") .iter([&](flecs::iter it) { - flecs::field tr(it, 1); + flecs::field tr(it, 0); invoke_count ++; for (auto i : it) { entity_count ++; @@ -176,7 +176,7 @@ void Pairs_system_2_pair_instances(void) { ecs.system<>() .expr("(Pair, *)") .iter([&](flecs::iter it) { - flecs::field tr(it, 1); + flecs::field tr(it, 0); invoke_count ++; for (auto i : it) { entity_count ++; diff --git a/test/cpp_api/src/Query.cpp b/test/cpp_api/src/Query.cpp index 0cedd3c75..c7681f92c 100644 --- a/test/cpp_api/src/Query.cpp +++ b/test/cpp_api/src/Query.cpp @@ -624,9 +624,9 @@ void Query_action_shared(void) { .build(); q.iter([](flecs::iter&it, Position *p) { - auto v = it.field(2); + auto v = it.field(1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { for (auto i : it) { p[i].x += v->x; p[i].y += v->y; @@ -674,7 +674,7 @@ void Query_action_optional(void) { auto q = world.query(); q.iter([](flecs::iter& it, Position *p, Velocity *v, Mass *m) { - if (it.is_set(2) && it.is_set(3)) { + if (it.is_set(1) && it.is_set(2)) { for (auto i : it) { p[i].x += v[i].x * m[i].value; p[i].y += v[i].y * m[i].value; @@ -854,8 +854,8 @@ void Query_signature(void) { auto q = world.query_builder<>().expr("Position, Velocity").build(); q.iter([](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(2); + auto p = it.field(0); + auto v = it.field(1); for (auto i : it) { p[i].x += v[i].x; @@ -881,8 +881,8 @@ void Query_signature_const(void) { auto q = world.query_builder<>().expr("Position, [in] Velocity").build(); q.iter([](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(2); + auto p = it.field(0); + auto v = it.field(1); for (auto i : it) { p[i].x += v[i].x; @@ -917,10 +917,10 @@ void Query_signature_shared(void) { .build(); q.iter([](flecs::iter&it) { - auto p = it.field(1); - auto v = it.field(2); + auto p = it.field(0); + auto v = it.field(1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { for (auto i : it) { p[i].x += v->x; p[i].y += v->y; @@ -968,11 +968,11 @@ void Query_signature_optional(void) { auto q = world.query_builder<>().expr("Position, ?Velocity, ?Mass").build(); q.iter([](flecs::iter& it) { - auto p = it.field(1); - auto v = it.field(2); - auto m = it.field(3); + auto p = it.field(0); + auto v = it.field(1); + auto m = it.field(2); - if (it.is_set(2) && it.is_set(3)) { + if (it.is_set(1) && it.is_set(2)) { for (auto i : it) { p[i].x += v[i].x * m[i].value; p[i].y += v[i].y * m[i].value; @@ -1200,7 +1200,7 @@ void Query_compare_term_id(void) { .build(); q.iter([&](flecs::iter& it) { - test_assert(it.id(1) == it.world().id()); + test_assert(it.id(0) == it.world().id()); test_assert(it.entity(0) == e); count ++; }); @@ -1441,7 +1441,7 @@ void Query_term_pair_type(void) { q.iter([&](flecs::iter& it) { test_int(it.count(), 1); - auto a = it.field(1); + auto a = it.field(0); test_int(a->amount, 10); test_assert(it.entity(0) == e1); @@ -1977,7 +1977,7 @@ void Query_instanced_query_w_base_iter(void) { test_assert(it.count() > 1); for (auto i : it) { - if (it.is_self(3)) { + if (it.is_self(2)) { p[i].x += v[i].x; p[i].y += v[i].y; } else { @@ -2321,7 +2321,7 @@ void Query_invalid_field_from_each_w_iter(void) { test_expect_abort(); q.each([&](flecs::iter& it, size_t index, Position& p) { - it.field(2); // not allowed from each + it.field(1); // not allowed from each }); } @@ -2341,7 +2341,7 @@ void Query_invalid_field_T_from_each_w_iter(void) { test_expect_abort(); q.each([&](flecs::iter& it, size_t index, Position& p) { - it.field(2); // not allowed from each + it.field(1); // not allowed from each }); } @@ -2361,7 +2361,7 @@ void Query_invalid_field_const_T_from_each_w_iter(void) { test_expect_abort(); q.each([&](flecs::iter& it, size_t index, Position& p) { - it.field(2); // not allowed from each + it.field(1); // not allowed from each }); } @@ -2383,7 +2383,7 @@ void Query_field_at_from_each_w_iter(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t row, Position& p) { - Velocity* v = static_cast(it.field_at(2, row)); + Velocity* v = static_cast(it.field_at(1, row)); if (it.entity(row) == e1) { test_int(v->x, 1); test_int(v->y, 2); @@ -2416,7 +2416,7 @@ void Query_field_at_T_from_each_w_iter(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t row, Position& p) { - Velocity& v = it.field_at(2, row); + Velocity& v = it.field_at(1, row); if (it.entity(row) == e1) { test_int(v.x, 1); test_int(v.y, 2); @@ -2449,7 +2449,7 @@ void Query_field_at_const_T_from_each_w_iter(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t row, Position& p) { - const Velocity& v = it.field_at(2, row); + const Velocity& v = it.field_at(1, row); if (it.entity(row) == e1) { test_int(v.x, 1); test_int(v.y, 2); @@ -2494,7 +2494,7 @@ void Query_field_at_from_each_w_iter_w_base_type(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t row, Position& p) { - Velocity* v = static_cast(it.field_at(2, row)); + Velocity* v = static_cast(it.field_at(1, row)); if (it.entity(row) == e1) { test_int(v->x, 1); test_int(v->y, 2); @@ -2772,9 +2772,9 @@ void Query_iter_get_pair_w_id(void) { int32_t count = 0; q.each([&](flecs::iter& it, size_t i) { - test_bool(true, it.id(1).is_pair()); - test_assert(it.id(1).first() == Rel); - test_assert(it.id(1).second() == Tgt); + test_bool(true, it.id(0).is_pair()); + test_assert(it.id(0).first() == Rel); + test_assert(it.id(0).second() == Tgt); test_assert(e == it.entity(i)); count ++; }); diff --git a/test/cpp_api/src/QueryBuilder.cpp b/test/cpp_api/src/QueryBuilder.cpp index 24bc6f29a..5b8e8259d 100644 --- a/test/cpp_api/src/QueryBuilder.cpp +++ b/test/cpp_api/src/QueryBuilder.cpp @@ -287,11 +287,11 @@ void QueryBuilder_id_pair_wildcard_term(void) { int count = 0; r.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == e1) { - test_assert(it.id(1) == ecs.pair(Likes, Apples)); + test_assert(it.id(0) == ecs.pair(Likes, Apples)); count ++; } if (it.entity(index) == e2) { - test_assert(it.id(1) == ecs.pair(Likes, Pears)); + test_assert(it.id(0) == ecs.pair(Likes, Pears)); count ++; } }); @@ -320,11 +320,11 @@ void QueryBuilder_type_pair_term(void) { int count = 0; r.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == e1) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); count ++; } if (it.entity(index) == e2) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); count ++; } }); @@ -355,13 +355,13 @@ void QueryBuilder_pair_term_w_var(void) { int count = 0; r.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == e1) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); test_assert(it.get_var("Food") == ecs.id()); test_assert(it.get_var(food_var) == ecs.id()); count ++; } if (it.entity(index) == e2) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); test_assert(it.get_var("Food") == ecs.id()); test_assert(it.get_var(food_var) == ecs.id()); count ++; @@ -400,21 +400,21 @@ void QueryBuilder_2_pair_terms_w_var(void) { int count = 0; r.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == Bob) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); test_assert(it.get_var("Food") == ecs.id()); test_assert(it.get_var(food_var) == ecs.id()); - test_assert((it.id(2) == ecs.pair(Alice))); + test_assert((it.id(1) == ecs.pair(Alice))); test_assert(it.get_var("Person") == Alice); test_assert(it.get_var(person_var) == Alice); count ++; } if (it.entity(index) == Alice) { - test_assert((it.id(1) == ecs.pair())); + test_assert((it.id(0) == ecs.pair())); test_assert(it.get_var("Food") == ecs.id()); test_assert(it.get_var(food_var) == ecs.id()); - test_assert((it.id(2) == ecs.pair(Bob))); + test_assert((it.id(1) == ecs.pair(Bob))); test_assert(it.get_var("Person") == Bob); test_assert(it.get_var(person_var) == Bob); count ++; @@ -449,7 +449,7 @@ void QueryBuilder_set_var(void) { .set_var(food_var, Pears) .each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == e2); - test_assert((it.id(1) == ecs.pair(Pears))); + test_assert((it.id(0) == ecs.pair(Pears))); test_assert(it.get_var("Food") == Pears); test_assert(it.get_var(food_var) == Pears); count ++; @@ -491,8 +491,8 @@ void QueryBuilder_set_2_vars(void) { .set_var(person_var, Bob) .each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == Alice); - test_assert((it.id(1) == ecs.pair(Pears))); - test_assert((it.id(2) == ecs.pair(Bob))); + test_assert((it.id(0) == ecs.pair(Pears))); + test_assert((it.id(1) == ecs.pair(Bob))); test_assert(it.get_var("Food") == Pears); test_assert(it.get_var(food_var) == Pears); test_assert(it.get_var("Person") == Bob); @@ -526,7 +526,7 @@ void QueryBuilder_set_var_by_name(void) { .set_var("Food", Pears) .each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == e2); - test_assert((it.id(1) == ecs.pair(Pears))); + test_assert((it.id(0) == ecs.pair(Pears))); count ++; }); test_int(count, 1); @@ -565,8 +565,8 @@ void QueryBuilder_set_2_vars_by_name(void) { .set_var("Person", Bob) .each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == Alice); - test_assert((it.id(1) == ecs.pair(Pears))); - test_assert((it.id(2) == ecs.pair(Bob))); + test_assert((it.id(0) == ecs.pair(Pears))); + test_assert((it.id(1) == ecs.pair(Bob))); test_assert(it.get_var("Food") == Pears); test_assert(it.get_var(food_var) == Pears); test_assert(it.get_var("Person") == Bob); @@ -595,7 +595,7 @@ void QueryBuilder_expr_w_var(void) { int32_t count = 0; r.each([&](flecs::iter& it, size_t index) { test_assert(it.entity(index) == e); - test_assert(it.pair(1).second() == obj); + test_assert(it.pair(0).second() == obj); count ++; }); @@ -852,8 +852,8 @@ void QueryBuilder_singleton_term(void) { int32_t count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); - test_assert(!it.is_self(2)); + auto o = it.field(1); + test_assert(!it.is_self(1)); test_int(o->value, 10); const Other& o_ref = *o; @@ -886,8 +886,8 @@ void QueryBuilder_isa_superset_term(void) { int32_t count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); - test_assert(!it.is_self(2)); + auto o = it.field(1); + test_assert(!it.is_self(1)); test_int(o->value, 10); for (auto i : it) { @@ -920,9 +920,9 @@ void QueryBuilder_isa_self_superset_term(void) { int32_t owned_count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); + auto o = it.field(1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { test_int(o->value, 10); } else { for (auto i : it) { @@ -959,8 +959,8 @@ void QueryBuilder_childof_superset_term(void) { int32_t count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); - test_assert(!it.is_self(2)); + auto o = it.field(1); + test_assert(!it.is_self(1)); test_int(o->value, 10); for (auto i : it) { @@ -993,9 +993,9 @@ void QueryBuilder_childof_self_superset_term(void) { int32_t owned_count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); + auto o = it.field(1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { test_int(o->value, 10); } else { for (auto i : it) { @@ -1636,12 +1636,12 @@ void QueryBuilder_optional_tag_is_set(void) { count += it.count(); if (it.entity(0) == e_1) { + test_bool(it.is_set(0), true); test_bool(it.is_set(1), true); - test_bool(it.is_set(2), true); } else { test_assert(it.entity(0) == e_2); - test_bool(it.is_set(1), true); - test_bool(it.is_set(2), false); + test_bool(it.is_set(0), true); + test_bool(it.is_set(1), false); } }); @@ -2466,8 +2466,8 @@ void QueryBuilder_up_w_type(void) { int32_t count = 0; q.iter([&](flecs::iter& it, Self *s) { - auto o = it.field(2); - test_assert(!it.is_self(2)); + auto o = it.field(1); + test_assert(!it.is_self(1)); test_int(o->value, 10); for (auto i : it) { @@ -2904,7 +2904,7 @@ void QueryBuilder_name_arg(void) { count ++; test_int(p->x, 10); test_int(p->y, 20); - test_assert(it.src(1) == e); + test_assert(it.src(0) == e); }); test_int(count, 1); @@ -2922,8 +2922,8 @@ void QueryBuilder_const_in_term(void) { int32_t count = 0; f.iter([&](flecs::iter& it) { - auto p = it.field(1); - test_assert(it.is_readonly(1)); + auto p = it.field(0); + test_assert(it.is_readonly(0)); for (auto i : it) { count ++; test_int(p[i].x, 10); @@ -2947,9 +2947,9 @@ void QueryBuilder_const_optional(void) { int32_t count = 0, set_count = 0; f.iter([&](flecs::iter& it) { test_int(it.count(), 1); - if (it.is_set(2)) { - auto p = it.field(2); - test_assert(it.is_readonly(2)); + if (it.is_set(1)) { + auto p = it.field(1); + test_assert(it.is_readonly(1)); test_int(p->x, 10); test_int(p->y, 20); set_count ++; @@ -2979,8 +2979,8 @@ void QueryBuilder_2_terms_w_expr(void) { int32_t count = 0; f.each([&](flecs::iter& it, size_t index) { if (it.entity(index) == e1) { - test_assert(it.id(1) == a); - test_assert(it.id(2) == b); + test_assert(it.id(0) == a); + test_assert(it.id(1) == b); count ++; } }); @@ -3107,7 +3107,7 @@ void QueryBuilder_iter_column_w_const_as_array(void) { int32_t count = 0; f.iter([&](flecs::iter& it) { - const auto p = it.field(1); + const auto p = it.field(0); for (auto i : it) { p[i].x += 1; p[i].y += 2; @@ -3140,7 +3140,7 @@ void QueryBuilder_iter_column_w_const_as_ptr(void) { int32_t count = 0; f.iter([&](flecs::iter& it) { - const auto p = it.field(1); + const auto p = it.field(0); for (size_t i = 0; i < it.count(); i ++) { test_int(p->x, 10); test_int(p->y, 20); @@ -3164,7 +3164,7 @@ void QueryBuilder_iter_column_w_const_deref(void) { int32_t count = 0; f.iter([&](flecs::iter& it) { - const auto p = it.field(1); + const auto p = it.field(0); Position pv = *p; for (size_t i = 0; i < it.count(); i ++) { test_int(pv.x, 10); diff --git a/test/cpp_api/src/Singleton.cpp b/test/cpp_api/src/Singleton.cpp index ace1c3b7c..877884f7e 100644 --- a/test/cpp_api/src/Singleton.cpp +++ b/test/cpp_api/src/Singleton.cpp @@ -107,7 +107,7 @@ void Singleton_singleton_system(void) { world.system<>() .expr("[inout] Position($)") .iter([](flecs::iter it) { - auto p = it.field(1); + auto p = it.field(0); test_int(p->x, 10); test_int(p->y, 20); diff --git a/test/cpp_api/src/System.cpp b/test/cpp_api/src/System.cpp index d29e33b95..d09e7ffce 100644 --- a/test/cpp_api/src/System.cpp +++ b/test/cpp_api/src/System.cpp @@ -68,9 +68,9 @@ void System_iter_shared(void) { world.system().expr("Velocity(self|up(IsA))") .iter([](flecs::iter&it, Position *p) { - auto v = it.field(2); + auto v = it.field(1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { for (auto i : it) { p[i].x += v->x; p[i].y += v->y; @@ -116,7 +116,7 @@ void System_iter_optional(void) { world.system() .iter([](flecs::iter& it, Position *p, Velocity *v, Mass *m) { - if (it.is_set(2) && it.is_set(3)) { + if (it.is_set(1) && it.is_set(2)) { for (auto i : it) { p[i].x += v[i].x * m[i].value; p[i].y += v[i].y * m[i].value; @@ -279,8 +279,8 @@ void System_signature(void) { world.system<>().expr("Position, Velocity") .iter([](flecs::iter&it) { - flecs::field p(it, 1); - flecs::field v(it, 2); + flecs::field p(it, 0); + flecs::field v(it, 1); for (auto i : it) { p[i].x += v[i].x; @@ -308,8 +308,8 @@ void System_signature_const(void) { world.system<>().expr("Position, [in] Velocity") .iter([](flecs::iter&it) { - flecs::field p(it, 1); - flecs::field v(it, 2); + flecs::field p(it, 0); + flecs::field v(it, 1); for (auto i : it) { p[i].x += v[i].x; @@ -344,10 +344,10 @@ void System_signature_shared(void) { world.system<>().expr("Position, [in] Velocity(self|up(IsA))") .iter([](flecs::iter&it) { - flecs::field p(it, 1); - flecs::field v(it, 2); + flecs::field p(it, 0); + flecs::field v(it, 1); - if (!it.is_self(2)) { + if (!it.is_self(1)) { for (auto i : it) { p[i].x += v->x; p[i].y += v->y; @@ -393,11 +393,11 @@ void System_signature_optional(void) { world.system<>().expr("Position, ?Velocity, ?Mass") .iter([](flecs::iter& it) { - flecs::field p(it, 1); - flecs::field v(it, 2); - flecs::field m(it, 3); + flecs::field p(it, 0); + flecs::field v(it, 1); + flecs::field m(it, 2); - if (it.is_set(2) && it.is_set(3)) { + if (it.is_set(1) && it.is_set(2)) { for (auto i : it) { p[i].x += v[i].x * m[i].value; p[i].y += v[i].y * m[i].value; @@ -671,7 +671,7 @@ void System_get_query(void) { auto q = sys.query(); q.iter([&](flecs::iter &it) { - auto pos = it.field(1); + auto pos = it.field(0); for (auto i : it) { test_int(i, pos[i].x); count ++; @@ -1504,7 +1504,7 @@ void System_instanced_query_w_base_iter(void) { test_assert(it.count() > 1); for (auto i : it) { - if (it.is_self(3)) { + if (it.is_self(2)) { p[i].x += v[i].x; p[i].y += v[i].y; } else { diff --git a/test/cpp_api/src/SystemBuilder.cpp b/test/cpp_api/src/SystemBuilder.cpp index 1c71a2360..f00e3dec6 100644 --- a/test/cpp_api/src/SystemBuilder.cpp +++ b/test/cpp_api/src/SystemBuilder.cpp @@ -326,8 +326,8 @@ void SystemBuilder_singleton_term(void) { auto s = ecs.system() .with().singleton().in() .iter([&](flecs::iter& it, Entity *e) { - auto s = it.field(2); - test_assert(!it.is_self(2)); + auto s = it.field(1); + test_assert(!it.is_self(1)); test_int(s->value, 10); const Singleton& s_ref = *s; diff --git a/test/cpp_api/src/WorldFactory.cpp b/test/cpp_api/src/WorldFactory.cpp index 19efc76e1..ab71ad47a 100644 --- a/test/cpp_api/src/WorldFactory.cpp +++ b/test/cpp_api/src/WorldFactory.cpp @@ -93,8 +93,8 @@ void WorldFactory_system_w_expr(void) { auto s = ecs.system<>("MySystem") .expr("Position, [in] Velocity") .iter([](flecs::iter it) { - flecs::field p(it, 1); - flecs::field v(it, 2); + flecs::field p(it, 0); + flecs::field v(it, 1); for (auto i : it) { p[i].x += v[i].x; @@ -148,8 +148,8 @@ void WorldFactory_query_w_expr(void) { .set({1, 2}); q.iter([](flecs::iter it) { - flecs::field p(it, 1); - flecs::field v(it, 2); + flecs::field p(it, 0); + flecs::field v(it, 1); for (auto i : it) { p[i].x += v[i].x; diff --git a/test/custom_builds/c/pipeline/src/main.c b/test/custom_builds/c/pipeline/src/main.c index 6aef461f2..38bbd976b 100644 --- a/test/custom_builds/c/pipeline/src/main.c +++ b/test/custom_builds/c/pipeline/src/main.c @@ -5,8 +5,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/test/custom_builds/c/pipeline_w_system/src/main.c b/test/custom_builds/c/pipeline_w_system/src/main.c index 743632b8f..e977971a4 100644 --- a/test/custom_builds/c/pipeline_w_system/src/main.c +++ b/test/custom_builds/c/pipeline_w_system/src/main.c @@ -5,8 +5,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/test/custom_builds/c/system/src/main.c b/test/custom_builds/c/system/src/main.c index 94bd86957..c2de6520e 100644 --- a/test/custom_builds/c/system/src/main.c +++ b/test/custom_builds/c/system/src/main.c @@ -5,8 +5,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/test/custom_builds/c/timer/src/main.c b/test/custom_builds/c/timer/src/main.c index 67ee743da..9ca2e2df6 100644 --- a/test/custom_builds/c/timer/src/main.c +++ b/test/custom_builds/c/timer/src/main.c @@ -5,8 +5,8 @@ typedef struct { } Position, Velocity; void Move(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); - Velocity *v = ecs_field(it, Velocity, 2); + Position *p = ecs_field(it, Position, 0); + Velocity *v = ecs_field(it, Velocity, 1); for (int i = 0; i < it->count; i ++) { p[i].x += v[i].x; diff --git a/test/meta/src/SerializeIterToJson.c b/test/meta/src/SerializeIterToJson.c index 152b500fb..8ce7bd316 100644 --- a/test/meta/src/SerializeIterToJson.c +++ b/test/meta/src/SerializeIterToJson.c @@ -2313,7 +2313,7 @@ void SerializeIterToJson_serialize_paged_iterator(void) { test_uint(e3, pit.entities[1]); test_uint(e4, pit.entities[2]); - Position *p = ecs_field(&pit, Position, 1); + Position *p = ecs_field(&pit, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -2355,12 +2355,12 @@ void SerializeIterToJson_serialize_paged_iterator_w_optional_component(void) { test_bool(true, ecs_page_next(&pit)); test_int(2, pit.count); - test_bool(true, ecs_field_is_set(&pit, 1)); - test_bool(false, ecs_field_is_set(&pit, 2)); + test_bool(true, ecs_field_is_set(&pit, 0)); + test_bool(false, ecs_field_is_set(&pit, 1)); test_uint(e2, pit.entities[0]); test_uint(e3, pit.entities[1]); - Position *p = ecs_field(&pit, Position, 1); + Position *p = ecs_field(&pit, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -2368,15 +2368,15 @@ void SerializeIterToJson_serialize_paged_iterator_w_optional_component(void) { test_bool(true, ecs_page_next(&pit)); test_int(1, pit.count); + test_bool(true, ecs_field_is_set(&pit, 0)); test_bool(true, ecs_field_is_set(&pit, 1)); - test_bool(true, ecs_field_is_set(&pit, 2)); test_uint(e4, pit.entities[0]); - p = ecs_field(&pit, Position, 1); + p = ecs_field(&pit, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); - Velocity *v = ecs_field(&pit, Velocity, 2); + Velocity *v = ecs_field(&pit, Velocity, 1); test_int(v[0].x, 1); test_int(v[0].y, 2); @@ -2414,12 +2414,12 @@ void SerializeIterToJson_serialize_paged_iterator_w_optional_tag(void) { test_bool(true, ecs_page_next(&pit)); test_int(2, pit.count); - test_bool(true, ecs_field_is_set(&pit, 1)); - test_bool(false, ecs_field_is_set(&pit, 2)); + test_bool(true, ecs_field_is_set(&pit, 0)); + test_bool(false, ecs_field_is_set(&pit, 1)); test_uint(e2, pit.entities[0]); test_uint(e3, pit.entities[1]); - Position *p = ecs_field(&pit, Position, 1); + Position *p = ecs_field(&pit, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); @@ -2427,11 +2427,11 @@ void SerializeIterToJson_serialize_paged_iterator_w_optional_tag(void) { test_bool(true, ecs_page_next(&pit)); test_int(1, pit.count); + test_bool(true, ecs_field_is_set(&pit, 0)); test_bool(true, ecs_field_is_set(&pit, 1)); - test_bool(true, ecs_field_is_set(&pit, 2)); test_uint(e4, pit.entities[0]); - p = ecs_field(&pit, Position, 1); + p = ecs_field(&pit, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); diff --git a/test/query/src/Basic.c b/test/query/src/Basic.c index 47bcb36ee..e302150a1 100644 --- a/test/query/src/Basic.c +++ b/test/query/src/Basic.c @@ -58,9 +58,9 @@ void Basic_1_fact_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -94,10 +94,10 @@ void Basic_1_fact_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - const Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -135,9 +135,9 @@ void Basic_1_fact_w_tag_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -172,9 +172,9 @@ void Basic_1_fact_w_component_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -216,12 +216,12 @@ void Basic_2_facts_same_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -263,17 +263,17 @@ void Basic_2_facts_same_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -319,12 +319,12 @@ void Basic_2_facts_same_src_w_tag_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -367,12 +367,12 @@ void Basic_2_facts_same_src_w_component_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_pair(ecs_id(Position), TgtB), ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(ecs_id(Position), TgtB), ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -415,12 +415,12 @@ void Basic_2_facts_other_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -463,17 +463,17 @@ void Basic_2_facts_other_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -520,12 +520,12 @@ void Basic_2_facts_other_src_w_tag_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -569,12 +569,12 @@ void Basic_2_facts_other_src_w_component_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_pair(ecs_id(Position), TgtB), ecs_field_id(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(ecs_id(Position), TgtB), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -610,9 +610,9 @@ void Basic_1_fact_w_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(EcsWildcard, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -649,9 +649,9 @@ void Basic_1_fact_w_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -688,9 +688,9 @@ void Basic_1_fact_w_pair_any_rel(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -721,9 +721,9 @@ void Basic_1_fact_w_pair_any_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -759,12 +759,12 @@ void Basic_2_facts_same_src_w_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(EcsWildcard, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -801,12 +801,12 @@ void Basic_2_facts_same_src_w_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -843,9 +843,9 @@ void Basic_2_facts_same_src_w_pair_any_rel(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -876,12 +876,12 @@ void Basic_2_facts_same_src_w_pair_any_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); test_uint(ent, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ent, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -920,12 +920,12 @@ void Basic_2_facts_other_src_w_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(EcsWildcard, ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -965,12 +965,12 @@ void Basic_2_facts_other_src_w_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1010,12 +1010,12 @@ void Basic_2_facts_other_src_w_pair_any_rel(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1049,12 +1049,12 @@ void Basic_2_facts_other_src_w_pair_any_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(ent1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(ent1, ecs_field_src(&it, 1)); + test_uint(ent2, ecs_field_src(&it, 1)); test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ent2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1090,9 +1090,9 @@ void Basic_1_this_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(false, ecs_query_next(&it)); @@ -1130,12 +1130,12 @@ void Basic_1_this_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); test_int(p[1].y, 40); @@ -1175,9 +1175,9 @@ void Basic_1_this_src_w_tag_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(false, ecs_query_next(&it)); @@ -1216,12 +1216,12 @@ void Basic_1_this_src_w_component_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); test_int(p[1].y, 40); @@ -1265,16 +1265,16 @@ void Basic_1_this_src_w_tag_2_tables(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -1316,24 +1316,24 @@ void Basic_1_this_src_w_component_2_tables(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); } test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -1379,16 +1379,16 @@ void Basic_1_this_src_w_tag_pair_2_tables(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -1431,24 +1431,24 @@ void Basic_1_this_src_w_component_pair_2_tables(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); } test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(ecs_id(Position), TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -1491,12 +1491,12 @@ void Basic_2_this_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(false, ecs_query_next(&it)); @@ -1538,19 +1538,19 @@ void Basic_2_this_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); test_int(p[1].y, 40); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v[0].x, 1); test_int(v[0].y, 2); test_int(v[1].x, 3); test_int(v[1].y, 4); @@ -1592,12 +1592,12 @@ void Basic_2_this_src_ent_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(false, ecs_query_next(&it)); @@ -1639,19 +1639,19 @@ void Basic_2_this_src_ent_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); test_int(p[1].y, 40); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v[0].x, 1); test_int(v[0].y, 2); test_bool(false, ecs_query_next(&it)); @@ -1692,12 +1692,12 @@ void Basic_2_ent_src_this_src_w_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(false, ecs_query_next(&it)); @@ -1739,18 +1739,18 @@ void Basic_2_ent_src_this_src_w_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v[0].x, 1); test_int(v[0].y, 2); - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); test_int(p[1].y, 40); @@ -1789,9 +1789,9 @@ void Basic_recycled_tag(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1827,9 +1827,9 @@ void Basic_recycled_src(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1866,9 +1866,9 @@ void Basic_recycled_pair_rel(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1905,9 +1905,9 @@ void Basic_recycled_pair_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1954,44 +1954,44 @@ void Basic_this_src_w_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2046,44 +2046,44 @@ void Basic_this_src_w_pair_rel_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2138,44 +2138,44 @@ void Basic_this_src_w_pair_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2226,44 +2226,44 @@ void Basic_this_src_w_pair_rel_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2363,18 +2363,18 @@ void Basic_this_src_w_any_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2429,18 +2429,18 @@ void Basic_this_src_w_pair_rel_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2495,18 +2495,18 @@ void Basic_this_src_w_pair_tgt_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2557,18 +2557,18 @@ void Basic_this_src_w_pair_rel_tgt_any(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -2609,21 +2609,21 @@ void Basic_ent_src_w_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelC, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2665,21 +2665,21 @@ void Basic_ent_src_w_pair_rel_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2721,21 +2721,21 @@ void Basic_ent_src_w_pair_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2770,27 +2770,27 @@ void Basic_ent_src_w_pair_rel_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2827,13 +2827,13 @@ void Basic_1_wildcard_src(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2871,13 +2871,13 @@ void Basic_1_wildcard_src_w_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -2924,31 +2924,31 @@ void Basic_2_wildcard_src(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2996,31 +2996,31 @@ void Basic_2_wildcard_src_w_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -3055,9 +3055,9 @@ void Basic_rule_w_iter_next(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3097,20 +3097,20 @@ void Basic_1_wildcard_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3152,20 +3152,20 @@ void Basic_1_wildcard_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3207,22 +3207,22 @@ void Basic_1_wildcard_src_w_pair_tgt_this(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, this_var)); test_uint(TgtA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, this_var)); test_uint(TgtB, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, this_var)); test_uint(TgtC, it.entities[0]); @@ -3265,22 +3265,22 @@ void Basic_1_wildcard_src_w_pair_rel_this(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, this_var)); test_uint(RelA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, this_var)); test_uint(RelB, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, this_var)); test_uint(RelC, it.entities[0]); @@ -3319,9 +3319,9 @@ void Basic_1_any_src(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3357,10 +3357,10 @@ void Basic_1_any_src_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_assert(NULL == ecs_field(&it, Position, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_assert(NULL == ecs_field(&it, Position, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3400,15 +3400,15 @@ void Basic_1_any_src_component_w_this_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e, it.entities[0]); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_assert(NULL == ecs_field(&it, Position, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_assert(NULL == ecs_field(&it, Position, 0)); { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 10); test_int(v->y, 20); @@ -3449,7 +3449,7 @@ void Basic_1_any_src_w_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3495,7 +3495,7 @@ void Basic_2_any_src(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3542,7 +3542,7 @@ void Basic_2_any_src_w_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3582,17 +3582,17 @@ void Basic_1_any_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3634,24 +3634,24 @@ void Basic_1_any_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3692,26 +3692,26 @@ void Basic_1_any_src_w_pair_tgt_this(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(TgtC, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(TgtB, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(TgtA, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3753,26 +3753,26 @@ void Basic_1_any_src_w_pair_rel_this(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(RelC, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(RelB, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, this_var)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(RelA, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3815,9 +3815,9 @@ void Basic_1_any_src_any_tgt_w_rel_fixed(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3827,8 +3827,8 @@ void Basic_1_any_src_any_tgt_w_rel_fixed(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3869,9 +3869,9 @@ void Basic_1_any_src_any_rel_w_tgt_fixed(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3881,8 +3881,8 @@ void Basic_1_any_src_any_rel_w_tgt_fixed(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3909,8 +3909,8 @@ void Basic_1_any_src_w_childof_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3942,9 +3942,9 @@ void Basic_1_any_src_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3988,21 +3988,21 @@ void Basic_1_any_src_pair_tgt_wildcard_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4013,15 +4013,15 @@ void Basic_1_any_src_pair_tgt_wildcard_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4067,21 +4067,21 @@ void Basic_1_any_src_pair_rel_wildcard_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4092,15 +4092,15 @@ void Basic_1_any_src_pair_rel_wildcard_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4151,8 +4151,8 @@ void Basic_1_any_src_any_tgt_w_rel_fixed_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4202,8 +4202,8 @@ void Basic_1_any_src_any_rel_w_tgt_fixed_empty(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4362,14 +4362,14 @@ void Basic_not_instanced_table_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(3, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_uint(e3, it.entities[2]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); @@ -4403,11 +4403,11 @@ void Basic_not_instanced_entity_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4444,20 +4444,20 @@ void Basic_not_instanced_mixed_src(void) { ecs_iter_t it = ecs_query_iter(world, r); { test_bool(true, ecs_query_next(&it)); - test_int(1, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(1, it.count); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e0, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -4466,19 +4466,19 @@ void Basic_not_instanced_mixed_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e0, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -4487,19 +4487,19 @@ void Basic_not_instanced_mixed_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e0, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 30); test_int(p->y, 40); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -4552,8 +4552,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e1); test_int(p->x, 10); @@ -4564,8 +4564,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e2); test_int(p->x, 20); @@ -4576,8 +4576,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e3); test_int(p->x, 30); @@ -4588,8 +4588,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e4); test_int(p->x, 40); @@ -4600,8 +4600,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e5); test_int(p->x, 50); @@ -4612,8 +4612,8 @@ void Basic_not_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 2); test_int(it.entities[0], e6); test_int(p[0].x, 60); @@ -4656,14 +4656,14 @@ void Basic_instanced_table_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(3, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_uint(e3, it.entities[2]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); @@ -4698,11 +4698,11 @@ void Basic_instanced_entity_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4741,20 +4741,20 @@ void Basic_instanced_mixed_src(void) { { test_bool(true, ecs_query_next(&it)); test_int(3, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_uint(e3, it.entities[2]); - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); test_int(p[2].x, 30); test_int(p[2].y, 40); - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_int(v->x, 1); test_int(v->y, 2); } @@ -4807,8 +4807,8 @@ void Basic_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 3); test_int(it.entities[0], e1); test_int(it.entities[1], e2); @@ -4825,8 +4825,8 @@ void Basic_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 2); test_int(it.entities[0], e4); test_int(it.entities[1], e5); @@ -4840,8 +4840,8 @@ void Basic_instanced_inherited(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 2); test_int(it.entities[0], e6); test_int(p[0].x, 60); @@ -4888,11 +4888,11 @@ void Basic_in_term(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_readonly(&it, 1)); - const Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_readonly(&it, 0)); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4929,11 +4929,11 @@ void Basic_out_term(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_readonly(&it, 1)); - const Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_readonly(&it, 0)); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4970,11 +4970,11 @@ void Basic_inout_term(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_readonly(&it, 1)); - const Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_readonly(&it, 0)); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -5011,11 +5011,11 @@ void Basic_nodata_term(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_readonly(&it, 1)); - const Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_readonly(&it, 0)); + const Position *p = ecs_field(&it, Position, 0); test_assert(p == NULL); test_bool(false, ecs_query_next(&it)); } @@ -5147,8 +5147,8 @@ void Basic_iter_empty_source(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Foo), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Foo), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5173,8 +5173,8 @@ void Basic_iter_empty_source_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(EcsWildcard, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(EcsWildcard, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5200,9 +5200,9 @@ void Basic_iter_empty_source_2_terms(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_id(Foo), ecs_field_id(&it, 1)); - test_uint(ecs_id(Bar), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Foo), ecs_field_id(&it, 0)); + test_uint(ecs_id(Bar), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5228,8 +5228,8 @@ void Basic_iter_empty_source_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5255,8 +5255,8 @@ void Basic_iter_empty_source_pair_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, Tgt), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(EcsWildcard, Tgt), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5283,9 +5283,9 @@ void Basic_iter_empty_source_2_terms_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Bar, Tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Bar, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5316,10 +5316,10 @@ void Basic_iter_empty_source_2_terms_mixed(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5350,10 +5350,10 @@ void Basic_iter_empty_source_2_terms_mixed_pair(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Bar, Tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Bar, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5384,10 +5384,10 @@ void Basic_iter_empty_source_2_terms_mixed_pair_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, Tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Foo, Tgt), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5417,9 +5417,9 @@ void Basic_this_var_w_empty_entity(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(t, it.entities[0]); - test_uint(ecs_pair(Rel, t), ecs_field_id(&it, 1)); - test_uint(e, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, t), ecs_field_id(&it, 0)); + test_uint(e, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -5459,8 +5459,8 @@ void Basic_match_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5468,8 +5468,8 @@ void Basic_match_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -5510,8 +5510,8 @@ void Basic_match_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5519,8 +5519,8 @@ void Basic_match_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -5583,7 +5583,7 @@ void Basic_match_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -5592,8 +5592,8 @@ void Basic_match_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5603,8 +5603,8 @@ void Basic_match_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5614,8 +5614,8 @@ void Basic_match_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5663,9 +5663,9 @@ void Basic_match_disabled_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5673,9 +5673,9 @@ void Basic_match_disabled_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); @@ -5720,9 +5720,9 @@ void Basic_match_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5730,9 +5730,9 @@ void Basic_match_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); ecs_query_fini(r_1); @@ -5799,7 +5799,7 @@ void Basic_match_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -5808,8 +5808,8 @@ void Basic_match_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5819,8 +5819,8 @@ void Basic_match_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5830,8 +5830,8 @@ void Basic_match_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -5875,8 +5875,8 @@ void Basic_match_self_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5884,8 +5884,8 @@ void Basic_match_self_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -5926,8 +5926,8 @@ void Basic_match_self_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -5935,8 +5935,8 @@ void Basic_match_self_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -5999,7 +5999,7 @@ void Basic_match_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -6007,8 +6007,8 @@ void Basic_match_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6017,8 +6017,8 @@ void Basic_match_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6027,8 +6027,8 @@ void Basic_match_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6072,8 +6072,8 @@ void Basic_match_optional_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6081,14 +6081,14 @@ void Basic_match_optional_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -6129,8 +6129,8 @@ void Basic_match_optional_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6138,14 +6138,14 @@ void Basic_match_optional_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -6208,7 +6208,7 @@ void Basic_match_optional_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -6216,14 +6216,14 @@ void Basic_match_optional_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6232,14 +6232,14 @@ void Basic_match_optional_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6248,26 +6248,26 @@ void Basic_match_optional_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6315,9 +6315,9 @@ void Basic_match_optional_disabled_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6325,16 +6325,16 @@ void Basic_match_optional_disabled_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); @@ -6379,9 +6379,9 @@ void Basic_match_optional_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6389,16 +6389,16 @@ void Basic_match_optional_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); ecs_query_fini(r_1); @@ -6465,7 +6465,7 @@ void Basic_match_optional_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -6473,14 +6473,14 @@ void Basic_match_optional_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6489,14 +6489,14 @@ void Basic_match_optional_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6505,26 +6505,26 @@ void Basic_match_optional_disabled_prefab_this_tgt(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6568,8 +6568,8 @@ void Basic_match_optional_self_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6577,14 +6577,14 @@ void Basic_match_optional_self_disabled(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -6625,8 +6625,8 @@ void Basic_match_optional_self_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); it = ecs_query_iter(world, r_2); @@ -6634,14 +6634,14 @@ void Basic_match_optional_self_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); @@ -6704,7 +6704,7 @@ void Basic_match_optional_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); + test_int(ecs_field_id(&it, 0), TagA); test_assert(!ecs_query_next(&it)); { @@ -6712,14 +6712,14 @@ void Basic_match_optional_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6728,14 +6728,14 @@ void Basic_match_optional_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6744,26 +6744,26 @@ void Basic_match_optional_self_disabled_prefab(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_3); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_4); - test_int(ecs_field_id(&it, 1), TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_int(ecs_field_id(&it, 0), TagA); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(!ecs_query_next(&it)); } @@ -6798,16 +6798,16 @@ void Basic_inout_none_first_term(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p == NULL); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -6842,18 +6842,18 @@ void Basic_inout_none_second_term(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v == NULL); } @@ -6887,13 +6887,13 @@ void Basic_inout_none_singleton(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - test_assert(ecs_field(&it, Velocity, 2) == NULL); + test_assert(ecs_field(&it, Velocity, 1) == NULL); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -6926,13 +6926,13 @@ void Basic_inout_none_singleton_w_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - test_assert(ecs_field(&it, Velocity, 2) == NULL); + test_assert(ecs_field(&it, Velocity, 1) == NULL); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -6964,13 +6964,13 @@ void Basic_inout_none_component_w_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - test_assert(ecs_field(&it, Velocity, 2) == NULL); + test_assert(ecs_field(&it, Velocity, 1) == NULL); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -7001,16 +7001,16 @@ void Basic_no_data_rule(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p == NULL); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v == NULL); } @@ -7054,7 +7054,7 @@ void Basic_frame_offset(void) { test_assert(it.entities[0] == e1); test_assert(it.entities[1] == e2); test_assert(it.ids[0] == ecs_id(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), true); test_int(it.count, 2); @@ -7063,7 +7063,7 @@ void Basic_frame_offset(void) { test_assert(it.entities[0] == e3); test_assert(it.entities[1] == e4); test_assert(it.ids[0] == ecs_id(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); @@ -7071,7 +7071,7 @@ void Basic_frame_offset(void) { test_assert(it.entities != NULL); test_assert(it.entities[0] == e5); test_assert(it.ids[0] == ecs_id(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), false); @@ -7113,7 +7113,7 @@ void Basic_frame_offset_no_data(void) { test_assert(it.entities[0] == e1); test_assert(it.entities[1] == e2); test_assert(it.ids[0] == TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), true); test_int(it.count, 2); @@ -7122,7 +7122,7 @@ void Basic_frame_offset_no_data(void) { test_assert(it.entities[0] == e3); test_assert(it.entities[1] == e4); test_assert(it.ids[0] == TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); @@ -7130,7 +7130,7 @@ void Basic_frame_offset_no_data(void) { test_assert(it.entities != NULL); test_assert(it.entities[0] == e5); test_assert(it.ids[0] == TagA); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(ecs_query_next(&it), false); @@ -7176,32 +7176,32 @@ void Basic_match_empty_tables(void) { test_bool( ecs_query_next(&it), true); test_assert(it.table == t1); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t2); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t3); test_int(it.count, 1); test_int(it.entities[0], e3); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t4); test_int(it.count, 1); test_int(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), false); @@ -7247,28 +7247,28 @@ void Basic_match_empty_tables_no_data(void) { test_bool( ecs_query_next(&it), true); test_assert(it.table == t1); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t2); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t3); test_int(it.count, 1); test_int(it.entities[0], e3); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t4); test_int(it.count, 1); test_int(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), false); @@ -7314,22 +7314,22 @@ void Basic_match_empty_tables_w_not(void) { test_bool( ecs_query_next(&it), true); test_assert(it.table == t1); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t3); test_int(it.count, 1); test_int(it.entities[0], e3); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t4); test_int(it.count, 1); test_int(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), Foo); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), Foo); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), false); @@ -7371,28 +7371,28 @@ void Basic_match_empty_tables_w_wildcard(void) { test_bool( ecs_query_next(&it), true); test_assert(it.table == t1); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_pair(Rel, TgtA)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_pair(Rel, TgtA)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t2); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_pair(Rel, TgtB)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_pair(Rel, TgtB)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t3); test_int(it.count, 1); test_int(it.entities[0], e3); - test_uint(ecs_field_id(&it, 1), ecs_pair(Rel, TgtC)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_pair(Rel, TgtC)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t4); test_int(it.count, 1); test_int(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), ecs_pair(Rel, TgtD)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_pair(Rel, TgtD)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), false); @@ -7423,12 +7423,12 @@ void Basic_match_empty_tables_w_no_empty_tables(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -7474,32 +7474,32 @@ void Basic_match_empty_tables_trivial(void) { test_bool( ecs_query_next(&it), true); test_assert(it.table == t1); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t2); test_int(it.count, 0); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t3); test_int(it.count, 1); test_int(it.entities[0], e3); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), true); test_assert(it.table == t4); test_int(it.count, 1); test_int(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool( ecs_query_next(&it), false); @@ -7532,14 +7532,14 @@ void Basic_oneof_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -7572,14 +7572,14 @@ void Basic_oneof_any(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, EcsWildcard), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, EcsWildcard), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, EcsWildcard), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, EcsWildcard), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -7617,10 +7617,10 @@ void Basic_instanced_w_singleton(void) { ecs_iter_t it = ecs_query_iter(world, f); test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 3); @@ -7639,10 +7639,10 @@ void Basic_instanced_w_singleton(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 2); @@ -7709,13 +7709,13 @@ void Basic_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), false); - test_bool(ecs_field_is_self(&it, 2), true); + test_bool(ecs_field_is_self(&it, 0), false); + test_bool(ecs_field_is_self(&it, 1), true); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 2); @@ -7731,13 +7731,13 @@ void Basic_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 3); @@ -7756,13 +7756,13 @@ void Basic_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 2); @@ -7778,13 +7778,13 @@ void Basic_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { + test_bool(ecs_field_is_self(&it, 0), true); test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), true); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 2); @@ -7836,8 +7836,8 @@ void Basic_not_instanced_w_singleton(void) { ecs_iter_t it = ecs_query_iter(world, f); test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7846,16 +7846,16 @@ void Basic_not_instanced_w_singleton(void) { test_int(v->y, 2); test_int(p[0].x, 10); test_int(p[0].y, 20); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); } test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7864,16 +7864,16 @@ void Basic_not_instanced_w_singleton(void) { test_int(v->y, 2); test_int(p[0].x, 20); test_int(p[0].y, 30); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); } test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7882,16 +7882,16 @@ void Basic_not_instanced_w_singleton(void) { test_int(v->y, 2); test_int(p[0].x, 30); test_int(p[0].y, 40); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); } test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7900,16 +7900,16 @@ void Basic_not_instanced_w_singleton(void) { test_int(p[0].y, 50); test_int(v->x, 1); test_int(v->y, 2); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); } test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7918,10 +7918,10 @@ void Basic_not_instanced_w_singleton(void) { test_int(p[0].y, 60); test_int(v->x, 1); test_int(v->y, 2); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); } test_assert(!ecs_query_next(&it)); @@ -7976,13 +7976,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), false); - test_bool(ecs_field_is_self(&it, 2), true); + test_bool(ecs_field_is_self(&it, 0), false); + test_bool(ecs_field_is_self(&it, 1), true); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -7995,13 +7995,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), false); - test_bool(ecs_field_is_self(&it, 2), true); + test_bool(ecs_field_is_self(&it, 0), false); + test_bool(ecs_field_is_self(&it, 1), true); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8014,13 +8014,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8033,13 +8033,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8052,13 +8052,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8071,13 +8071,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8090,13 +8090,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { - test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), false); + test_bool(ecs_field_is_self(&it, 0), true); + test_bool(ecs_field_is_self(&it, 1), false); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 1); @@ -8109,13 +8109,13 @@ void Basic_not_instanced_w_base(void) { test_assert(ecs_query_next(&it)); { + test_bool(ecs_field_is_self(&it, 0), true); test_bool(ecs_field_is_self(&it, 1), true); - test_bool(ecs_field_is_self(&it, 2), true); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(p != NULL); test_assert(v != NULL); test_int(it.count, 2); @@ -8165,12 +8165,12 @@ void Basic_unknown_before_known(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc, ecs_iter_get_var(&it, gc_var)); test_assert(!ecs_query_next(&it)); @@ -8211,24 +8211,24 @@ void Basic_unknown_before_known_after_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 4)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(true, ecs_field_is_set(&it, 3)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc1, ecs_iter_get_var(&it, gc_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 4)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(true, ecs_field_is_set(&it, 3)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc2, ecs_iter_get_var(&it, gc_var)); test_assert(!ecs_query_next(&it)); @@ -8266,14 +8266,14 @@ void Basic_unknown_before_known_after_not(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 3)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 4)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 3)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc1, ecs_iter_get_var(&it, gc_var)); test_assert(!ecs_query_next(&it)); @@ -8311,28 +8311,28 @@ void Basic_unknown_before_known_after_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 3)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 4)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 3)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc1, ecs_iter_get_var(&it, gc_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 3)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 4)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, c), ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc2, ecs_iter_get_var(&it, gc_var)); test_assert(!ecs_query_next(&it)); @@ -8373,11 +8373,11 @@ void Basic_unknown_before_known_after_scope(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(c, ecs_iter_get_var(&it, c_var)); test_uint(gc1, ecs_iter_get_var(&it, gc_var)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_assert(!ecs_query_next(&it)); ecs_query_fini(r); @@ -8430,15 +8430,15 @@ void Basic_2_trivial_mixed_2_tables(void) { test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8447,15 +8447,15 @@ void Basic_2_trivial_mixed_2_tables(void) { test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8513,25 +8513,25 @@ void Basic_2_trivial_mixed_2_tables_component(void) { test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); test_int(p[1].y, 30); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v[0].x, 1); test_int(v[0].y, 2); test_int(v[1].x, 2); test_int(v[1].y, 3); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8540,23 +8540,23 @@ void Basic_2_trivial_mixed_2_tables_component(void) { test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v[0].x, 3); test_int(v[0].y, 4); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8615,15 +8615,15 @@ void Basic_2_trivial_mixed_2_tables_wildcard(void) { test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8632,15 +8632,15 @@ void Basic_2_trivial_mixed_2_tables_wildcard(void) { test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ent, ecs_field_src(&it, 3)); + test_uint(ent, ecs_field_src(&it, 2)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -8706,22 +8706,22 @@ void Basic_2_trivial_one_regular(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(e1, ecs_field_src(&it, 3)); + test_uint(e1, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8758,22 +8758,22 @@ void Basic_1_trivial_one_regular_one_trivial(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8810,22 +8810,22 @@ void Basic_one_regular_2_trivial(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(false, ecs_query_next(&it)); } @@ -8860,18 +8860,18 @@ void Basic_2_trivial_w_prefab(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(EcsPrefab, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(EcsPrefab, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(EcsPrefab, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(EcsPrefab, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8913,20 +8913,20 @@ void Basic_3_trivial_w_prefab(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(EcsPrefab, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(EcsPrefab, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(EcsPrefab, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(EcsPrefab, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8961,18 +8961,18 @@ void Basic_2_trivial_w_disabled(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(EcsDisabled, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(EcsDisabled, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(EcsDisabled, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(EcsDisabled, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -9014,20 +9014,20 @@ void Basic_3_trivial_w_disabled(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(EcsDisabled, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(EcsDisabled, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(EcsDisabled, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(EcsDisabled, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -9063,10 +9063,10 @@ void Basic_2_this_w_fixed_src(void) { test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e, ecs_field_src(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -9102,10 +9102,10 @@ void Basic_2_fixed_src_w_this(void) { test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); - test_uint(Bar, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Bar, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_bool(false, ecs_query_next(&it)); } diff --git a/test/query/src/BuiltinPredicates.c b/test/query/src/BuiltinPredicates.c index d0454cce4..87aec6bca 100644 --- a/test/query/src/BuiltinPredicates.c +++ b/test/query/src/BuiltinPredicates.c @@ -31,7 +31,7 @@ void BuiltinPredicates_this_eq_id(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -57,7 +57,7 @@ void BuiltinPredicates_this_eq_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -104,9 +104,9 @@ void BuiltinPredicates_this_eq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -171,9 +171,9 @@ void BuiltinPredicates_this_eq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -240,9 +240,9 @@ void BuiltinPredicates_this_eq_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_uint(ent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -272,7 +272,7 @@ void BuiltinPredicates_var_eq_id(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -301,7 +301,7 @@ void BuiltinPredicates_var_eq_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -350,8 +350,8 @@ void BuiltinPredicates_var_eq_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -387,9 +387,9 @@ void BuiltinPredicates_var_eq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -460,9 +460,9 @@ void BuiltinPredicates_var_eq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -535,9 +535,9 @@ void BuiltinPredicates_var_eq_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_uint(ent_2, ecs_iter_get_var(&it, y_var)); test_bool(false, ecs_query_next(&it)); @@ -679,16 +679,16 @@ void BuiltinPredicates_this_neq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -725,9 +725,9 @@ void BuiltinPredicates_this_neq_id_written_no_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -761,16 +761,16 @@ void BuiltinPredicates_this_neq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -807,9 +807,9 @@ void BuiltinPredicates_this_neq_name_written_no_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -845,17 +845,17 @@ void BuiltinPredicates_this_neq_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_uint(ent_3, it.entities[0]); @@ -1007,8 +1007,8 @@ void BuiltinPredicates_var_neq_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); test_uint(Tgt, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1044,16 +1044,16 @@ void BuiltinPredicates_var_neq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1093,9 +1093,9 @@ void BuiltinPredicates_var_neq_id_written_no_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1132,16 +1132,16 @@ void BuiltinPredicates_var_neq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1181,9 +1181,9 @@ void BuiltinPredicates_var_neq_name_written_no_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1222,17 +1222,17 @@ void BuiltinPredicates_var_neq_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_uint(ent_2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(RelA, ent_2), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_uint(ent_2, ecs_iter_get_var(&it, y_var)); @@ -1473,16 +1473,16 @@ void BuiltinPredicates_this_2_neq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, it.entities[0]); test_uint(ent_5, it.entities[1]); @@ -1521,16 +1521,16 @@ void BuiltinPredicates_this_2_neq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, it.entities[0]); test_uint(ent_5, it.entities[1]); @@ -1572,23 +1572,23 @@ void BuiltinPredicates_var_2_neq_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1629,23 +1629,23 @@ void BuiltinPredicates_var_2_neq_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1678,12 +1678,12 @@ void BuiltinPredicates_this_2_or_id(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1716,17 +1716,17 @@ void BuiltinPredicates_this_3_or_id(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1759,12 +1759,12 @@ void BuiltinPredicates_this_2_or_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1797,17 +1797,17 @@ void BuiltinPredicates_this_3_or_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1842,22 +1842,22 @@ void BuiltinPredicates_this_2_or_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2_5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3_5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1893,32 +1893,32 @@ void BuiltinPredicates_this_3_or_match(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2_5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3_5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_4_5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1953,12 +1953,12 @@ void BuiltinPredicates_var_2_or_id(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1993,12 +1993,12 @@ void BuiltinPredicates_var_2_or_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2036,16 +2036,16 @@ void BuiltinPredicates_this_2_or_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2083,23 +2083,23 @@ void BuiltinPredicates_this_3_or_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2137,16 +2137,16 @@ void BuiltinPredicates_this_2_or_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2187,16 +2187,16 @@ void BuiltinPredicates_var_2_or_id_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2237,16 +2237,16 @@ void BuiltinPredicates_var_2_or_name_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2282,18 +2282,18 @@ void BuiltinPredicates_this_match_eq(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_uint(ent_4, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2332,22 +2332,22 @@ void BuiltinPredicates_var_match_eq(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2389,21 +2389,21 @@ void BuiltinPredicates_this_match_eq_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_uint(ent_4, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2445,21 +2445,21 @@ void BuiltinPredicates_this_match_eq_written_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_uint(ent_4, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2504,26 +2504,26 @@ void BuiltinPredicates_var_match_eq_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2977,12 +2977,12 @@ void BuiltinPredicates_this_match_2_or(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3024,14 +3024,14 @@ void BuiltinPredicates_this_match_2_or_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3067,17 +3067,17 @@ void BuiltinPredicates_this_match_3_or(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent_6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3119,20 +3119,20 @@ void BuiltinPredicates_this_match_3_or_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(true, ecs_field_is_set(&it, 1)); - test_uint(false, ecs_field_is_set(&it, 2)); + test_uint(true, ecs_field_is_set(&it, 0)); + test_uint(false, ecs_field_is_set(&it, 1)); test_uint(ent_6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -3165,7 +3165,7 @@ void BuiltinPredicates_unresolved_by_name(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(false, ecs_field_is_set(&it, 1)); + test_uint(false, ecs_field_is_set(&it, 0)); test_uint(ent, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -3526,15 +3526,15 @@ void BuiltinPredicates_2_or_w_eq_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, e1), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, e1), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, Rel), ecs_field_id(&it, 1)); - test_uint(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, Rel), ecs_field_id(&it, 0)); + test_uint(true, ecs_field_is_set(&it, 0)); test_uint(Rel, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); diff --git a/test/query/src/Cached.c b/test/query/src/Cached.c index 10847c5bb..27dcb2215 100644 --- a/test/query/src/Cached.c +++ b/test/query/src/Cached.c @@ -18,7 +18,7 @@ void Cached_simple_query_existing_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -45,12 +45,12 @@ void Cached_simple_query_2_existing_tables(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -75,7 +75,7 @@ void Cached_simple_query_new_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -102,12 +102,12 @@ void Cached_simple_query_2_new_tables(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -135,12 +135,12 @@ void Cached_simple_query_existing_and_new_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -167,12 +167,12 @@ void Cached_wildcard_query_existing_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -199,12 +199,12 @@ void Cached_wildcard_query_new_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -234,22 +234,22 @@ void Cached_wildcard_query_existing_table_2_results_p_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -279,22 +279,22 @@ void Cached_wildcard_query_new_table_2_results_p_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, ObjC), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -445,7 +445,7 @@ void Cached_simple_query_existing_empty_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -472,7 +472,7 @@ void Cached_simple_query_existing_empty_type(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -499,7 +499,7 @@ void Cached_simple_query_new_empty_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -523,9 +523,9 @@ void Cached_component_query_existing_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_assert(ecs_field_size(&it, 1) == sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) != NULL); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_assert(ecs_field_size(&it, 0) == sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) != NULL); test_bool(false, ecs_query_next(&it)); @@ -549,9 +549,9 @@ void Cached_component_query_new_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) != NULL); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) != NULL); test_bool(false, ecs_query_next(&it)); @@ -579,9 +579,9 @@ void Cached_component_query_existing_empty_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) != NULL); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) != NULL); test_bool(false, ecs_query_next(&it)); @@ -612,10 +612,10 @@ void Cached_2_component_query_existing_empty_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) != NULL); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) != NULL); test_bool(false, ecs_query_next(&it)); @@ -642,10 +642,10 @@ void Cached_2_component_query_existing_empty_type(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) != NULL); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) != NULL); test_bool(false, ecs_query_next(&it)); @@ -668,7 +668,7 @@ void Cached_only_optional(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - if (ecs_field_is_set(&it, 1)) { + if (ecs_field_is_set(&it, 0)) { test_assert(count == 0); test_int(it.count, 1); test_uint(it.entities[0], e); @@ -698,7 +698,7 @@ void Cached_only_optional_new_empty_table(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - if (ecs_field_is_set(&it, 1)) { + if (ecs_field_is_set(&it, 0)) { test_assert(count == 0); test_int(it.count, 1); test_uint(it.entities[0], e); @@ -717,7 +717,7 @@ void Cached_only_optional_new_empty_table(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 1)); + test_assert(!ecs_field_is_set(&it, 0)); test_assert(it.count > 0); total_count ++; } @@ -746,7 +746,7 @@ void Cached_only_optional_new_empty_non_empty_table(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - if (ecs_field_is_set(&it, 1)) { + if (ecs_field_is_set(&it, 0)) { test_assert(count == 0); test_int(it.count, 1); test_uint(it.entities[0], e); @@ -766,7 +766,7 @@ void Cached_only_optional_new_empty_non_empty_table(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 1)); + test_assert(!ecs_field_is_set(&it, 0)); test_assert(it.count > 0); total_count ++; if (it.entities[0] == e) { @@ -802,7 +802,7 @@ void Cached_only_optional_new_unset_tables(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 1)); + test_assert(!ecs_field_is_set(&it, 0)); test_assert(it.count > 0); if (it.entities[0] == e) { test_assert(table == it.table); @@ -822,7 +822,7 @@ void Cached_only_optional_new_unset_tables(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 1)); + test_assert(!ecs_field_is_set(&it, 0)); test_assert(it.count > 0); total_count ++; if (it.entities[0] == e) { @@ -858,7 +858,7 @@ void Cached_singleton_w_optional_new_empty_table(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - if (ecs_field_is_set(&it, 2)) { + if (ecs_field_is_set(&it, 1)) { test_assert(count == 0); test_int(it.count, 1); test_uint(it.entities[0], e); @@ -877,7 +877,7 @@ void Cached_singleton_w_optional_new_empty_table(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); test_assert(it.count > 0); total_count ++; } @@ -909,7 +909,7 @@ void Cached_singleton_w_optional_new_empty_non_empty_table(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - if (ecs_field_is_set(&it, 2)) { + if (ecs_field_is_set(&it, 1)) { test_assert(count == 0); test_int(it.count, 1); test_uint(it.entities[0], e); @@ -929,7 +929,7 @@ void Cached_singleton_w_optional_new_empty_non_empty_table(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); test_assert(it.count > 0); total_count ++; if (it.entities[0] == e) { @@ -968,7 +968,7 @@ void Cached_singleton_w_optional_new_unset_tables(void) { int32_t count = 0, total_count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); test_assert(it.count > 0); if (it.entities[0] == e) { test_assert(table == it.table); @@ -988,7 +988,7 @@ void Cached_singleton_w_optional_new_unset_tables(void) { it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); test_assert(it.count > 0); total_count ++; if (it.entities[0] == e) { @@ -1025,10 +1025,10 @@ void Cached_query_w_from_entity_match_after(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_field_src(&it, 1), 0); - test_uint(ecs_field_id(&it, 1), TagA); - test_uint(ecs_field_src(&it, 2), e1); - test_uint(ecs_field_id(&it, 2), TagB); + test_uint(ecs_field_src(&it, 0), 0); + test_uint(ecs_field_id(&it, 0), TagA); + test_uint(ecs_field_src(&it, 1), e1); + test_uint(ecs_field_id(&it, 1), TagB); test_bool(false, ecs_query_next(&it)); @@ -1055,10 +1055,10 @@ void Cached_query_w_from_singleton_match_after(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_field_src(&it, 1), 0); - test_uint(ecs_field_id(&it, 1), TagA); - test_uint(ecs_field_src(&it, 2), TagB); - test_uint(ecs_field_id(&it, 2), TagB); + test_uint(ecs_field_src(&it, 0), 0); + test_uint(ecs_field_id(&it, 0), TagA); + test_uint(ecs_field_src(&it, 1), TagB); + test_uint(ecs_field_id(&it, 1), TagB); test_bool(false, ecs_query_next(&it)); @@ -1103,12 +1103,12 @@ void Cached_rematch_after_add_to_recycled_parent(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - test_assert(ecs_field_src(&it, 2) == parent); + test_assert(ecs_field_src(&it, 1) == parent); test_bool(ecs_query_next(&it), false); ecs_fini(world); @@ -1140,8 +1140,8 @@ void Cached_query_rematch_optional_after_add(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_assert(p != NULL); @@ -1172,19 +1172,19 @@ void Cached_query_rematch_optional_after_add(void) { count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { - test_assert(ecs_field_is_set(&it, 2)); + test_assert(ecs_field_is_set(&it, 1)); test_assert(v != NULL); } else if (it.entities[0] == e2) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); } else if (it.entities[0] == e3) { - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(!ecs_field_is_set(&it, 1)); } count ++; @@ -1210,7 +1210,7 @@ void Cached_get_owned_tag(void) { int count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(ecs_field_w_size(&it, 0, 1) == NULL); + test_assert(ecs_field_w_size(&it, 0, 0) == NULL); test_int(it.count, 1); test_int(it.entities[0], e); count += it.count; @@ -1238,7 +1238,7 @@ void Cached_get_shared_tag(void) { int count = 0; ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(ecs_field_w_size(&it, 0, 1) == NULL); + test_assert(ecs_field_w_size(&it, 0, 0) == NULL); test_int(it.count, 1); test_int(it.entities[0], instance); count += it.count; @@ -1282,7 +1282,7 @@ void Cached_get_column_size(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it)); - test_int(ecs_field_size(&it, 1), sizeof(Position)); + test_int(ecs_field_size(&it, 0), sizeof(Position)); test_assert(!ecs_query_next(&it)); @@ -1338,16 +1338,16 @@ void Cached_query_optional_tag(void) { int32_t count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_field_id(&it, 1), TagA); - test_assert(ecs_field_id(&it, 2) == TagB); + test_uint(ecs_field_id(&it, 0), TagA); + test_assert(ecs_field_id(&it, 1) == TagB); test_int(it.count, 1); if (it.entities[0] == e1) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); } count ++; @@ -1382,19 +1382,19 @@ void Cached_query_optional_shared_tag(void) { int32_t count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_field_id(&it, 1), TagA); - test_assert(ecs_field_id(&it, 2) == TagB); + test_uint(ecs_field_id(&it, 0), TagA); + test_assert(ecs_field_id(&it, 1) == TagB); test_int(it.count, 1); if (it.entities[0] == e1) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); } else if (it.entities[0] == e3) { + test_bool(ecs_field_is_set(&it, 0), true); test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); } count ++; @@ -1457,30 +1457,30 @@ void Cached_query_iter_10_tags(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), TagA); - test_int(ecs_field_id(&it, 2), TagB); - test_int(ecs_field_id(&it, 3), TagC); - test_int(ecs_field_id(&it, 4), TagD); - test_int(ecs_field_id(&it, 5), TagE); - test_int(ecs_field_id(&it, 6), TagF); - test_int(ecs_field_id(&it, 7), TagG); - test_int(ecs_field_id(&it, 8), TagH); - test_int(ecs_field_id(&it, 9), TagI); - test_int(ecs_field_id(&it, 10), TagJ); + test_int(ecs_field_id(&it, 0), TagA); + test_int(ecs_field_id(&it, 1), TagB); + test_int(ecs_field_id(&it, 2), TagC); + test_int(ecs_field_id(&it, 3), TagD); + test_int(ecs_field_id(&it, 4), TagE); + test_int(ecs_field_id(&it, 5), TagF); + test_int(ecs_field_id(&it, 6), TagG); + test_int(ecs_field_id(&it, 7), TagH); + test_int(ecs_field_id(&it, 8), TagI); + test_int(ecs_field_id(&it, 9), TagJ); test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), TagA); - test_int(ecs_field_id(&it, 2), TagB); - test_int(ecs_field_id(&it, 3), TagC); - test_int(ecs_field_id(&it, 4), TagD); - test_int(ecs_field_id(&it, 5), TagE); - test_int(ecs_field_id(&it, 6), TagF); - test_int(ecs_field_id(&it, 7), TagG); - test_int(ecs_field_id(&it, 8), TagH); - test_int(ecs_field_id(&it, 9), TagI); - test_int(ecs_field_id(&it, 10), TagJ); + test_int(ecs_field_id(&it, 0), TagA); + test_int(ecs_field_id(&it, 1), TagB); + test_int(ecs_field_id(&it, 2), TagC); + test_int(ecs_field_id(&it, 3), TagD); + test_int(ecs_field_id(&it, 4), TagE); + test_int(ecs_field_id(&it, 5), TagF); + test_int(ecs_field_id(&it, 6), TagG); + test_int(ecs_field_id(&it, 7), TagH); + test_int(ecs_field_id(&it, 8), TagI); + test_int(ecs_field_id(&it, 9), TagJ); test_assert(!ecs_query_next(&it)); @@ -1545,20 +1545,20 @@ void Cached_query_iter_10_components(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_1); - test_int(ecs_field_id(&it, 1), ecs_id(CompA)); - test_int(ecs_field_id(&it, 2), ecs_id(CompB)); - test_int(ecs_field_id(&it, 3), ecs_id(CompC)); - test_int(ecs_field_id(&it, 4), ecs_id(CompD)); - test_int(ecs_field_id(&it, 5), ecs_id(CompE)); - test_int(ecs_field_id(&it, 6), ecs_id(CompF)); - test_int(ecs_field_id(&it, 7), ecs_id(CompG)); - test_int(ecs_field_id(&it, 8), ecs_id(CompH)); - test_int(ecs_field_id(&it, 9), ecs_id(CompI)); - test_int(ecs_field_id(&it, 10), ecs_id(CompJ)); + test_int(ecs_field_id(&it, 0), ecs_id(CompA)); + test_int(ecs_field_id(&it, 1), ecs_id(CompB)); + test_int(ecs_field_id(&it, 2), ecs_id(CompC)); + test_int(ecs_field_id(&it, 3), ecs_id(CompD)); + test_int(ecs_field_id(&it, 4), ecs_id(CompE)); + test_int(ecs_field_id(&it, 5), ecs_id(CompF)); + test_int(ecs_field_id(&it, 6), ecs_id(CompG)); + test_int(ecs_field_id(&it, 7), ecs_id(CompH)); + test_int(ecs_field_id(&it, 8), ecs_id(CompI)); + test_int(ecs_field_id(&it, 9), ecs_id(CompJ)); int i; for (i = 0; i < 10; i ++) { - CompA *ptr = ecs_field_w_size(&it, 0, i + 1); + CompA *ptr = ecs_field_w_size(&it, 0, i); test_assert(ptr != NULL); test_int(ptr[0].v, 10); } @@ -1566,19 +1566,19 @@ void Cached_query_iter_10_components(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 1); test_int(it.entities[0], e_2); - test_int(ecs_field_id(&it, 1), ecs_id(CompA)); - test_int(ecs_field_id(&it, 2), ecs_id(CompB)); - test_int(ecs_field_id(&it, 3), ecs_id(CompC)); - test_int(ecs_field_id(&it, 4), ecs_id(CompD)); - test_int(ecs_field_id(&it, 5), ecs_id(CompE)); - test_int(ecs_field_id(&it, 6), ecs_id(CompF)); - test_int(ecs_field_id(&it, 7), ecs_id(CompG)); - test_int(ecs_field_id(&it, 8), ecs_id(CompH)); - test_int(ecs_field_id(&it, 9), ecs_id(CompI)); - test_int(ecs_field_id(&it, 10), ecs_id(CompJ)); + test_int(ecs_field_id(&it, 0), ecs_id(CompA)); + test_int(ecs_field_id(&it, 1), ecs_id(CompB)); + test_int(ecs_field_id(&it, 2), ecs_id(CompC)); + test_int(ecs_field_id(&it, 3), ecs_id(CompD)); + test_int(ecs_field_id(&it, 4), ecs_id(CompE)); + test_int(ecs_field_id(&it, 5), ecs_id(CompF)); + test_int(ecs_field_id(&it, 6), ecs_id(CompG)); + test_int(ecs_field_id(&it, 7), ecs_id(CompH)); + test_int(ecs_field_id(&it, 8), ecs_id(CompI)); + test_int(ecs_field_id(&it, 9), ecs_id(CompJ)); for (i = 0; i < 10; i ++) { - CompA *ptr = ecs_field_w_size(&it, 0, i + 1); + CompA *ptr = ecs_field_w_size(&it, 0, i); test_assert(ptr != NULL); test_int(ptr[0].v, 10); } @@ -1761,8 +1761,8 @@ void Cached_no_instancing_w_singleton(void) { ecs_iter_t it = ecs_query_iter(world, q); test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e1); test_int(p->x, 10); @@ -1773,8 +1773,8 @@ void Cached_no_instancing_w_singleton(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e2); test_int(p->x, 20); @@ -1785,8 +1785,8 @@ void Cached_no_instancing_w_singleton(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e3); test_int(p->x, 30); @@ -1797,8 +1797,8 @@ void Cached_no_instancing_w_singleton(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e4); test_int(p->x, 40); @@ -1809,8 +1809,8 @@ void Cached_no_instancing_w_singleton(void) { test_assert(ecs_query_next(&it)); { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_int(it.entities[0], e5); test_int(p->x, 50); @@ -2301,7 +2301,7 @@ void Cached_superset_2_targets(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); } @@ -2311,7 +2311,7 @@ void Cached_superset_2_targets(void) { test_int(it.count, 1); test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); } @@ -2321,7 +2321,7 @@ void Cached_superset_2_targets(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -2437,8 +2437,8 @@ void Cached_superset_2_relations_w_component(void) { test_uint(e1, it.entities[0]); test_uint(parent, it.sources[0]); test_uint(base, it.sources[1]); - Position *p1 = ecs_field(&it, Position, 1); - Position *p2 = ecs_field(&it, Position, 2); + Position *p1 = ecs_field(&it, Position, 0); + Position *p2 = ecs_field(&it, Position, 1); test_assert(p1 != NULL); test_assert(p2 != NULL); test_int(p1->x, 30); @@ -2452,8 +2452,8 @@ void Cached_superset_2_relations_w_component(void) { test_uint(e2, it.entities[0]); test_uint(parent, it.sources[0]); test_uint(base, it.sources[1]); - Position *p1 = ecs_field(&it, Position, 1); - Position *p2 = ecs_field(&it, Position, 2); + Position *p1 = ecs_field(&it, Position, 0); + Position *p2 = ecs_field(&it, Position, 1); test_assert(p1 != NULL); test_assert(p2 != NULL); test_int(p1->x, 30); @@ -2500,8 +2500,8 @@ void Cached_superset_2_relations_instanced_w_component(void) { test_uint(e2, it.entities[1]); test_uint(parent, it.sources[0]); test_uint(base, it.sources[1]); - Position *p1 = ecs_field(&it, Position, 1); - Position *p2 = ecs_field(&it, Position, 2); + Position *p1 = ecs_field(&it, Position, 0); + Position *p2 = ecs_field(&it, Position, 1); test_assert(p1 != NULL); test_assert(p2 != NULL); test_int(p1->x, 30); @@ -2568,12 +2568,12 @@ void Cached_not_pair_relation_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_field_id(&it, 2), ecs_pair(EcsWildcard, ObjA)); + test_uint(ecs_field_id(&it, 1), ecs_pair(EcsWildcard, ObjA)); test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e4); - test_uint(ecs_field_id(&it, 2), ecs_pair(EcsWildcard, ObjA)); + test_uint(ecs_field_id(&it, 1), ecs_pair(EcsWildcard, ObjA)); test_bool(false, ecs_query_next(&it)); @@ -2609,12 +2609,12 @@ void Cached_not_pair_object_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, EcsWildcard)); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, EcsWildcard)); test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e4); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, EcsWildcard)); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, EcsWildcard)); test_bool(false, ecs_query_next(&it)); @@ -2655,16 +2655,16 @@ void Cached_two_pair_wildcards_one_not(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_field_id(&it, 1), Foo); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, ObjA)); - test_uint(ecs_field_id(&it, 3), ecs_pair(RelB, EcsWildcard)); + test_uint(ecs_field_id(&it, 0), Foo); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, ObjA)); + test_uint(ecs_field_id(&it, 2), ecs_pair(RelB, EcsWildcard)); test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), Foo); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, ObjB)); - test_uint(ecs_field_id(&it, 3), ecs_pair(RelB, EcsWildcard)); + test_uint(ecs_field_id(&it, 0), Foo); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, ObjB)); + test_uint(ecs_field_id(&it, 2), ecs_pair(RelB, EcsWildcard)); test_bool(false, ecs_query_next(&it)); @@ -2705,14 +2705,14 @@ void Cached_two_pair_wildcards_one_not_any(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_field_id(&it, 1), Foo); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, ObjA)); + test_uint(ecs_field_id(&it, 0), Foo); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, ObjA)); test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e4); - test_uint(ecs_field_id(&it, 1), Foo); - test_uint(ecs_field_id(&it, 2), ecs_pair(RelA, ObjB)); + test_uint(ecs_field_id(&it, 0), Foo); + test_uint(ecs_field_id(&it, 1), ecs_pair(RelA, ObjB)); test_bool(false, ecs_query_next(&it)); @@ -2739,7 +2739,7 @@ void Cached_isa_rematch(void) { test_int(it.count, 2); test_uint(it.entities[0], base_1); test_uint(it.entities[1], base_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); @@ -2749,7 +2749,7 @@ void Cached_isa_rematch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_uint(it.sources[0], base_1); @@ -2763,7 +2763,7 @@ void Cached_isa_rematch(void) { test_int(it.count, 2); test_uint(it.entities[0], base_1); test_uint(it.entities[1], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); @@ -2773,7 +2773,7 @@ void Cached_isa_rematch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_uint(it.sources[0], base_2); @@ -2801,7 +2801,7 @@ void Cached_childof_rematch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_uint(it.sources[0], base_1); @@ -2813,7 +2813,7 @@ void Cached_childof_rematch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_uint(it.sources[0], base_2); @@ -2842,7 +2842,7 @@ void Cached_isa_unmatch(void) { test_int(it.count, 2); test_uint(it.entities[0], base_1); test_uint(it.entities[1], base_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); @@ -2852,7 +2852,7 @@ void Cached_isa_unmatch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_uint(it.sources[0], base_1); @@ -2864,7 +2864,7 @@ void Cached_isa_unmatch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_uint(it.sources[0], 0); @@ -2892,7 +2892,7 @@ void Cached_childof_unmatch(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], inst); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_uint(it.sources[0], base_1); @@ -2927,7 +2927,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 2); test_uint(it.entities[0], base_1); test_uint(it.entities[1], base_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); @@ -2938,7 +2938,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], base); test_uint(it.sources[0], base_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -2946,7 +2946,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_bool(false, ecs_query_next(&it)); @@ -2959,7 +2959,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 2); test_uint(it.entities[0], base_1); test_uint(it.entities[1], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 30); @@ -2970,7 +2970,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -2978,7 +2978,7 @@ void Cached_isa_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], base); test_uint(it.sources[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3008,7 +3008,7 @@ void Cached_childof_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], base); test_uint(it.sources[0], base_1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3016,7 +3016,7 @@ void Cached_childof_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_bool(false, ecs_query_next(&it)); @@ -3028,7 +3028,7 @@ void Cached_childof_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3036,7 +3036,7 @@ void Cached_childof_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], base); test_uint(it.sources[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3066,7 +3066,7 @@ void Cached_childof_rematch_from_isa(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_bool(false, ecs_query_next(&it)); @@ -3079,7 +3079,7 @@ void Cached_childof_rematch_from_isa(void) { test_int(it.count, 1); test_uint(it.entities[0], inst); test_uint(it.sources[0], base_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_bool(false, ecs_query_next(&it)); @@ -3107,13 +3107,13 @@ void Cached_rematch_optional_ref(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(0, it.sources[0]); test_uint(parent, it.sources[1]); - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -3125,10 +3125,10 @@ void Cached_rematch_optional_ref(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(0, it.sources[0]); test_uint(0, it.sources[1]); test_bool(false, ecs_query_next(&it)); @@ -3158,19 +3158,19 @@ void Cached_rematch_optional_ref_w_2_refs(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(0, it.sources[0]); test_uint(parent, it.sources[1]); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); - Position *p = ecs_field(&it, Position, 3); + Position *p = ecs_field(&it, Position, 2); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -3182,16 +3182,16 @@ void Cached_rematch_optional_ref_w_2_refs(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(0, it.sources[0]); test_uint(parent, it.sources[1]); test_uint(0, it.sources[2]); - v = ecs_field(&it, Velocity, 2); + v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -3223,15 +3223,15 @@ void Cached_rematch_optional_ref_tag_w_ref_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(0, it.sources[0]); test_uint(parent, it.sources[1]); test_uint(parent, it.sources[2]); - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -3243,11 +3243,11 @@ void Cached_rematch_optional_ref_tag_w_ref_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_uint(0, it.sources[0]); test_uint(0, it.sources[1]); test_uint(parent, it.sources[2]); @@ -3283,7 +3283,7 @@ void Cached_match_query_expr_from_scope(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(bar, ecs_field_id(&it, 1)); + test_uint(bar, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -3325,8 +3325,8 @@ void Cached_query_long_or_w_ref(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(A, ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(A, ecs_field_id(&it, 1)); test_uint(e2, it.entities[0]); test_uint(e, it.sources[0]); test_uint(0, it.sources[1]); @@ -3387,12 +3387,12 @@ void Cached_rematch_after_delete_inherited_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(base, it.entities[0]); - test_uint(tag, ecs_field_id(&it, 1)); + test_uint(tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(inst, it.entities[0]); - test_uint(tag, ecs_field_id(&it, 1)); + test_uint(tag, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); ecs_delete_with(world, tag); @@ -3425,12 +3425,12 @@ void Cached_rematch_after_delete_rel_of_inherited_pair(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(base, it.entities[0]); - test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 1)); + test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(inst, it.entities[0]); - test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 1)); + test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); ecs_delete_with(world, ecs_pair(rel, EcsWildcard)); @@ -3461,12 +3461,12 @@ void Cached_rematch_after_delete_obj_of_inherited_pair(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(base, it.entities[0]); - test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 1)); + test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(inst, it.entities[0]); - test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 1)); + test_uint(ecs_pair(rel, obj), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); ecs_delete_with(world, ecs_pair(EcsWildcard, obj)); @@ -3539,26 +3539,26 @@ void Cached_2_self_up_terms_new_tables(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_b, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -3608,56 +3608,56 @@ void Cached_this_self_up_childof_pair_new_tables(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); diff --git a/test/query/src/Cascade.c b/test/query/src/Cascade.c index 79009f644..88bcba1f3 100644 --- a/test/query/src/Cascade.c +++ b/test/query/src/Cascade.c @@ -39,56 +39,56 @@ void Cascade_this_self_cascade_childof_uncached(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -135,44 +135,44 @@ void Cascade_this_cascade_childof_uncached(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -223,74 +223,74 @@ void Cascade_this_written_self_cascade_childof_uncached(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -340,58 +340,58 @@ void Cascade_this_written_cascade_childof_uncached(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -439,56 +439,56 @@ void Cascade_this_self_cascade_childof_w_parent_flag_uncached(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -535,44 +535,44 @@ void Cascade_this_cascade_childof_w_parent_flag_uncached(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -623,74 +623,74 @@ void Cascade_this_written_self_cascade_childof_w_parent_flag_uncached(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -740,58 +740,58 @@ void Cascade_this_written_cascade_childof_w_parent_flag_uncached(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -1280,7 +1280,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); } @@ -1290,7 +1290,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -1300,7 +1300,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); test_bool(false, ecs_query_next(&it)); @@ -1322,7 +1322,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_3); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 70); test_int(p[0].y, 80); } @@ -1332,7 +1332,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_2); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); } @@ -1342,7 +1342,7 @@ void Cascade_cascade_rematch_2_lvls(void) { test_uint(it.entities[0], e_0); test_uint(it.sources[0], e_1); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); } @@ -1386,7 +1386,7 @@ void Cascade_cascade_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -1394,7 +1394,7 @@ void Cascade_cascade_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -1402,7 +1402,7 @@ void Cascade_cascade_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); test_bool(false, ecs_query_next(&it)); @@ -1493,7 +1493,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); @@ -1501,7 +1501,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -1509,7 +1509,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -1528,7 +1528,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_0); test_uint(it.sources[0], e_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -1536,7 +1536,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); @@ -1544,7 +1544,7 @@ void Cascade_cascade_desc_rematch_2_lvls(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_3); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 70); test_int(p[0].y, 80); test_bool(false, ecs_query_next(&it)); @@ -1585,7 +1585,7 @@ void Cascade_cascade_desc_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); @@ -1593,7 +1593,7 @@ void Cascade_cascade_desc_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -1601,7 +1601,7 @@ void Cascade_cascade_desc_rematch_2_lvls_2_relations(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_bool(false, ecs_query_next(&it)); @@ -1705,22 +1705,22 @@ void Cascade_cascade_after_recycled_parent_change(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], parent); - test_assert(ecs_field_src(&it, 2) == 0); - const Position *p = ecs_field(&it, Position, 2); + test_assert(ecs_field_src(&it, 1) == 0); + const Position *p = ecs_field(&it, Position, 1); test_assert(p == NULL); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], child); - test_assert(ecs_field_src(&it, 2) == 0); - p = ecs_field(&it, Position, 2); + test_assert(ecs_field_src(&it, 1) == 0); + p = ecs_field(&it, Position, 1); test_assert(p == NULL); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], e); - test_assert(ecs_field_src(&it, 2) == 0); - p = ecs_field(&it, Position, 2); + test_assert(ecs_field_src(&it, 1) == 0); + p = ecs_field(&it, Position, 1); test_assert(p == NULL); test_bool(ecs_query_next(&it), false); @@ -1734,15 +1734,15 @@ void Cascade_cascade_after_recycled_parent_change(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], parent); - test_assert(ecs_field_is_set(&it, 2) == false); - p = ecs_field(&it, Position, 2); + test_assert(ecs_field_is_set(&it, 1) == false); + p = ecs_field(&it, Position, 1); test_assert(p == NULL); test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], child); - test_assert(ecs_field_src(&it, 2) == parent); - p = ecs_field(&it, Position, 2); + test_assert(ecs_field_src(&it, 1) == parent); + p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -1750,8 +1750,8 @@ void Cascade_cascade_after_recycled_parent_change(void) { test_bool(ecs_query_next(&it), true); test_int(it.count, 1); test_uint(it.entities[0], e); - test_assert(ecs_field_src(&it, 2) == child); - p = ecs_field(&it, Position, 2); + test_assert(ecs_field_src(&it, 1) == child); + p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); diff --git a/test/query/src/ChangeDetection.c b/test/query/src/ChangeDetection.c index 4b7bc0c6c..7b04c778c 100644 --- a/test/query/src/ChangeDetection.c +++ b/test/query/src/ChangeDetection.c @@ -973,8 +973,8 @@ void ChangeDetection_query_changed_w_singleton(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_uint(e, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(p->x, 10); test_int(p->y, 20); test_int(v->x, 1); @@ -994,8 +994,8 @@ void ChangeDetection_query_changed_w_singleton(void) { test_bool(true, ecs_query_changed(q)); test_bool(true, ecs_iter_changed(&it)); test_uint(e, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(p->x, 10); test_int(p->y, 20); test_int(v->x, 2); @@ -1027,7 +1027,7 @@ void ChangeDetection_query_changed_w_only_singleton(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1038,7 +1038,7 @@ void ChangeDetection_query_changed_w_only_singleton(void) { test_bool(true, ecs_query_next(&it)); test_bool(false, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1066,7 +1066,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_set(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1077,7 +1077,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_set(void) { test_bool(true, ecs_query_next(&it)); test_bool(false, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1090,7 +1090,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_set(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); @@ -1122,7 +1122,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_out_term(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1133,7 +1133,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_out_term(void) { test_bool(true, ecs_query_next(&it)); test_bool(false, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1143,7 +1143,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_out_term(void) { ecs_iter_t it = ecs_query_iter(world, q_write); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); p->x = 3; p->y = 4; test_bool(false, ecs_query_next(&it)); @@ -1154,7 +1154,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_out_term(void) { test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); @@ -1187,7 +1187,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_singleton_out_term(voi test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1198,7 +1198,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_singleton_out_term(voi test_bool(true, ecs_query_next(&it)); test_bool(false, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1208,7 +1208,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_singleton_out_term(voi ecs_iter_t it = ecs_query_iter(world, q_write); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); p->x = 3; p->y = 4; test_bool(false, ecs_query_next(&it)); @@ -1219,7 +1219,7 @@ void ChangeDetection_query_changed_w_only_singleton_after_singleton_out_term(voi test_bool(true, ecs_query_next(&it)); test_bool(true, ecs_iter_changed(&it)); test_int(0, it.count); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); @@ -1250,7 +1250,7 @@ void ChangeDetection_query_changed_w_only_parent(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1262,7 +1262,7 @@ void ChangeDetection_query_changed_w_only_parent(void) { test_bool(false, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1292,7 +1292,7 @@ void ChangeDetection_query_changed_w_only_parent_after_set(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1304,7 +1304,7 @@ void ChangeDetection_query_changed_w_only_parent_after_set(void) { test_bool(false, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1318,7 +1318,7 @@ void ChangeDetection_query_changed_w_only_parent_after_set(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); @@ -1352,7 +1352,7 @@ void ChangeDetection_query_changed_w_only_parent_after_out_term(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1364,7 +1364,7 @@ void ChangeDetection_query_changed_w_only_parent_after_out_term(void) { test_bool(false, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1375,7 +1375,7 @@ void ChangeDetection_query_changed_w_only_parent_after_out_term(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); p->x = 3; p->y = 4; test_bool(false, ecs_query_next(&it)); @@ -1387,7 +1387,7 @@ void ChangeDetection_query_changed_w_only_parent_after_out_term(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); @@ -1422,7 +1422,7 @@ void ChangeDetection_query_changed_w_only_parent_after_parent_out_term(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1434,7 +1434,7 @@ void ChangeDetection_query_changed_w_only_parent_after_parent_out_term(void) { test_bool(false, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 1); test_int(p->y, 2); test_bool(false, ecs_query_next(&it)); @@ -1445,7 +1445,7 @@ void ChangeDetection_query_changed_w_only_parent_after_parent_out_term(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); p->x = 3; p->y = 4; test_bool(false, ecs_query_next(&it)); @@ -1457,7 +1457,7 @@ void ChangeDetection_query_changed_w_only_parent_after_parent_out_term(void) { test_bool(true, ecs_iter_changed(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 3); test_int(p->y, 4); test_bool(false, ecs_query_next(&it)); diff --git a/test/query/src/ComponentInheritance.c b/test/query/src/ComponentInheritance.c index 8a9dc6952..a000f0fc0 100644 --- a/test/query/src/ComponentInheritance.c +++ b/test/query/src/ComponentInheritance.c @@ -37,9 +37,9 @@ void ComponentInheritance_1_ent_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -67,9 +67,9 @@ void ComponentInheritance_1_ent_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -97,9 +97,9 @@ void ComponentInheritance_1_ent_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -127,15 +127,15 @@ void ComponentInheritance_1_ent_3_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); /* not ideal, diamond problem */ test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -169,58 +169,58 @@ void ComponentInheritance_1_this_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Unit, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Unit, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e7, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e6, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -254,23 +254,23 @@ void ComponentInheritance_1_this_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -304,16 +304,16 @@ void ComponentInheritance_1_this_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -347,9 +347,9 @@ void ComponentInheritance_1_this_3_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -399,82 +399,82 @@ void ComponentInheritance_1_this_0_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e6, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Unit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Unit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e7, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -524,32 +524,32 @@ void ComponentInheritance_1_this_1_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -599,22 +599,22 @@ void ComponentInheritance_1_this_2_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -664,12 +664,12 @@ void ComponentInheritance_1_this_3_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -706,58 +706,58 @@ void ComponentInheritance_1_var_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Unit, ecs_field_id(&it, 1)); - test_uint(e7, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Unit, ecs_field_id(&it, 0)); + test_uint(e7, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(e5, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(e5, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(e6, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(e6, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(e4, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(e4, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -794,23 +794,23 @@ void ComponentInheritance_1_var_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(e5, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(e5, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -847,14 +847,14 @@ void ComponentInheritance_1_var_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -891,8 +891,8 @@ void ComponentInheritance_1_var_3_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -945,82 +945,82 @@ void ComponentInheritance_1_var_0_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Unit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Unit, ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); test_uint(e7, ecs_field_src(&it, 1)); - test_uint(e7, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1073,32 +1073,32 @@ void ComponentInheritance_1_var_1_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1151,22 +1151,22 @@ void ComponentInheritance_1_var_2_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1219,12 +1219,12 @@ void ComponentInheritance_1_var_3_lvl_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1253,9 +1253,9 @@ void ComponentInheritance_1_ent_1_lvl_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1288,23 +1288,23 @@ void ComponentInheritance_1_this_1_lvl_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1354,32 +1354,32 @@ void ComponentInheritance_1_this_1_lvl_written_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1416,23 +1416,23 @@ void ComponentInheritance_1_var_1_lvl_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(e5, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(e5, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1485,32 +1485,32 @@ void ComponentInheritance_1_var_1_lvl_written_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1573,9 +1573,9 @@ void ComponentInheritance_1_ent_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1590,9 +1590,9 @@ void ComponentInheritance_1_ent_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1607,9 +1607,9 @@ void ComponentInheritance_1_ent_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1624,9 +1624,9 @@ void ComponentInheritance_1_ent_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1679,42 +1679,42 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1731,52 +1731,52 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1793,62 +1793,62 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1865,32 +1865,32 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1907,62 +1907,62 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e7, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1979,52 +1979,52 @@ void ComponentInheritance_1_this_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2085,42 +2085,42 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(MeleeUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2140,52 +2140,52 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2205,62 +2205,62 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2280,32 +2280,32 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RangedUnit, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(RangedUnit, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2325,62 +2325,62 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Archer, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Archer, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); test_uint(e7, ecs_field_src(&it, 1)); - test_uint(e7, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2400,52 +2400,52 @@ void ComponentInheritance_1_var_src_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Wizard, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(Wizard, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2501,43 +2501,43 @@ void ComponentInheritance_1_this_src_not_written(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2553,52 +2553,52 @@ void ComponentInheritance_1_this_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2615,62 +2615,62 @@ void ComponentInheritance_1_this_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2687,32 +2687,32 @@ void ComponentInheritance_1_this_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2729,62 +2729,62 @@ void ComponentInheritance_1_this_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e7, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2801,52 +2801,52 @@ void ComponentInheritance_1_this_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2907,42 +2907,42 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(MeleeUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(MeleeUnit, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2962,52 +2962,52 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warrior, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warrior, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3027,62 +3027,62 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Warlock, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Warlock, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3102,32 +3102,32 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RangedUnit, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RangedUnit, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3147,62 +3147,62 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_field_src(&it, 1)); - test_uint(e6, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Archer, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Archer, ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); test_uint(e7, ecs_field_src(&it, 1)); - test_uint(e7, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3222,52 +3222,52 @@ void ComponentInheritance_1_var_src_not_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_field_src(&it, 1)); - test_uint(e4, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Wizard, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Wizard, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3315,9 +3315,9 @@ void ComponentInheritance_first_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warlock, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(Warlock, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3336,9 +3336,9 @@ void ComponentInheritance_first_self(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Warrior, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Warrior, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } diff --git a/test/query/src/GroupBy.c b/test/query/src/GroupBy.c index 0869b090b..248b5d0bc 100644 --- a/test/query/src/GroupBy.c +++ b/test/query/src/GroupBy.c @@ -202,13 +202,13 @@ void GroupBy_group_by_iter_one(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, it.group_id); test_bool(false, ecs_query_next(&it)); @@ -249,13 +249,13 @@ void GroupBy_group_by_iter_one_all_groups(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, it.group_id); test_bool(false, ecs_query_next(&it)); @@ -265,13 +265,13 @@ void GroupBy_group_by_iter_one_all_groups(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, it.group_id); test_bool(false, ecs_query_next(&it)); @@ -281,13 +281,13 @@ void GroupBy_group_by_iter_one_all_groups(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, it.group_id); test_bool(false, ecs_query_next(&it)); @@ -554,19 +554,19 @@ void GroupBy_group_by_default_action(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, it.group_id); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, it.group_id); test_bool(false, ecs_query_next(&it)); diff --git a/test/query/src/MemberTarget.c b/test/query/src/MemberTarget.c index 061461742..2641072f9 100644 --- a/test/query/src/MemberTarget.c +++ b/test/query/src/MemberTarget.c @@ -78,9 +78,9 @@ void MemberTarget_this_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -88,9 +88,9 @@ void MemberTarget_this_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -98,9 +98,9 @@ void MemberTarget_this_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -138,9 +138,9 @@ void MemberTarget_this_member_eq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -148,9 +148,9 @@ void MemberTarget_this_member_eq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -218,9 +218,9 @@ void MemberTarget_this_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -228,9 +228,9 @@ void MemberTarget_this_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -238,9 +238,9 @@ void MemberTarget_this_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -248,9 +248,9 @@ void MemberTarget_this_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -258,9 +258,9 @@ void MemberTarget_this_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -298,9 +298,9 @@ void MemberTarget_this_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -308,9 +308,9 @@ void MemberTarget_this_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -318,9 +318,9 @@ void MemberTarget_this_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -328,9 +328,9 @@ void MemberTarget_this_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -338,9 +338,9 @@ void MemberTarget_this_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -381,10 +381,10 @@ void MemberTarget_this_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -392,10 +392,10 @@ void MemberTarget_this_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -403,10 +403,10 @@ void MemberTarget_this_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Walking, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -414,10 +414,10 @@ void MemberTarget_this_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Sitting, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -425,10 +425,10 @@ void MemberTarget_this_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -472,11 +472,11 @@ void MemberTarget_this_member_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -484,11 +484,11 @@ void MemberTarget_this_member_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -496,11 +496,11 @@ void MemberTarget_this_member_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -544,11 +544,11 @@ void MemberTarget_this_member_var_read(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -556,11 +556,11 @@ void MemberTarget_this_member_var_read(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -568,11 +568,11 @@ void MemberTarget_this_member_var_read(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -610,9 +610,9 @@ void MemberTarget_this_member_eq_1_2nd_member(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -620,9 +620,9 @@ void MemberTarget_this_member_eq_1_2nd_member(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -630,9 +630,9 @@ void MemberTarget_this_member_eq_1_2nd_member(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -670,9 +670,9 @@ void MemberTarget_this_member_eq_2_2nd_member(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -680,9 +680,9 @@ void MemberTarget_this_member_eq_2_2nd_member(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -724,16 +724,16 @@ void MemberTarget_this_member_var_same_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -741,16 +741,16 @@ void MemberTarget_this_member_var_same_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); test_uint(Walking, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -758,16 +758,16 @@ void MemberTarget_this_member_var_same_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); test_uint(Sitting, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -809,16 +809,16 @@ void MemberTarget_this_member_var_same_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -826,16 +826,16 @@ void MemberTarget_this_member_var_same_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); test_uint(Walking, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -880,10 +880,10 @@ void MemberTarget_this_written_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -891,10 +891,10 @@ void MemberTarget_this_written_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -902,10 +902,10 @@ void MemberTarget_this_written_member_eq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -950,10 +950,10 @@ void MemberTarget_this_written_member_eq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -961,10 +961,10 @@ void MemberTarget_this_written_member_eq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1009,10 +1009,10 @@ void MemberTarget_this_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1020,10 +1020,10 @@ void MemberTarget_this_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1031,10 +1031,10 @@ void MemberTarget_this_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1042,10 +1042,10 @@ void MemberTarget_this_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1053,10 +1053,10 @@ void MemberTarget_this_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1104,11 +1104,11 @@ void MemberTarget_this_written_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1116,11 +1116,11 @@ void MemberTarget_this_written_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1128,11 +1128,11 @@ void MemberTarget_this_written_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Walking, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1140,11 +1140,11 @@ void MemberTarget_this_written_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Sitting, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1152,11 +1152,11 @@ void MemberTarget_this_written_member_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); test_uint(Running, ecs_iter_get_var(&it, x_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1496,18 +1496,18 @@ void MemberTarget_this_written_member_neq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1515,11 +1515,11 @@ void MemberTarget_this_written_member_neq_1(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1565,18 +1565,18 @@ void MemberTarget_this_written_member_neq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1584,11 +1584,11 @@ void MemberTarget_this_written_member_neq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1596,11 +1596,11 @@ void MemberTarget_this_written_member_neq_2(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1646,9 +1646,9 @@ void MemberTarget_this_written_member_neq_no_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -1691,18 +1691,18 @@ void MemberTarget_this_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1710,11 +1710,11 @@ void MemberTarget_this_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1722,11 +1722,11 @@ void MemberTarget_this_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1734,11 +1734,11 @@ void MemberTarget_this_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -1746,11 +1746,11 @@ void MemberTarget_this_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -1796,9 +1796,9 @@ void MemberTarget_this_written_member_neq_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -1963,18 +1963,18 @@ void MemberTarget_this_written_member_eq_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1982,11 +1982,11 @@ void MemberTarget_this_written_member_eq_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -1994,11 +1994,11 @@ void MemberTarget_this_written_member_eq_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2006,11 +2006,11 @@ void MemberTarget_this_written_member_eq_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -2018,11 +2018,11 @@ void MemberTarget_this_written_member_eq_optional(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2068,18 +2068,18 @@ void MemberTarget_this_written_member_eq_optional_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e0, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2087,11 +2087,11 @@ void MemberTarget_this_written_member_eq_optional_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2099,11 +2099,11 @@ void MemberTarget_this_written_member_eq_optional_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2111,11 +2111,11 @@ void MemberTarget_this_written_member_eq_optional_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -2123,11 +2123,11 @@ void MemberTarget_this_written_member_eq_optional_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2170,10 +2170,10 @@ void MemberTarget_this_member_eq_w_other_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2181,10 +2181,10 @@ void MemberTarget_this_member_eq_w_other_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2227,15 +2227,15 @@ void MemberTarget_this_member_eq_w_other_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -2244,15 +2244,15 @@ void MemberTarget_this_member_eq_w_other_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 40); test_int(p[0].y, 50); @@ -2303,11 +2303,11 @@ void MemberTarget_this_written_member_eq_w_other_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2315,11 +2315,11 @@ void MemberTarget_this_written_member_eq_w_other_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2369,16 +2369,16 @@ void MemberTarget_this_written_member_eq_w_other_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } { - Position *p = ecs_field(&it, Position, 3); + Position *p = ecs_field(&it, Position, 2); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -2387,16 +2387,16 @@ void MemberTarget_this_written_member_eq_w_other_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } { - Position *p = ecs_field(&it, Position, 3); + Position *p = ecs_field(&it, Position, 2); test_assert(p != NULL); test_int(p[0].x, 40); test_int(p[0].y, 50); @@ -2443,10 +2443,10 @@ void MemberTarget_this_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2454,10 +2454,10 @@ void MemberTarget_this_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2465,10 +2465,10 @@ void MemberTarget_this_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2476,10 +2476,10 @@ void MemberTarget_this_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2529,10 +2529,10 @@ void MemberTarget_this_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2540,10 +2540,10 @@ void MemberTarget_this_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2551,10 +2551,10 @@ void MemberTarget_this_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2562,10 +2562,10 @@ void MemberTarget_this_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -2611,11 +2611,11 @@ void MemberTarget_this_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2623,11 +2623,11 @@ void MemberTarget_this_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2635,11 +2635,11 @@ void MemberTarget_this_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2647,11 +2647,11 @@ void MemberTarget_this_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2701,12 +2701,12 @@ void MemberTarget_this_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2714,12 +2714,12 @@ void MemberTarget_this_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2727,12 +2727,12 @@ void MemberTarget_this_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -2740,12 +2740,12 @@ void MemberTarget_this_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2794,10 +2794,10 @@ void MemberTarget_var_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2805,10 +2805,10 @@ void MemberTarget_var_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2816,10 +2816,10 @@ void MemberTarget_var_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2827,10 +2827,10 @@ void MemberTarget_var_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2883,10 +2883,10 @@ void MemberTarget_var_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2894,10 +2894,10 @@ void MemberTarget_var_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e6, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -2905,10 +2905,10 @@ void MemberTarget_var_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -2916,10 +2916,10 @@ void MemberTarget_var_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -2968,11 +2968,11 @@ void MemberTarget_var_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2980,11 +2980,11 @@ void MemberTarget_var_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -2992,11 +2992,11 @@ void MemberTarget_var_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3004,11 +3004,11 @@ void MemberTarget_var_written_2_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3061,12 +3061,12 @@ void MemberTarget_var_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3074,12 +3074,12 @@ void MemberTarget_var_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3087,12 +3087,12 @@ void MemberTarget_var_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3100,12 +3100,12 @@ void MemberTarget_var_written_3_or(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e6, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3143,9 +3143,9 @@ void MemberTarget_this_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3153,9 +3153,9 @@ void MemberTarget_this_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3163,9 +3163,9 @@ void MemberTarget_this_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3209,9 +3209,9 @@ void MemberTarget_this_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3219,9 +3219,9 @@ void MemberTarget_this_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3229,9 +3229,9 @@ void MemberTarget_this_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3276,10 +3276,10 @@ void MemberTarget_this_written_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3287,10 +3287,10 @@ void MemberTarget_this_written_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3298,10 +3298,10 @@ void MemberTarget_this_written_2_or_w_2_members(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3352,10 +3352,10 @@ void MemberTarget_this_written_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3363,10 +3363,10 @@ void MemberTarget_this_written_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3374,10 +3374,10 @@ void MemberTarget_this_written_2_or_w_2_types(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -3417,9 +3417,9 @@ void MemberTarget_this_2_or_2_types_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3427,9 +3427,9 @@ void MemberTarget_this_2_or_2_types_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3437,9 +3437,9 @@ void MemberTarget_this_2_or_2_types_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3447,9 +3447,9 @@ void MemberTarget_this_2_or_2_types_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3457,9 +3457,9 @@ void MemberTarget_this_2_or_2_types_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3505,11 +3505,11 @@ void MemberTarget_this_2_or_2_types_dep_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Running, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3517,11 +3517,11 @@ void MemberTarget_this_2_or_2_types_dep_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Sitting, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3529,11 +3529,11 @@ void MemberTarget_this_2_or_2_types_dep_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(Walking, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3541,11 +3541,11 @@ void MemberTarget_this_2_or_2_types_dep_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(Running, ecs_iter_get_var(&it, y_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3553,11 +3553,11 @@ void MemberTarget_this_2_or_2_types_dep_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(Sitting, ecs_iter_get_var(&it, y_var)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3598,9 +3598,9 @@ void MemberTarget_var_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3608,9 +3608,9 @@ void MemberTarget_var_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3618,9 +3618,9 @@ void MemberTarget_var_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3694,9 +3694,9 @@ void MemberTarget_var_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3704,9 +3704,9 @@ void MemberTarget_var_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3714,9 +3714,9 @@ void MemberTarget_var_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3724,9 +3724,9 @@ void MemberTarget_var_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3734,9 +3734,9 @@ void MemberTarget_var_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3777,9 +3777,9 @@ void MemberTarget_var_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3787,9 +3787,9 @@ void MemberTarget_var_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -3797,9 +3797,9 @@ void MemberTarget_var_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Walking); } @@ -3807,9 +3807,9 @@ void MemberTarget_var_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -3817,9 +3817,9 @@ void MemberTarget_var_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 0)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 0); test_assert(m != NULL); test_int(m[0], Running); } @@ -4035,10 +4035,10 @@ void MemberTarget_var_written_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4046,10 +4046,10 @@ void MemberTarget_var_written_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4057,10 +4057,10 @@ void MemberTarget_var_written_member_eq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4148,10 +4148,10 @@ void MemberTarget_var_written_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4159,10 +4159,10 @@ void MemberTarget_var_written_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4170,10 +4170,10 @@ void MemberTarget_var_written_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4181,10 +4181,10 @@ void MemberTarget_var_written_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4192,10 +4192,10 @@ void MemberTarget_var_written_member_eq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4243,10 +4243,10 @@ void MemberTarget_var_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4254,10 +4254,10 @@ void MemberTarget_var_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -4265,10 +4265,10 @@ void MemberTarget_var_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -4276,10 +4276,10 @@ void MemberTarget_var_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Running); } @@ -4287,10 +4287,10 @@ void MemberTarget_var_written_member_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -4339,18 +4339,18 @@ void MemberTarget_var_written_member_neq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e0, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -4358,11 +4358,11 @@ void MemberTarget_var_written_member_neq(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -4411,9 +4411,9 @@ void MemberTarget_var_written_member_neq_no_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e0, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -4459,18 +4459,18 @@ void MemberTarget_var_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e0, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Movement), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Movement), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -4478,11 +4478,11 @@ void MemberTarget_var_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -4490,11 +4490,11 @@ void MemberTarget_var_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } @@ -4502,11 +4502,11 @@ void MemberTarget_var_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Sitting); } @@ -4514,11 +4514,11 @@ void MemberTarget_var_written_member_neq_all_matches(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(ecs_entity_t), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 1)); { - ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 2); + ecs_entity_t *m = ecs_field(&it, ecs_entity_t, 1); test_assert(m != NULL); test_int(m[0], Walking); } diff --git a/test/query/src/Operators.c b/test/query/src/Operators.c index 0021a772d..f60d8b14f 100644 --- a/test/query/src/Operators.c +++ b/test/query/src/Operators.c @@ -49,12 +49,12 @@ void Operators_2_and_not(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -98,12 +98,12 @@ void Operators_2_and_not_component(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -147,12 +147,12 @@ void Operators_2_and_out_not(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -196,12 +196,12 @@ void Operators_2_and_out_not_component(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -262,13 +262,13 @@ void Operators_3_and_not_not(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -322,12 +322,12 @@ void Operators_2_and_not_pair_rel_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -381,12 +381,12 @@ void Operators_2_and_not_pair_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -450,12 +450,12 @@ void Operators_2_and_not_pair_rel_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -512,12 +512,12 @@ void Operators_2_and_not_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -575,12 +575,12 @@ void Operators_2_and_not_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -641,12 +641,12 @@ void Operators_2_and_not_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -704,12 +704,12 @@ void Operators_2_and_not_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -768,12 +768,12 @@ void Operators_2_and_not_pair_rel_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -785,23 +785,23 @@ void Operators_2_and_not_pair_rel_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -853,12 +853,12 @@ void Operators_2_and_not_pair_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -870,23 +870,23 @@ void Operators_2_and_not_pair_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -939,12 +939,12 @@ void Operators_2_and_not_pair_rel_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -956,23 +956,23 @@ void Operators_2_and_not_pair_rel_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -1025,12 +1025,12 @@ void Operators_2_and_not_pair_rel_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, e1), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1042,23 +1042,23 @@ void Operators_2_and_not_pair_rel_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, e1), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtB, e2), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtB, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -1108,12 +1108,12 @@ void Operators_2_and_not_pair_rel_src_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1124,22 +1124,22 @@ void Operators_2_and_not_pair_rel_src_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1181,12 +1181,12 @@ void Operators_2_and_not_pair_any_rel(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1228,12 +1228,12 @@ void Operators_2_and_not_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1277,12 +1277,12 @@ void Operators_2_and_not_pair_any_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1310,9 +1310,9 @@ void Operators_1_not_any_src_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1352,9 +1352,9 @@ void Operators_1_not_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1364,9 +1364,9 @@ void Operators_1_not_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1406,9 +1406,9 @@ void Operators_1_not_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1418,9 +1418,9 @@ void Operators_1_not_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1477,9 +1477,9 @@ void Operators_1_not_any_src_any_isa_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1521,22 +1521,22 @@ void Operators_2_and_optional(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -1575,41 +1575,41 @@ void Operators_3_and_optional_optional(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1650,42 +1650,42 @@ void Operators_2_and_optional_pair_rel_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1726,42 +1726,42 @@ void Operators_2_and_optional_pair_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1805,45 +1805,45 @@ void Operators_2_and_optional_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -1888,45 +1888,45 @@ void Operators_2_and_optional_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -1976,60 +1976,60 @@ void Operators_2_and_optional_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); @@ -2083,45 +2083,45 @@ void Operators_2_and_optional_pair_rel_tgt_same_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, RelA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, RelA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2170,45 +2170,45 @@ void Operators_2_and_optional_pair_rel_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -2258,45 +2258,45 @@ void Operators_2_and_optional_pair_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -2351,60 +2351,60 @@ void Operators_2_and_optional_pair_rel_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); @@ -2458,45 +2458,45 @@ void Operators_2_and_optional_pair_rel_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, RelA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, RelA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -2539,32 +2539,32 @@ void Operators_2_and_optional_pair_rel_src_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e3, e3), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e3, e3), ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2612,45 +2612,45 @@ void Operators_3_and_optional_optional_pair_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelC, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelC, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelC, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelC, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelC, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelC, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); @@ -2694,32 +2694,32 @@ void Operators_2_and_optional_pair_any_rel(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2761,32 +2761,32 @@ void Operators_2_and_optional_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2833,34 +2833,34 @@ void Operators_2_and_optional_pair_any_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -2917,57 +2917,57 @@ void Operators_3_and_optional_dependent_and_pair_rel(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3024,57 +3024,57 @@ void Operators_3_and_optional_dependent_and_pair_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3124,45 +3124,45 @@ void Operators_3_and_optional_dependent_and_pair_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtA, RelA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtA, RelA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, RelA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, RelA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(RelA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); @@ -3210,29 +3210,29 @@ void Operators_3_and_optional_dependent_and_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -3287,57 +3287,57 @@ void Operators_3_and_optional_dependent_and_pair_rel_tgt_same_other_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t2, ecs_field_src(&it, 3)); + test_uint(t2, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t2, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t3, ecs_field_src(&it, 3)); + test_uint(t3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t3, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtC, TgtC), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtC, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t3, ecs_field_src(&it, 3)); + test_uint(t3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t3, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -3389,43 +3389,43 @@ void Operators_3_and_optional_dependent_and_pair_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t2, ecs_field_src(&it, 3)); + test_uint(t2, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t2, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t3, ecs_field_src(&it, 3)); + test_uint(t3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t3, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -3483,71 +3483,71 @@ void Operators_3_and_optional_dependent_optional_pair_rel(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e4, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e4, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3603,71 +3603,71 @@ void Operators_3_and_optional_dependent_optional_pair_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3719,57 +3719,57 @@ void Operators_3_and_optional_dependent_optional_pair_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t1, ecs_field_src(&it, 3)); + test_uint(t1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t2), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t2, ecs_field_src(&it, 3)); + test_uint(t2, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t2, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t3), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t3, ecs_field_src(&it, 3)); + test_uint(t3, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(t3, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -3844,15 +3844,15 @@ void Operators_3_and_optional_dependent_not_pair_rel(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); @@ -3927,15 +3927,15 @@ void Operators_3_and_optional_dependent_not_pair_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); @@ -3988,15 +3988,15 @@ void Operators_3_and_optional_dependent_not_pair_src(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4009,29 +4009,29 @@ void Operators_3_and_optional_dependent_not_pair_src(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t1, ecs_field_src(&it, 3)); + test_uint(t1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4044,29 +4044,29 @@ void Operators_3_and_optional_dependent_not_pair_src(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t1, ecs_field_src(&it, 3)); + test_uint(t1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4080,29 +4080,29 @@ void Operators_3_and_optional_dependent_not_pair_src(void) { test_uint(2, it.count); test_uint(e1, it.entities[0]); test_uint(e3, it.entities[1]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(EcsWildcard, ecs_field_src(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(EcsWildcard, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, t1), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(t1, ecs_field_src(&it, 3)); + test_uint(t1, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4130,9 +4130,9 @@ void Operators_1_optional_any_src_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4142,9 +4142,9 @@ void Operators_1_optional_any_src_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4154,9 +4154,9 @@ void Operators_1_optional_any_src_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4182,9 +4182,9 @@ void Operators_1_optional_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4194,9 +4194,9 @@ void Operators_1_optional_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4206,9 +4206,9 @@ void Operators_1_optional_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4218,9 +4218,9 @@ void Operators_1_optional_any_src_any_tgt_fixed_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4246,9 +4246,9 @@ void Operators_1_optional_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4258,9 +4258,9 @@ void Operators_1_optional_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4270,9 +4270,9 @@ void Operators_1_optional_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4282,9 +4282,9 @@ void Operators_1_optional_any_src_any_first_fixed_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4306,9 +4306,9 @@ void Operators_1_optional_any_src_any_childof_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4332,9 +4332,9 @@ void Operators_1_optional_any_src_any_isa_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4344,9 +4344,9 @@ void Operators_1_optional_any_src_any_isa_pair_any_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsIsA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4389,30 +4389,30 @@ void Operators_2_or(void) { test_bool(true, ecs_query_next(&it)); test_uint(e1, it.entities[0]); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(e2, it.entities[0]); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(e3, it.entities[0]); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(e4, it.entities[0]); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -4451,23 +4451,23 @@ void Operators_3_or(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelC, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4509,20 +4509,20 @@ void Operators_2_or_w_and(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -4564,26 +4564,26 @@ void Operators_3_or_w_and(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(TagC, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(TagC, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -4626,26 +4626,26 @@ void Operators_2_or_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4693,34 +4693,34 @@ void Operators_3_or_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4772,28 +4772,28 @@ void Operators_2_or_written_w_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -4849,37 +4849,37 @@ void Operators_3_or_written_w_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, RelD), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelD, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, RelD), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelD, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(RelD, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -4932,28 +4932,28 @@ void Operators_2_or_written_w_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -5013,36 +5013,36 @@ void Operators_2_or_written_w_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtC), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtB, TgtC), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtC), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtB, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(TgtC, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtB, TgtC), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtB, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); - test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtD), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(ecs_pair(TgtD, TgtA), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtD), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(ecs_pair(TgtD, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtD, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e4, it.entities[0]); @@ -5095,31 +5095,31 @@ void Operators_2_or_written_w_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtC, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtC, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); @@ -5175,37 +5175,37 @@ void Operators_3_or_written_w_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtC), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Tag, TgtD), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtD), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Tag, TgtD), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtD), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(TgtD, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -5264,38 +5264,38 @@ void Operators_2_or_chains_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(RelD, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelD, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(RelD, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelD, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e6, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -5349,34 +5349,34 @@ void Operators_2_or_chains(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e4, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelD, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelD, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e5, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(e6, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(RelD, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(RelD, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -5424,28 +5424,28 @@ void Operators_2_or_dependent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_uint(tgt, ecs_iter_get_var(&it, tgt_var)); @@ -5495,28 +5495,28 @@ void Operators_2_or_dependent_reverse(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_uint(tgt, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); @@ -5572,26 +5572,26 @@ void Operators_2_or_dependent_2_vars(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(RelD, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(RelD, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(tgt_a, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelB, tgt_b), ecs_field_id(&it, 1)); - test_uint(RelC, ecs_field_id(&it, 2)); - test_uint(RelD, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(ecs_pair(RelB, tgt_b), ecs_field_id(&it, 0)); + test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(RelD, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(tgt_b, ecs_iter_get_var(&it, y_var)); @@ -5643,34 +5643,34 @@ void Operators_2_or_written_dependent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(e2, it.entities[0]); test_uint(tgt, ecs_iter_get_var(&it, tgt_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_uint(e3, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, tgt_var)); @@ -5727,30 +5727,30 @@ void Operators_2_or_written_dependent_2_vars(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(RelD, ecs_field_id(&it, 4)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(RelD, ecs_field_id(&it, 3)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 3)); test_uint(e1, it.entities[0]); test_uint(tgt_a, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, tgt_b), ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(RelD, ecs_field_id(&it, 4)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, tgt_b), ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(RelD, ecs_field_id(&it, 3)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 3)); test_uint(e2, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(tgt_b, ecs_iter_get_var(&it, y_var)); @@ -5805,37 +5805,37 @@ void Operators_2_or_w_dependent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 2)); - // test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); + // test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_uint(e1, it.entities[0]); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 2)); - test_uint(RelB, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, tgt_a), ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(e2, it.entities[0]); test_uint(tgt_a, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, tgt_b), ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, tgt_b), ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_uint(e3, it.entities[0]); test_uint(tgt_b, ecs_iter_get_var(&it, x_var)); @@ -5872,17 +5872,17 @@ void Operators_2_or_w_both(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -5926,42 +5926,42 @@ void Operators_3_or_w_both(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(RelC, ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -5995,12 +5995,12 @@ void Operators_2_or_w_not(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6034,12 +6034,12 @@ void Operators_2_or_w_not_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6073,12 +6073,12 @@ void Operators_2_or_w_not_out_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(RelA, ecs_field_id(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6112,12 +6112,12 @@ void Operators_2_or_w_not_out_all_components(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(ecs_id(Mass), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6158,12 +6158,12 @@ void Operators_2_not_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -6175,12 +6175,12 @@ void Operators_2_not_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -6217,12 +6217,12 @@ void Operators_2_optional_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_uint(e3, it.entities[2]); @@ -6236,23 +6236,23 @@ void Operators_2_optional_first(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -6546,7 +6546,7 @@ void Operators_root_entities_empty(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); test_uint(EcsFlecs, it.entities[0]); if (ecs_query_next(&it)) { @@ -6578,12 +6578,12 @@ void Operators_root_entities(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); test_uint(EcsFlecs, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); test_uint(e1, it.entities[0]); if (ecs_query_next(&it)) { @@ -6623,19 +6623,19 @@ void Operators_root_entities_w_children(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, EcsFlecs), ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, EcsFlecs), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(EcsFlecs, ecs_iter_get_var(&it, this_var)); test_uint(EcsFlecs, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e2), ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e2), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -6673,46 +6673,46 @@ void Operators_root_entities_w_optional_children(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, EcsFlecs), ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, EcsFlecs), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(EcsFlecs, ecs_iter_get_var(&it, this_var)); test_uint(EcsFlecs, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, Tag), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, Tag), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Tag, ecs_iter_get_var(&it, this_var)); test_uint(Tag, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e1), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e1), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e2), ecs_field_id(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e2), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e4), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e4), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, this_var)); test_uint(e4, it.entities[0]); @@ -6747,11 +6747,11 @@ void Operators_core_entities_w_optional_children(void) { { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(ecs_field_is_set(&it, 1)); + test_assert(ecs_field_is_set(&it, 0)); for (int i = 0; i < it.count; i ++) { test_assert(ecs_has_pair( world, it.entities[i], EcsChildOf, EcsFlecsCore)); - if (ecs_field_is_set(&it, 2)) { + if (ecs_field_is_set(&it, 1)) { test_assert(ecs_count_id( world, ecs_pair(EcsChildOf, it.entities[i])) != 0); } else { @@ -6793,28 +6793,28 @@ void Operators_root_entities_w_not_children(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, Tag), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, Tag), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Tag, ecs_iter_get_var(&it, this_var)); test_uint(Tag, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e1), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e1), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, e4), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(EcsChildOf, 0), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, e4), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, this_var)); test_uint(e4, it.entities[0]); @@ -6849,8 +6849,8 @@ void Operators_core_entities_w_not_children(void) { { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - test_assert(ecs_field_is_set(&it, 1)); - test_assert(!ecs_field_is_set(&it, 2)); + test_assert(ecs_field_is_set(&it, 0)); + test_assert(!ecs_field_is_set(&it, 1)); for (int i = 0; i < it.count; i ++) { test_assert(ecs_has_pair( world, it.entities[i], EcsChildOf, EcsFlecsCore)); @@ -6902,9 +6902,9 @@ void Operators_1_ent_src_not(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -6952,9 +6952,9 @@ void Operators_1_ent_src_not_pair(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7004,9 +7004,9 @@ void Operators_1_ent_src_not_pair_rel_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7056,9 +7056,9 @@ void Operators_1_ent_src_not_pair_tgt_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7139,9 +7139,9 @@ void Operators_1_ent_src_not_pair_rel_any(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7191,9 +7191,9 @@ void Operators_1_ent_src_not_pair_tgt_any(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7280,9 +7280,9 @@ void Operators_1_ent_src_not_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtB), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -7339,9 +7339,9 @@ void Operators_1_ent_src_not_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelB, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -7415,9 +7415,9 @@ void Operators_1_ent_src_not_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -7465,9 +7465,9 @@ void Operators_1_this_src_not_pair_rel_var(void) { } } - test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); } @@ -7515,9 +7515,9 @@ void Operators_1_this_src_not_pair_tgt_var(void) { } } - test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(RelA, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); } @@ -7567,9 +7567,9 @@ void Operators_1_this_src_not_pair_rel_tgt_var(void) { } } - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, y_var)); } @@ -7622,9 +7622,9 @@ void Operators_1_this_src_not_pair_rel_tgt_same_var(void) { } } - test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(EcsWildcard, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); } @@ -7665,12 +7665,12 @@ void Operators_1_ent_src_not_pair_rel_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtA), ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7711,12 +7711,12 @@ void Operators_1_ent_src_not_pair_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 2)); - test_uint(TgtC, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtC), ecs_field_id(&it, 1)); + test_uint(TgtC, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7758,12 +7758,12 @@ void Operators_1_ent_src_not_pair_rel_tgt_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, TgtB), ecs_field_id(&it, 2)); - test_uint(RelC, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(Tag, TgtB), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, TgtB), ecs_field_id(&it, 1)); + test_uint(RelC, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); @@ -7805,12 +7805,12 @@ void Operators_1_ent_src_not_pair_rel_tgt_same_var_written(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, RelB), ecs_field_id(&it, 2)); - test_uint(RelB, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, RelB), ecs_field_id(&it, 1)); + test_uint(RelB, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7855,7 +7855,7 @@ void Operators_and_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7884,7 +7884,7 @@ void Operators_not_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7915,7 +7915,7 @@ void Operators_not_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7951,7 +7951,7 @@ void Operators_or_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7961,7 +7961,7 @@ void Operators_or_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -7971,7 +7971,7 @@ void Operators_or_from_fixed_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8027,12 +8027,12 @@ void Operators_and_from_this(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8077,7 +8077,7 @@ void Operators_not_from_this(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); } test_assert(e1_found == true); test_assert(e2_found == true); @@ -8095,7 +8095,7 @@ void Operators_not_from_this(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8114,7 +8114,7 @@ void Operators_not_from_this(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8132,7 +8132,7 @@ void Operators_not_from_this(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8150,7 +8150,7 @@ void Operators_not_from_this(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); } test_assert(e1_found == true); test_assert(e2_found == true); @@ -8193,12 +8193,12 @@ void Operators_or_from_this(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8210,12 +8210,12 @@ void Operators_or_from_this(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8226,12 +8226,12 @@ void Operators_or_from_this(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8242,12 +8242,12 @@ void Operators_or_from_this(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -8308,14 +8308,14 @@ void Operators_and_from_this_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8363,10 +8363,10 @@ void Operators_not_from_this_written(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); } test_assert(e1_found == true); test_assert(e2_found == true); @@ -8384,10 +8384,10 @@ void Operators_not_from_this_written(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8406,10 +8406,10 @@ void Operators_not_from_this_written(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8427,10 +8427,10 @@ void Operators_not_from_this_written(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); } test_assert(e1_found == false); test_assert(e2_found == false); @@ -8448,10 +8448,10 @@ void Operators_not_from_this_written(void) { e1_found |= it.entities[i] == e1; e2_found |= it.entities[i] == e2; } - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); } test_assert(e1_found == true); test_assert(e2_found == true); @@ -8497,14 +8497,14 @@ void Operators_or_from_this_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8516,14 +8516,14 @@ void Operators_or_from_this_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8534,14 +8534,14 @@ void Operators_or_from_this_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8552,14 +8552,14 @@ void Operators_or_from_this_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -8657,9 +8657,9 @@ void Operators_and_from_empty_w_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -8687,9 +8687,9 @@ void Operators_not_from_empty_w_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -8717,9 +8717,9 @@ void Operators_or_from_empty_w_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); diff --git a/test/query/src/OrderBy.c b/test/query/src/OrderBy.c index 62c965309..2e12ce75b 100644 --- a/test/query/src/OrderBy.c +++ b/test/query/src/OrderBy.c @@ -627,7 +627,7 @@ void OrderBy_sort_after_set(void) { static void FlipP(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int32_t i; for (i = 0; i < it->count; i ++) { @@ -896,7 +896,7 @@ void OrderBy_sort_1000_entities(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1)); @@ -933,7 +933,7 @@ void OrderBy_sort_1000_entities_w_duplicates(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1) * 2); @@ -970,7 +970,7 @@ void OrderBy_sort_1000_entities_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1)); @@ -991,7 +991,7 @@ void OrderBy_sort_1000_entities_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == 1000); @@ -1028,7 +1028,7 @@ void OrderBy_sort_1000_entities_2_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1072,7 +1072,7 @@ void OrderBy_sort_1000_entities_2_types_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); int32_t j, x = 0; for (j = 0; j < it.count; j ++) { @@ -1090,7 +1090,7 @@ void OrderBy_sort_1000_entities_2_types_again(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1130,7 +1130,7 @@ void OrderBy_sort_1000_entities_add_type_after_sort(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1158,7 +1158,7 @@ void OrderBy_sort_1000_entities_add_type_after_sort(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1201,7 +1201,7 @@ void OrderBy_sort_1500_entities_3_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1249,7 +1249,7 @@ void OrderBy_sort_2000_entities_4_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1416,7 +1416,7 @@ void OrderBy_sort_2_entities_2_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1458,7 +1458,7 @@ void OrderBy_sort_3_entities_3_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1544,7 +1544,7 @@ void OrderBy_sort_4_entities_4_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; diff --git a/test/query/src/OrderByEntireTable.c b/test/query/src/OrderByEntireTable.c index f33548aea..1ac5ec6e4 100644 --- a/test/query/src/OrderByEntireTable.c +++ b/test/query/src/OrderByEntireTable.c @@ -636,7 +636,7 @@ void OrderByEntireTable_sort_after_set(void) { static void FlipP(ecs_iter_t *it) { - Position *p = ecs_field(it, Position, 1); + Position *p = ecs_field(it, Position, 0); int32_t i; for (i = 0; i < it->count; i ++) { @@ -907,7 +907,7 @@ void OrderByEntireTable_sort_1000_entities(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1)); @@ -944,7 +944,7 @@ void OrderByEntireTable_sort_1000_entities_w_duplicates(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1) * 2); @@ -982,7 +982,7 @@ void OrderByEntireTable_sort_1000_entities_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == (i + 1)); @@ -1003,7 +1003,7 @@ void OrderByEntireTable_sort_1000_entities_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(it.count == 1000); @@ -1041,7 +1041,7 @@ void OrderByEntireTable_sort_1000_entities_2_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1086,7 +1086,7 @@ void OrderByEntireTable_sort_1000_entities_2_types_again(void) { ecs_iter_t it = ecs_query_iter(world, q); while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); int32_t j, x = 0; for (j = 0; j < it.count; j ++) { @@ -1104,7 +1104,7 @@ void OrderByEntireTable_sort_1000_entities_2_types_again(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1145,7 +1145,7 @@ void OrderByEntireTable_sort_1000_entities_add_type_after_sort(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1173,7 +1173,7 @@ void OrderByEntireTable_sort_1000_entities_add_type_after_sort(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1217,7 +1217,7 @@ void OrderByEntireTable_sort_1500_entities_3_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1266,7 +1266,7 @@ void OrderByEntireTable_sort_2000_entities_4_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0, x = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1370,7 +1370,7 @@ void OrderByEntireTable_sort_2_entities_2_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1413,7 +1413,7 @@ void OrderByEntireTable_sort_3_entities_3_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; @@ -1501,7 +1501,7 @@ void OrderByEntireTable_sort_4_entities_4_types(void) { ecs_iter_t it = ecs_query_iter(world, q); int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); count += it.count; diff --git a/test/query/src/Recycled.c b/test/query/src/Recycled.c index fb5da5a35..4bff34a07 100644 --- a/test/query/src/Recycled.c +++ b/test/query/src/Recycled.c @@ -49,19 +49,19 @@ void Recycled_recycled_vars(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(Tag, ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(rel, ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(rel, ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(rel, ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); @@ -100,20 +100,20 @@ void Recycled_recycled_pair_vars(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_uint(EcsName, ecs_iter_get_var(&it, z_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(rel, ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_uint(tgt, ecs_iter_get_var(&it, z_var)); @@ -153,10 +153,10 @@ void Recycled_recycled_this_ent_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_uint(EcsName, ecs_iter_get_var(&it, this_var)); @@ -164,10 +164,10 @@ void Recycled_recycled_this_ent_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); - test_uint(src, ecs_field_src(&it, 2)); test_uint(rel, ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_uint(tgt, ecs_iter_get_var(&it, this_var)); @@ -209,12 +209,12 @@ void Recycled_has_recycled_id_from_pair(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 1)); - test_uint(tgt, ecs_field_id(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 3)); + test_uint(ecs_pair(rel, tgt), ecs_field_id(&it, 0)); + test_uint(tgt, ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(src, ecs_field_src(&it, 0)); test_uint(src, ecs_field_src(&it, 1)); test_uint(src, ecs_field_src(&it, 2)); - test_uint(src, ecs_field_src(&it, 3)); test_uint(rel, ecs_iter_get_var(&it, x_var)); test_uint(src, ecs_iter_get_var(&it, y_var)); test_uint(tgt, ecs_iter_get_var(&it, z_var)); @@ -251,7 +251,7 @@ void Recycled_recycled_pair(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e); - test_uint(ecs_field_id(&it, 1), ecs_pair(rel, tgt)); + test_uint(ecs_field_id(&it, 0), ecs_pair(rel, tgt)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -287,7 +287,7 @@ void Recycled_recycled_component_id(void) { test_int(it.count, 2); test_uint(it.entities[0], e1); test_uint(it.entities[1], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); test_int(p[1].x, 20); diff --git a/test/query/src/Scopes.c b/test/query/src/Scopes.c index 2587126c6..ea8983d49 100644 --- a/test/query/src/Scopes.c +++ b/test/query/src/Scopes.c @@ -36,9 +36,9 @@ void Scopes_term_w_not_scope_1_term(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -75,16 +75,16 @@ void Scopes_term_w_not_scope_2_terms(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -116,9 +116,9 @@ void Scopes_term_w_not_scope_1_term_w_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_1, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -155,16 +155,16 @@ void Scopes_term_w_not_scope_2_terms_w_not(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -199,9 +199,9 @@ void Scopes_term_w_not_scope_1_term_w_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_3, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -248,9 +248,9 @@ void Scopes_term_w_not_scope_2_terms_w_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(parent_2, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -332,9 +332,9 @@ void Scopes_term_w_not_scope_2_terms_w_not_w_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(parent_0, it.entities[0]); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -369,9 +369,9 @@ void Scopes_term_w_not_scope_2_terms_w_or(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e4, it.entities[0]); test_bool(false, ecs_query_next(&it)); } @@ -410,9 +410,9 @@ void Scopes_term_w_not_scope_3_terms_w_or(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Root, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Root, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(e5, it.entities[0]); test_bool(false, ecs_query_next(&it)); } diff --git a/test/query/src/Toggle.c b/test/query/src/Toggle.c index 934df9ea6..1421915e5 100644 --- a/test/query/src/Toggle.c +++ b/test/query/src/Toggle.c @@ -43,9 +43,9 @@ void Toggle_fixed_src_1_tag_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -62,9 +62,9 @@ void Toggle_fixed_src_1_tag_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -100,15 +100,15 @@ void Toggle_fixed_src_1_component_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -125,15 +125,15 @@ void Toggle_fixed_src_1_component_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -172,12 +172,12 @@ void Toggle_fixed_src_2_tag_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -194,12 +194,12 @@ void Toggle_fixed_src_2_tag_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -216,12 +216,12 @@ void Toggle_fixed_src_2_tag_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -267,24 +267,24 @@ void Toggle_fixed_src_2_component_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -301,24 +301,24 @@ void Toggle_fixed_src_2_component_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -335,24 +335,24 @@ void Toggle_fixed_src_2_component_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(e, ecs_field_src(&it, 0)); test_uint(e, ecs_field_src(&it, 1)); - test_uint(e, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -399,12 +399,12 @@ void Toggle_fixed_2_src_w_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -421,12 +421,12 @@ void Toggle_fixed_2_src_w_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -443,12 +443,12 @@ void Toggle_fixed_2_src_w_toggle(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -496,11 +496,11 @@ void Toggle_this_w_fixed_src_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -518,11 +518,11 @@ void Toggle_this_w_fixed_src_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -540,11 +540,11 @@ void Toggle_this_w_fixed_src_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -592,11 +592,11 @@ void Toggle_fixed_src_w_this_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -614,11 +614,11 @@ void Toggle_fixed_src_w_this_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -636,11 +636,11 @@ void Toggle_fixed_src_w_this_w_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -679,10 +679,10 @@ void Toggle_this_from_nothing(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_field_id(&it, 1), TagA); - test_uint(ecs_field_id(&it, 2), TagB); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_field_id(&it, 0), TagA); + test_uint(ecs_field_id(&it, 1), TagB); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -965,18 +965,18 @@ void Toggle_this_tag_pair_wildcard(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(e1, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(e3, it.entities[0]); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_uint(e5, it.entities[0]); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -1014,28 +1014,28 @@ void Toggle_this_toggle_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1054,28 +1054,28 @@ void Toggle_this_toggle_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? p : e, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? e : p, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1114,15 +1114,15 @@ void Toggle_this_toggle_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1141,15 +1141,15 @@ void Toggle_this_toggle_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1192,46 +1192,46 @@ void Toggle_this_toggle_shared_self_up_w_self(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1250,46 +1250,46 @@ void Toggle_this_toggle_shared_self_up_w_self(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? p : e, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(cache_kind == EcsQueryCacheDefault ? 1 : 2, v->x); test_int(cache_kind == EcsQueryCacheDefault ? 2 : 4, v->y); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? e : p, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(cache_kind == EcsQueryCacheDefault ? 2 : 1, v->x); test_int(cache_kind == EcsQueryCacheDefault ? 4 : 2, v->y); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1332,24 +1332,24 @@ void Toggle_this_toggle_shared_up_w_self(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1368,24 +1368,24 @@ void Toggle_this_toggle_shared_up_w_self(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1428,46 +1428,46 @@ void Toggle_this_toggle_shared_self_up_w_self_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1486,46 +1486,46 @@ void Toggle_this_toggle_shared_self_up_w_self_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1568,24 +1568,24 @@ void Toggle_this_toggle_shared_up_w_self_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1604,24 +1604,24 @@ void Toggle_this_toggle_shared_up_w_self_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1667,46 +1667,46 @@ void Toggle_this_toggle_shared_self_up_w_self_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1725,46 +1725,46 @@ void Toggle_this_toggle_shared_self_up_w_self_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? p : e, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(cache_kind == EcsQueryCacheDefault ? 0 : p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(cache_kind == EcsQueryCacheDefault ? 1 : 2, v->x); test_int(cache_kind == EcsQueryCacheDefault ? 2 : 4, v->y); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(cache_kind == EcsQueryCacheDefault ? e : p, it.entities[0]); - test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(cache_kind == EcsQueryCacheDefault ? p : 0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(cache_kind == EcsQueryCacheDefault ? 2 : 1, v->x); test_int(cache_kind == EcsQueryCacheDefault ? 4 : 2, v->y); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1810,24 +1810,24 @@ void Toggle_this_toggle_shared_up_w_self_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1846,24 +1846,24 @@ void Toggle_this_toggle_shared_up_w_self_toggle(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(p, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(p, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); { - const Position *p = ecs_field(&it, Position, 1); + const Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } { - const Velocity *v = ecs_field(&it, Velocity, 2); + const Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1909,46 +1909,46 @@ void Toggle_this_toggle_shared_self_up_w_self_toggle_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -1967,46 +1967,46 @@ void Toggle_this_toggle_shared_self_up_w_self_toggle_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2052,24 +2052,24 @@ void Toggle_this_toggle_shared_up_w_self_toggle_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2088,24 +2088,24 @@ void Toggle_this_toggle_shared_up_w_self_toggle_reverse(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - const Velocity *v = ecs_field(&it, Velocity, 1); + const Velocity *v = ecs_field(&it, Velocity, 0); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 4); } { - const Position *p = ecs_field(&it, Position, 2); + const Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2140,22 +2140,22 @@ void Toggle_this_toggle_not_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2174,20 +2174,20 @@ void Toggle_this_toggle_not_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2229,22 +2229,22 @@ void Toggle_this_toggle_not_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2256,11 +2256,11 @@ void Toggle_this_toggle_not_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2272,20 +2272,20 @@ void Toggle_this_toggle_not_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2297,11 +2297,11 @@ void Toggle_this_toggle_not_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2336,21 +2336,21 @@ void Toggle_this_toggle_optional_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2362,21 +2362,21 @@ void Toggle_this_toggle_optional_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2388,20 +2388,20 @@ void Toggle_this_toggle_optional_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2413,21 +2413,21 @@ void Toggle_this_toggle_optional_shared_self_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -2462,21 +2462,21 @@ void Toggle_this_toggle_optional_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2488,21 +2488,21 @@ void Toggle_this_toggle_optional_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2514,20 +2514,20 @@ void Toggle_this_toggle_optional_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2539,21 +2539,21 @@ void Toggle_this_toggle_optional_shared_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -2600,8 +2600,8 @@ void test_disable_toggle_mod(int32_t total, int32_t mod) { int32_t count = 0, toggle_count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); int32_t i; @@ -2661,8 +2661,8 @@ void test_enable_toggle_mod(int32_t total, int32_t mod) { int32_t count = 0, toggle_count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); int32_t i; @@ -3579,9 +3579,9 @@ void Toggle_this_w_other_tag(void) { int32_t count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); int32_t i; @@ -3642,11 +3642,11 @@ void Toggle_this_w_other_component(void) { int32_t count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); int32_t i; @@ -3696,8 +3696,8 @@ void Toggle_this_not(void) { int32_t count = 0, pos_count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 0)); int32_t i; for (i = 0; i < it.count; i ++) { @@ -3764,10 +3764,10 @@ void this_written_not(int total, int mod) { int32_t count = 0, pos_count = 0; while (ecs_query_next(&it)) { - test_uint(Tag, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); int32_t i; for (i = 0; i < it.count; i ++) { @@ -3860,24 +3860,24 @@ void this_optional(int total, int mod) { int32_t count = 0, with_pos_count = 0; while (ecs_query_next(&it)) { - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - Position *ptr = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + Position *ptr = ecs_field(&it, Position, 0); if (ecs_table_has_id(world, it.table, ECS_TOGGLE | ecs_id(Position))) { for (int32_t i = 0; i < it.count; i ++) { if (ecs_is_enabled(world, it.entities[i], Position)) { - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ptr != NULL); test_assert(ptr[i].x == it.entities[i]); test_assert(ptr[i].y == it.entities[i]); with_pos_count ++; } else { - test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 0)); } } } else { if (ecs_table_has_id(world, it.table, ecs_id(Position))) { - test_bool(true, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 0)); test_assert(ptr != NULL); for (int32_t i = 0; i < it.count; i ++) { test_assert(ecs_is_enabled(world, it.entities[i], Position)); @@ -3886,7 +3886,7 @@ void this_optional(int total, int mod) { with_pos_count ++; } } else { - test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 0)); for (int32_t i = 0; i < it.count; i ++) { test_assert(!ecs_is_enabled(world, it.entities[i], Position)); } @@ -3950,27 +3950,27 @@ void this_written_optional(int total, int mod) { int32_t count = 0, with_pos_count = 0, without_pos_count = 0; while (ecs_query_next(&it)) { - test_uint(Tag, ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - Position *ptr = ecs_field(&it, Position, 2); + test_uint(Tag, ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + Position *ptr = ecs_field(&it, Position, 1); if (ecs_table_has_id(world, it.table, ECS_TOGGLE | ecs_id(Position))) { for (int32_t i = 0; i < it.count; i ++) { if (ecs_is_enabled(world, it.entities[i], Position)) { - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 1)); test_assert(ptr != NULL); test_assert(ptr[i].x == it.entities[i]); test_assert(ptr[i].y == it.entities[i]); with_pos_count ++; } else { - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 1)); without_pos_count ++; } } } else { if (ecs_table_has_id(world, it.table, ecs_id(Position))) { - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 1)); test_assert(ptr != NULL); for (int32_t i = 0; i < it.count; i ++) { test_assert(ecs_is_enabled(world, it.entities[i], Position)); @@ -3979,7 +3979,7 @@ void this_written_optional(int total, int mod) { with_pos_count ++; } } else { - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 1)); for (int32_t i = 0; i < it.count; i ++) { test_assert(!ecs_is_enabled(world, it.entities[i], Position)); without_pos_count ++; @@ -4127,14 +4127,14 @@ void Toggle_this_table_move_2_from_3(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 10); test_int(p->y, 20); } { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p->x, 30); test_int(p->y, 40); } test_bool(false, ecs_query_next(&it)); @@ -4226,42 +4226,42 @@ void Toggle_this_written_toggle_w_not_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_iter_next(&it)); @@ -4352,42 +4352,42 @@ void Toggle_this_written_not_toggle_w_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_iter_next(&it)); @@ -4478,72 +4478,72 @@ void Toggle_this_written_toggle_w_optional_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_iter_next(&it)); @@ -4634,72 +4634,72 @@ void Toggle_this_written_optional_toggle_w_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(false, ecs_iter_next(&it)); @@ -4790,72 +4790,72 @@ void Toggle_this_written_not_w_optional_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e11, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Position), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -4946,72 +4946,72 @@ void Toggle_this_written_optional_w_not_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e11, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -5102,32 +5102,32 @@ void Toggle_this_written_2_not_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e11, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -5218,112 +5218,112 @@ void Toggle_this_written_2_optional_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e10, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); + test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e11, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_bool(false, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -5465,50 +5465,50 @@ void Toggle_this_written_toggle_w_2_not_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(false, ecs_iter_next(&it)); @@ -5650,110 +5650,110 @@ void Toggle_this_written_toggle_w_2_optional_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e9, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 2)); test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e12, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 3)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e13, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -5895,14 +5895,14 @@ void Toggle_this_written_2_toggle_w_not_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e12, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); @@ -6044,50 +6044,50 @@ void Toggle_this_written_2_toggle_w_optional_toggle(void) { test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e8, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(true, ecs_field_is_set(&it, 4)); test_bool(true, ecs_iter_next(&it)); test_int(1, it.count); test_uint(e12, it.entities[0]); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 4)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); test_bool(true, ecs_field_is_set(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 3)); - test_bool(false, ecs_field_is_set(&it, 4)); + test_bool(false, ecs_field_is_set(&it, 3)); test_bool(false, ecs_iter_next(&it)); diff --git a/test/query/src/Transitive.c b/test/query/src/Transitive.c index a4dad7596..bd767a288 100644 --- a/test/query/src/Transitive.c +++ b/test/query/src/Transitive.c @@ -53,9 +53,9 @@ void Transitive_1_fact_0_lvl_true(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -89,9 +89,9 @@ void Transitive_1_fact_1_lvl_true(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -125,9 +125,9 @@ void Transitive_1_fact_2_lvl_true(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -246,8 +246,8 @@ void Transitive_1_fact_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -258,8 +258,8 @@ void Transitive_1_fact_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -285,14 +285,14 @@ void Transitive_1_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(BaseA, it.entities[0]); - test_uint(ecs_isa(BaseA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_isa(BaseA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_isa(BaseA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_isa(BaseA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -316,7 +316,7 @@ void Transitive_1_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ecs_childof(BaseA), ecs_field_id(&it, 1)); + test_uint(ecs_childof(BaseA), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -358,10 +358,10 @@ void Transitive_1_this_src_written_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e5, it.entities[1]); @@ -407,19 +407,19 @@ void Transitive_1_this_src_written_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e5, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -464,27 +464,27 @@ void Transitive_1_this_src_written_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, it.entities[0]); test_uint(e5, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -527,10 +527,10 @@ void Transitive_1_this_src_written_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -549,18 +549,18 @@ void Transitive_1_this_src_written_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e7, it.entities[0]); test_uint(e8, it.entities[1]); @@ -610,15 +610,15 @@ void Transitive_1_this_src_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e6, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -662,28 +662,28 @@ void Transitive_1_this_src_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e6, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -727,47 +727,47 @@ void Transitive_1_this_src_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e6, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e4, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -813,34 +813,34 @@ void Transitive_1_this_src_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, it.entities[0]); test_uint(e6, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e3, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -880,14 +880,14 @@ void Transitive_1_ent_src_tgt_var_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -927,20 +927,20 @@ void Transitive_1_ent_src_tgt_var_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -980,26 +980,26 @@ void Transitive_1_ent_src_tgt_var_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1036,32 +1036,32 @@ void Transitive_1_ent_src_tgt_var_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1092,104 +1092,104 @@ void Transitive_1_this_src_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); @@ -1225,167 +1225,167 @@ void Transitive_1_this_src_tgt_var_reflexive(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Amsterdam, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Washington, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); @@ -1435,18 +1435,18 @@ void Transitive_1_var_src_written_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1494,26 +1494,26 @@ void Transitive_1_var_src_written_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1561,34 +1561,34 @@ void Transitive_1_var_src_written_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); test_uint(e5, ecs_field_src(&it, 1)); - test_uint(e5, ecs_field_src(&it, 2)); test_uint(e5, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); test_uint(e3, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1634,10 +1634,10 @@ void Transitive_1_var_src_written_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1656,26 +1656,26 @@ void Transitive_1_var_src_written_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); test_uint(e7, ecs_field_src(&it, 1)); - test_uint(e7, ecs_field_src(&it, 2)); test_uint(e7, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, e2), ecs_field_id(&it, 1)); + test_uint(e8, ecs_field_src(&it, 0)); test_uint(e8, ecs_field_src(&it, 1)); - test_uint(e8, ecs_field_src(&it, 2)); test_uint(e8, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1727,20 +1727,20 @@ void Transitive_1_var_src_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e6, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1787,38 +1787,38 @@ void Transitive_1_var_src_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e6, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1865,62 +1865,62 @@ void Transitive_1_var_src_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e6, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(e4, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(e4, ecs_field_src(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -1969,44 +1969,44 @@ void Transitive_1_var_src_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e6, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e6, ecs_field_src(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(e3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(e3, ecs_field_src(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, r_var)); test_bool(false, ecs_query_next(&it)); @@ -2040,141 +2040,141 @@ void Transitive_1_var_src_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); @@ -2212,204 +2212,204 @@ void Transitive_1_var_src_tgt_var_reflexive(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Amsterdam, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); @@ -2451,15 +2451,15 @@ void Transitive_1_ent_src_tgt_this_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Earth, it.entities[0]); @@ -2501,22 +2501,22 @@ void Transitive_1_ent_src_tgt_this_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Earth, it.entities[0]); @@ -2558,29 +2558,29 @@ void Transitive_1_ent_src_tgt_this_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Earth, it.entities[0]); @@ -2619,36 +2619,36 @@ void Transitive_1_ent_src_tgt_this_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Earth, it.entities[0]); @@ -2684,160 +2684,160 @@ void Transitive_1_var_src_tgt_this(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(Washington, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); @@ -2876,232 +2876,232 @@ void Transitive_1_var_src_tgt_this_reflexive(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Amsterdam, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(Washington, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(SanFrancisco, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(LosAngeles, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, this_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_uint(Washington, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(California, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Washington, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); test_uint(Netherlands, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, this_var)); test_uint(Netherlands, ecs_iter_get_var(&it, r_var)); test_uint(Earth, it.entities[0]); @@ -3146,10 +3146,10 @@ void Transitive_2_ent_src_constrain_tgt_var_before_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(City, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(City, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3191,10 +3191,10 @@ void Transitive_2_ent_src_constrain_tgt_var_before_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); - test_uint(California, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(California, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3235,10 +3235,10 @@ void Transitive_2_ent_src_constrain_tgt_var_before_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3281,10 +3281,10 @@ void Transitive_2_ent_src_constrain_tgt_var_after_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(City, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(City, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 1)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3326,10 +3326,10 @@ void Transitive_2_ent_src_constrain_tgt_var_after_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(California, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(California, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3370,10 +3370,10 @@ void Transitive_2_ent_src_constrain_tgt_var_after_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3418,29 +3418,29 @@ void Transitive_2_this_src_constrain_tgt_var_before_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(City, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(City, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(City, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 2)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(City, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(LosAngeles, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(City, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 2)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(City, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(Amsterdam, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3485,57 +3485,57 @@ void Transitive_2_this_src_constrain_tgt_var_before_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); - test_uint(California, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(California, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); - test_uint(California, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(California, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 2)); - test_uint(California, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); + test_uint(California, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 2)); - test_uint(Washington, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); + test_uint(Washington, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 2)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(State, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 2)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(State, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3579,76 +3579,76 @@ void Transitive_2_this_src_constrain_tgt_var_before_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 2)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 2)); - test_uint(Netherlands, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); + test_uint(Netherlands, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 2)); - test_uint(Netherlands, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); + test_uint(Netherlands, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Country, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 2)); - test_uint(Netherlands, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(Country, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); + test_uint(Netherlands, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -3694,28 +3694,28 @@ void Transitive_2_this_src_constrain_tgt_var_after_0_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(City, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(City, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 1)); test_uint(Amsterdam, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(City, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(City, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 1)); test_uint(LosAngeles, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(City, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(City, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 1)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -3761,56 +3761,56 @@ void Transitive_2_this_src_constrain_tgt_var_after_1_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 1)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(California, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(California, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(California, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(California, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 1)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 1)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(State, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(California, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(State, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(California, ecs_field_src(&it, 1)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); @@ -3855,75 +3855,75 @@ void Transitive_2_this_src_constrain_tgt_var_after_2_lvl(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 1)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Country, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Country, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 1)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); @@ -3972,56 +3972,56 @@ void Transitive_1_src_tgt_same_var_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(Amsterdam, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(Amsterdam, ecs_field_src(&it, 0)); test_uint(Amsterdam, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(NoordHolland, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(NoordHolland, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(Seattle, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(Seattle, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(SanFrancisco, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(SanFrancisco, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(LosAngeles, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(LosAngeles, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(California, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(California, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Washington, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Washington, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(UnitedStates, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(UnitedStates, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Netherlands, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Netherlands, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4053,64 +4053,64 @@ void Transitive_1_src_tgt_same_this_var_reflexive(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Amsterdam), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Amsterdam, ecs_iter_get_var(&it, this_var)); test_uint(Amsterdam, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, this_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Seattle), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Seattle, ecs_iter_get_var(&it, this_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(SanFrancisco, ecs_iter_get_var(&it, this_var)); test_uint(SanFrancisco, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, LosAngeles), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(LosAngeles, ecs_iter_get_var(&it, this_var)); test_uint(LosAngeles, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, this_var)); test_uint(California, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, this_var)); test_uint(Washington, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, this_var)); test_uint(UnitedStates, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, this_var)); test_uint(Netherlands, it.entities[0]); @@ -4140,38 +4140,38 @@ void Transitive_1_any_src_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(EcsWildcard, ecs_field_src(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(EcsWildcard, ecs_field_src(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4197,43 +4197,43 @@ void Transitive_not_transitive_ent_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(Amsterdam, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4262,12 +4262,12 @@ void Transitive_not_transitive_var_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(Earth, it.entities[0]); @@ -4294,43 +4294,43 @@ void Transitive_not_transitive_ent_tgt_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Amsterdam, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4359,12 +4359,12 @@ void Transitive_not_transitive_var_tgt_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(Earth, it.entities[0]); @@ -4391,75 +4391,75 @@ void Transitive_optional_transitive_ent_tgt(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Location, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Location, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(Amsterdam, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4506,133 +4506,133 @@ void Transitive_optional_transitive_var_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); + test_bool(false, ecs_field_is_set(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -4659,75 +4659,75 @@ void Transitive_optional_transitive_ent_tgt_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Earth, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Location, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Location, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(Amsterdam, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -4773,133 +4773,133 @@ void Transitive_optional_transitive_var_tgt_written(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(EcsWildcard, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(SanFrancisco, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(e4, it.entities[0]); @@ -4948,61 +4948,61 @@ void Transitive_2_var_src_w_same_tgt_ent(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 2)); test_uint(Tag, ecs_field_id(&it, 3)); - test_uint(Tag, ecs_field_id(&it, 4)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_field_src(&it, 3)); - test_uint(e2, ecs_field_src(&it, 4)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); test_uint(Tag, ecs_field_id(&it, 3)); - test_uint(Tag, ecs_field_id(&it, 4)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(e2, ecs_field_src(&it, 3)); - test_uint(e1, ecs_field_src(&it, 4)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_src(&it, 2)); + test_uint(e1, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 2)); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 2)); test_uint(Tag, ecs_field_id(&it, 3)); - test_uint(Tag, ecs_field_id(&it, 4)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(e1, ecs_field_src(&it, 3)); - test_uint(e2, ecs_field_src(&it, 4)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(e1, ecs_field_src(&it, 2)); + test_uint(e2, ecs_field_src(&it, 3)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 0)); test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 1)); - test_uint(ecs_pair(LocatedIn, SanFrancisco), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 2)); test_uint(Tag, ecs_field_id(&it, 3)); - test_uint(Tag, ecs_field_id(&it, 4)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_field_src(&it, 3)); - test_uint(e1, ecs_field_src(&it, 4)); + test_bool(true, ecs_field_is_set(&it, 0)); test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); @@ -5032,52 +5032,52 @@ void Transitive_self_target(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, Earth), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(Earth, ecs_iter_get_var(&it, x_var)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, UnitedStates), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(UnitedStates, ecs_iter_get_var(&it, x_var)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, California), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(California, ecs_iter_get_var(&it, x_var)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, Washington), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(Washington, ecs_iter_get_var(&it, x_var)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, Netherlands), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(Netherlands, ecs_iter_get_var(&it, x_var)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, NoordHolland), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(NoordHolland, ecs_iter_get_var(&it, x_var)); test_uint(Amsterdam, it.entities[0]); @@ -5104,47 +5104,47 @@ void Transitive_any_target(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(UnitedStates, it.entities[0]); test_uint(Netherlands, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(California, it.entities[0]); test_uint(Washington, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(SanFrancisco, it.entities[0]); test_uint(LosAngeles, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(Seattle, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(NoordHolland, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); + test_uint(ecs_pair(LocatedIn, EcsWildcard), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); test_uint(Amsterdam, it.entities[0]); test_bool(false, ecs_query_next(&it)); diff --git a/test/query/src/Traversal.c b/test/query/src/Traversal.c index 68a3334cb..3ef67c4fd 100644 --- a/test/query/src/Traversal.c +++ b/test/query/src/Traversal.c @@ -55,56 +55,56 @@ void Traversal_this_self_up_childof(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -152,44 +152,44 @@ void Traversal_this_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -241,74 +241,74 @@ void Traversal_this_written_self_up_childof(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -359,58 +359,58 @@ void Traversal_this_written_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -460,63 +460,63 @@ void Traversal_var_self_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(p1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); test_uint(p2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); test_uint(p3, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -566,44 +566,44 @@ void Traversal_var_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -657,82 +657,82 @@ void Traversal_var_written_self_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(p1, ecs_field_src(&it, 0)); test_uint(p1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(p2, ecs_field_src(&it, 0)); test_uint(p2, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(p2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(p3, ecs_field_src(&it, 0)); test_uint(p3, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(p3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e4, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e4, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e6, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e6, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e7, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e7, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -786,58 +786,58 @@ void Traversal_var_written_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e4, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e4, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e6, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e6, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e7, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e7, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -891,8 +891,8 @@ void Traversal_set_var_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(p2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -904,8 +904,8 @@ void Traversal_set_var_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -917,8 +917,8 @@ void Traversal_set_var_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -930,8 +930,8 @@ void Traversal_set_var_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1000,8 +1000,8 @@ void Traversal_set_var_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1013,8 +1013,8 @@ void Traversal_set_var_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1026,8 +1026,8 @@ void Traversal_set_var_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1092,10 +1092,10 @@ void Traversal_set_var_written_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(p2, ecs_field_src(&it, 0)); test_uint(p2, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(p2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1107,10 +1107,10 @@ void Traversal_set_var_written_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1122,10 +1122,10 @@ void Traversal_set_var_written_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1137,10 +1137,10 @@ void Traversal_set_var_written_self_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1212,10 +1212,10 @@ void Traversal_set_var_written_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1227,10 +1227,10 @@ void Traversal_set_var_written_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1242,10 +1242,10 @@ void Traversal_set_var_written_up_childof(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1289,8 +1289,8 @@ void Traversal_ent_self_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1309,8 +1309,8 @@ void Traversal_ent_self_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(parent, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1360,8 +1360,8 @@ void Traversal_ent_up_childof(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(parent, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1411,56 +1411,56 @@ void Traversal_implicit_this_self_up_isa(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -1508,44 +1508,44 @@ void Traversal_implicit_this_up_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -1595,62 +1595,62 @@ void Traversal_implicit_var_self_up_isa(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(p2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(p3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1701,44 +1701,44 @@ void Traversal_implicit_var_up_isa(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1774,8 +1774,8 @@ void Traversal_implicit_ent_self_up_isa(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(e, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1794,8 +1794,8 @@ void Traversal_implicit_ent_self_up_isa(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(parent, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1845,8 +1845,8 @@ void Traversal_implicit_ent_up_isa(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(parent, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -1883,26 +1883,26 @@ void Traversal_self_up_2_targets(void) { test_int(2, it.count); test_uint(parent_b, it.entities[0]); test_uint(parent_c, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_4, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -1937,20 +1937,20 @@ void Traversal_up_2_targets(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_4, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -1985,39 +1985,39 @@ void Traversal_self_up_2_targets_diamond(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_root, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2053,32 +2053,32 @@ void Traversal_up_2_targets_diamond(void) { test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2117,33 +2117,33 @@ void Traversal_written_self_up_2_targets(void) { test_int(2, it.count); test_uint(parent_b, it.entities[0]); test_uint(parent_c, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2181,26 +2181,26 @@ void Traversal_written_up_2_targets(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2238,51 +2238,51 @@ void Traversal_written_self_up_2_targets_diamond(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_root, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2321,42 +2321,42 @@ void Traversal_written_up_2_targets_diamond(void) { test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_root, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_root, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2390,26 +2390,26 @@ void Traversal_2_self_up_terms(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_b, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2448,34 +2448,34 @@ void Traversal_2_self_up_terms_2_targets(void) { test_int(2, it.count); test_uint(parent_b, it.entities[0]); test_uint(parent_c, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(parent_b, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(parent_b, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2504,8 +2504,8 @@ void Traversal_self_up_empty_table(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2566,39 +2566,39 @@ void Traversal_self_up_all_owned(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_root, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2636,32 +2636,32 @@ void Traversal_up_all_owned(void) { test_int(2, it.count); test_uint(parent_a, it.entities[0]); test_uint(parent_b, it.entities[1]); - test_uint(parent_root, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(parent_root, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_1, it.entities[0]); - test_uint(parent_a, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(parent_a, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(parent_a, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(parent_a, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_2, it.entities[0]); - test_uint(parent_b, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(parent_b, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e_3, it.entities[0]); - test_uint(parent_c, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(parent_c, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2690,14 +2690,14 @@ void Traversal_this_self_up_childof_inherited(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(base, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2726,8 +2726,8 @@ void Traversal_this_up_childof_inherited(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -2759,18 +2759,18 @@ void Traversal_this_written_self_up_childof_inherited(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(base, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(base, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(base, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2802,10 +2802,10 @@ void Traversal_this_written_up_childof_inherited(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(child, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(base, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(base, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -2836,14 +2836,14 @@ void Traversal_var_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(base, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(child, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2875,8 +2875,8 @@ void Traversal_var_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(child, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2911,18 +2911,18 @@ void Traversal_var_written_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); + test_uint(base, ecs_field_src(&it, 0)); test_uint(base, ecs_field_src(&it, 1)); - test_uint(base, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(base, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(child, ecs_field_src(&it, 1)); - test_uint(base, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(child, ecs_field_src(&it, 0)); + test_uint(base, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(child, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2957,10 +2957,10 @@ void Traversal_var_written_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(child, ecs_field_src(&it, 1)); - test_uint(base, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(child, ecs_field_src(&it, 0)); + test_uint(base, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_uint(child, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2992,8 +2992,8 @@ void Traversal_ent_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3003,8 +3003,8 @@ void Traversal_ent_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(child, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(child, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3035,8 +3035,8 @@ void Traversal_ent_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3046,8 +3046,8 @@ void Traversal_ent_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3081,8 +3081,8 @@ void Traversal_ent_written_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3092,8 +3092,8 @@ void Traversal_ent_written_self_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(child, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(child, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3127,8 +3127,8 @@ void Traversal_ent_written_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3138,8 +3138,8 @@ void Traversal_ent_written_up_childof_inherited(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(base, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(base, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); } @@ -3188,10 +3188,10 @@ void Traversal_this_self_up_childof_component(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3202,10 +3202,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3214,10 +3214,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3226,10 +3226,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3238,10 +3238,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3250,10 +3250,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3262,10 +3262,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3274,10 +3274,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3286,10 +3286,10 @@ void Traversal_this_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3341,10 +3341,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3353,10 +3353,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3365,10 +3365,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3377,10 +3377,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3389,10 +3389,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3401,10 +3401,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3413,10 +3413,10 @@ void Traversal_this_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3473,12 +3473,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3489,12 +3489,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3503,12 +3503,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3517,12 +3517,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3531,12 +3531,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3545,12 +3545,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3559,12 +3559,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3573,12 +3573,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3587,12 +3587,12 @@ void Traversal_this_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3648,12 +3648,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3662,12 +3662,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3676,12 +3676,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3690,12 +3690,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3704,12 +3704,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3718,12 +3718,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3732,12 +3732,12 @@ void Traversal_this_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3791,10 +3791,10 @@ void Traversal_var_self_up_childof_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3802,10 +3802,10 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3813,11 +3813,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3825,11 +3825,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3837,11 +3837,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3849,11 +3849,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3861,11 +3861,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3873,11 +3873,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -3885,11 +3885,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(p3, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3897,11 +3897,11 @@ void Traversal_var_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -3955,11 +3955,11 @@ void Traversal_var_up_childof_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3967,11 +3967,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3979,11 +3979,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -3991,11 +3991,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4003,11 +4003,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4015,11 +4015,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4027,11 +4027,11 @@ void Traversal_var_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -4088,13 +4088,13 @@ void Traversal_var_written_self_up_childof_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4102,13 +4102,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); test_uint(p2, ecs_iter_get_var(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4116,13 +4116,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(p3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -4130,13 +4130,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4144,13 +4144,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4158,13 +4158,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4172,13 +4172,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e4, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4186,13 +4186,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4200,13 +4200,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e6, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4214,13 +4214,13 @@ void Traversal_var_written_self_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e7, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -4277,13 +4277,13 @@ void Traversal_var_written_up_childof_component(void) { ecs_iter_t it = ecs_query_iter(world, r); test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4291,13 +4291,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4305,13 +4305,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e3, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4319,13 +4319,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e4, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e4, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e4, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4333,13 +4333,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e5, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e5, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e5, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4347,13 +4347,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e6, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e6, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e6, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4361,13 +4361,13 @@ void Traversal_var_written_up_childof_component(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); - test_uint(e7, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); + test_uint(e7, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); test_uint(e7, ecs_iter_get_var(&it, x_var)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -4429,56 +4429,56 @@ void Traversal_this_self_up_childof_recycled_parent(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -4535,44 +4535,44 @@ void Traversal_this_up_childof_recycled_parent(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -4633,74 +4633,74 @@ void Traversal_this_written_self_up_childof_recycled_parent(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -4760,58 +4760,58 @@ void Traversal_this_written_up_childof_recycled_parent(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(Foo, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(Foo, ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -4869,10 +4869,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4883,10 +4883,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4895,10 +4895,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4907,10 +4907,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4919,10 +4919,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -4931,10 +4931,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4943,10 +4943,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -4955,10 +4955,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -4967,10 +4967,10 @@ void Traversal_this_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -5031,10 +5031,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5043,10 +5043,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5055,10 +5055,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5067,10 +5067,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5079,10 +5079,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5091,10 +5091,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5103,10 +5103,10 @@ void Traversal_this_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -5172,12 +5172,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5188,12 +5188,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -5202,12 +5202,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5216,12 +5216,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5230,12 +5230,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5244,12 +5244,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5258,12 +5258,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5272,12 +5272,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5286,12 +5286,12 @@ void Traversal_this_written_self_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -5356,12 +5356,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5370,12 +5370,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5384,12 +5384,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5398,12 +5398,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 20); test_int(p[0].y, 30); @@ -5412,12 +5412,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5426,12 +5426,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -5440,12 +5440,12 @@ void Traversal_this_written_up_childof_recycled_parent_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p[0].x, 30); test_int(p[0].y, 40); @@ -5499,56 +5499,56 @@ void Traversal_this_self_up_childof_pair(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -5597,44 +5597,44 @@ void Traversal_this_up_childof_pair(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -5687,74 +5687,74 @@ void Traversal_this_written_self_up_childof_pair(void) { test_int(2, it.count); test_uint(p1, it.entities[0]); test_uint(p2, it.entities[1]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -5806,58 +5806,58 @@ void Traversal_this_written_up_childof_pair(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, Tgt), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -5909,62 +5909,62 @@ void Traversal_this_self_up_childof_pair_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6016,50 +6016,50 @@ void Traversal_this_up_childof_pair_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); - test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(e3, it.entities[0]); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_bool(false, ecs_query_next(&it)); @@ -6114,82 +6114,82 @@ void Traversal_this_written_self_up_childof_pair_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -6244,66 +6244,66 @@ void Traversal_this_written_up_childof_pair_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -6358,71 +6358,71 @@ void Traversal_this_self_up_childof_pair_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 0)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -6481,91 +6481,91 @@ void Traversal_this_written_self_up_childof_pair_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtB), ecs_field_id(&it, 1)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtA), ecs_field_id(&it, 1)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, TgtC), ecs_field_id(&it, 1)); test_uint(TgtC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -6621,71 +6621,71 @@ void Traversal_this_self_up_childof_pair_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(p2, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(p3, ecs_field_src(&it, 1)); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 0)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -6744,91 +6744,91 @@ void Traversal_this_written_self_up_childof_pair_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, Tgt), ecs_field_id(&it, 1)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e5, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e6, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, Tgt), ecs_field_id(&it, 1)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e7, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelC, Tgt), ecs_field_id(&it, 1)); test_uint(RelC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -6870,55 +6870,55 @@ void Traversal_this_self_up_childof_pair_for_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p2, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p3, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -6960,28 +6960,28 @@ void Traversal_this_up_childof_pair_for_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7031,37 +7031,37 @@ void Traversal_this_written_self_up_childof_pair_for_var_written(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7115,91 +7115,91 @@ void Traversal_this_self_up_childof_pair_for_var_written_n_targets(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p0_a, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_a, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_a, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_a, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_a, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p0_b, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_b, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_b, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_b, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_b, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p0_c, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_c, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_c, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(ent, ecs_field_src(&it, 1)); - test_uint(p0_c, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(ent, ecs_field_src(&it, 0)); + test_uint(p0_c, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7255,37 +7255,37 @@ void Traversal_this_written_self_up_childof_pair_for_var_written_n_targets(void) test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e1, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p1, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e2, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p2, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagB), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(TagB, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e3, it.entities[0]); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p3, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 1)); - test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p3, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, TagC), ecs_field_id(&it, 0)); + test_uint(TagC, ecs_field_id(&it, 1)); test_uint(TagC, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e4, it.entities[0]); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(Rel, TagA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); test_uint(TagA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -7317,8 +7317,8 @@ void Traversal_self_up_2_levels(void) { test_int(1, it.count); test_uint(inst, it.entities[0]); test_uint(base, it.sources[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - Position *p = ecs_field(&it, Position, 1); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -7470,7 +7470,7 @@ void Traversal_up_only_w_owned(void) { test_int(it.count, 1); test_uint(it.entities[0], e_1); test_uint(it.sources[0], e_0); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 10); test_int(p[0].y, 20); @@ -7478,7 +7478,7 @@ void Traversal_up_only_w_owned(void) { test_int(it.count, 1); test_uint(it.entities[0], e_3); test_uint(it.sources[0], e_2); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 50); test_int(p[0].y, 60); @@ -7486,7 +7486,7 @@ void Traversal_up_only_w_owned(void) { test_int(it.count, 1); test_uint(it.entities[0], e_2); test_uint(it.sources[0], e_1); - p = ecs_field(&it, Position, 1); + p = ecs_field(&it, Position, 0); test_int(p[0].x, 30); test_int(p[0].y, 40); test_bool(false, ecs_query_next(&it)); @@ -7552,22 +7552,22 @@ void Traversal_this_optional_self(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Velocity *v = ecs_field(&it, Velocity, 1); - Position *p = ecs_field(&it, Position, 2); + Velocity *v = ecs_field(&it, Velocity, 0); + Position *p = ecs_field(&it, Position, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { - test_bool(ecs_field_is_set(&it, 1), false); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), false); + test_bool(ecs_field_is_set(&it, 1), true); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); test_assert(v != NULL); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), false); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), false); + test_bool(ecs_field_is_set(&it, 1), true); } count ++; @@ -7606,22 +7606,22 @@ void Traversal_this_optional_up(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Velocity *v = ecs_field(&it, Velocity, 1); - Position *p = ecs_field(&it, Position, 2); + Velocity *v = ecs_field(&it, Velocity, 0); + Position *p = ecs_field(&it, Position, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { + test_bool(ecs_field_is_set(&it, 0), true); test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); test_assert(v != NULL); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), false); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), false); + test_bool(ecs_field_is_set(&it, 1), true); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), false); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), false); + test_bool(ecs_field_is_set(&it, 1), true); } count ++; @@ -7660,23 +7660,23 @@ void Traversal_this_optional_self_up(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Velocity *v = ecs_field(&it, Velocity, 1); - Position *p = ecs_field(&it, Position, 2); + Velocity *v = ecs_field(&it, Velocity, 0); + Position *p = ecs_field(&it, Position, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { + test_bool(ecs_field_is_set(&it, 0), true); test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); test_assert(v != NULL); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); test_assert(v != NULL); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), false); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), false); + test_bool(ecs_field_is_set(&it, 1), true); } count ++; @@ -7715,23 +7715,23 @@ void Traversal_this_written_optional_self(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); test_assert(v == NULL); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); test_assert(v != NULL); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); test_assert(v == NULL); } @@ -7771,22 +7771,22 @@ void Traversal_this_written_optional_up(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { + test_bool(ecs_field_is_set(&it, 0), true); test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); test_assert(v != NULL); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); } count ++; @@ -7825,23 +7825,23 @@ void Traversal_this_written_optional_self_up(void) { int32_t count = 0; while (ecs_query_next(&it)) { - Position *p = ecs_field(&it, Position, 1); - Velocity *v = ecs_field(&it, Velocity, 2); + Position *p = ecs_field(&it, Position, 0); + Velocity *v = ecs_field(&it, Velocity, 1); test_int(it.count, 1); test_assert(p != NULL); if (it.entities[0] == e1) { + test_bool(ecs_field_is_set(&it, 0), true); test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); test_assert(v != NULL); } else if (it.entities[0] == e2) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), true); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), true); test_assert(v != NULL); } else if (it.entities[0] == e3) { - test_bool(ecs_field_is_set(&it, 1), true); - test_bool(ecs_field_is_set(&it, 2), false); + test_bool(ecs_field_is_set(&it, 0), true); + test_bool(ecs_field_is_set(&it, 1), false); } count ++; @@ -7880,10 +7880,10 @@ void Traversal_fixed_src_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); - test_uint(Game, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 0)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 1)); + test_uint(Game, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); test_bool(false, ecs_query_next(&it)); @@ -7917,17 +7917,17 @@ void Traversal_match_empty_table_up(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(p, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(p, ecs_field_src(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -7966,21 +7966,21 @@ void Traversal_match_empty_table_up_written(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -8018,17 +8018,17 @@ void Traversal_match_empty_table_up_implicit_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(b, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(b, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(b, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(b, ecs_field_src(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -8068,21 +8068,21 @@ void Traversal_match_empty_table_up_written_implicit_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(b, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(b, ecs_field_src(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(b, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(b, ecs_field_src(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -8119,17 +8119,17 @@ void Traversal_match_empty_table_up_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(p, ecs_field_src(&it, 0)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(p, ecs_field_src(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(p, ecs_field_src(&it, 0)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -8168,21 +8168,21 @@ void Traversal_match_empty_table_up_written_isa(void) { test_bool(true, ecs_query_next(&it)); test_int(0, it.count); test_assert(it.table == t1); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_assert(it.table == t2); test_uint(e1, it.entities[0]); - test_uint(TagB, ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(p, ecs_field_src(&it, 2)); + test_uint(TagB, ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(p, ecs_field_src(&it, 1)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); diff --git a/test/query/src/Variables.c b/test/query/src/Variables.c index dddeaa94c..dfdeeaa09 100644 --- a/test/query/src/Variables.c +++ b/test/query/src/Variables.c @@ -44,8 +44,8 @@ void Variables_1_ent_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -56,14 +56,14 @@ void Variables_1_ent_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -104,8 +104,8 @@ void Variables_1_ent_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -116,14 +116,14 @@ void Variables_1_ent_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -164,8 +164,8 @@ void Variables_1_ent_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -176,14 +176,14 @@ void Variables_1_ent_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -220,8 +220,8 @@ void Variables_1_ent_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(EcsName, ecs_iter_get_var(&it, y_var)); test_bool(false, ecs_query_next(&it)); @@ -233,15 +233,15 @@ void Variables_1_ent_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(EcsName, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_bool(false, ecs_query_next(&it)); @@ -253,22 +253,22 @@ void Variables_1_ent_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(EcsName, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); @@ -281,29 +281,29 @@ void Variables_1_ent_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ecs_id(EcsIdentifier), EcsName), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ecs_id(EcsIdentifier), ecs_iter_get_var(&it, x_var)); test_uint(EcsName, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); @@ -353,8 +353,8 @@ void Variables_1_ent_src_w_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -365,14 +365,14 @@ void Variables_1_ent_src_w_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -428,10 +428,10 @@ void Variables_1_ent_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ent, ecs_field_src(&it, 1)); - test_uint(ent, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -442,10 +442,10 @@ void Variables_1_ent_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ent, ecs_field_src(&it, 1)); - test_uint(ent, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -456,18 +456,18 @@ void Variables_1_ent_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ent, ecs_field_src(&it, 1)); - test_uint(ent, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TgtB, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 2)); + test_uint(TgtB, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(ent, ecs_field_src(&it, 1)); - test_uint(ent, ecs_field_src(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -502,8 +502,8 @@ void Variables_1_this_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -518,29 +518,29 @@ void Variables_1_this_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -588,8 +588,8 @@ void Variables_1_this_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -604,23 +604,23 @@ void Variables_1_this_src_w_pair_rel_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -668,8 +668,8 @@ void Variables_1_this_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -684,23 +684,23 @@ void Variables_1_this_src_w_pair_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -752,10 +752,10 @@ void Variables_1_this_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -771,20 +771,20 @@ void Variables_1_this_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); @@ -792,10 +792,10 @@ void Variables_1_this_src_w_pair_rel_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); @@ -810,60 +810,60 @@ void Variables_1_this_src_w_pair_rel_tgt_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(TgtB, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(Tag, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); + test_uint(Tag, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(TgtA, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); @@ -920,8 +920,8 @@ void Variables_1_this_src_w_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -936,23 +936,23 @@ void Variables_1_this_src_w_pair_rel_tgt_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -1018,10 +1018,10 @@ void Variables_1_this_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(3, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_uint(e2, it.entities[1]); @@ -1036,19 +1036,19 @@ void Variables_1_this_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -1063,29 +1063,29 @@ void Variables_1_this_src_w_pair_rel_tgt_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(TgtA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 2)); + test_uint(TgtA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(TgtB, ecs_field_id(&it, 1)); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 2)); + test_uint(TgtB, ecs_field_id(&it, 0)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -1129,10 +1129,10 @@ void Variables_1_src_id_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1143,18 +1143,18 @@ void Variables_1_src_id_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(e2, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1204,10 +1204,10 @@ void Variables_1_src_pair_first_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1218,18 +1218,18 @@ void Variables_1_src_pair_first_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1279,10 +1279,10 @@ void Variables_1_src_pair_second_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1293,18 +1293,18 @@ void Variables_1_src_pair_second_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1365,10 +1365,10 @@ void Variables_1_src_pair_first_and_second_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1379,18 +1379,18 @@ void Variables_1_src_pair_first_and_second_same_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1432,10 +1432,10 @@ void Variables_1_src_id_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1446,18 +1446,18 @@ void Variables_1_src_id_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1515,10 +1515,10 @@ void Variables_1_src_pair_first_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1529,18 +1529,18 @@ void Variables_1_src_pair_first_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1598,10 +1598,10 @@ void Variables_1_src_pair_second_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1612,18 +1612,18 @@ void Variables_1_src_pair_second_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1692,10 +1692,10 @@ void Variables_1_src_pair_first_and_second_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); } @@ -1706,18 +1706,18 @@ void Variables_1_src_pair_first_and_second_same_var_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -1760,10 +1760,10 @@ void Variables_1_src_pair_first_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1775,19 +1775,19 @@ void Variables_1_src_pair_first_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e2, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -1839,10 +1839,10 @@ void Variables_1_src_pair_second_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1854,19 +1854,19 @@ void Variables_1_src_pair_second_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -1919,10 +1919,10 @@ void Variables_1_src_pair_first_and_second_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -1934,19 +1934,19 @@ void Variables_1_src_pair_first_and_second_same_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -1990,10 +1990,10 @@ void Variables_1_src_id_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2005,19 +2005,19 @@ void Variables_1_src_id_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -2077,10 +2077,10 @@ void Variables_1_src_pair_first_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2092,19 +2092,19 @@ void Variables_1_src_pair_first_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -2163,10 +2163,10 @@ void Variables_1_src_pair_second_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2178,19 +2178,19 @@ void Variables_1_src_pair_second_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -2260,10 +2260,10 @@ void Variables_1_src_pair_first_and_second_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(false, ecs_query_next(&it)); @@ -2275,19 +2275,19 @@ void Variables_1_src_pair_first_and_second_same_var_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -2330,15 +2330,15 @@ void Variables_1_ent_src_w_this_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, this_var)); test_uint(RelA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelB, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, this_var)); test_uint(RelB, it.entities[0]); @@ -2390,15 +2390,15 @@ void Variables_1_ent_src_w_pair_this_rel(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, this_var)); test_uint(RelA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, this_var)); test_uint(RelB, it.entities[0]); @@ -2450,15 +2450,15 @@ void Variables_1_ent_src_w_pair_this_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, this_var)); test_uint(TgtA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, this_var)); test_uint(TgtB, it.entities[0]); @@ -2518,15 +2518,15 @@ void Variables_1_ent_src_w_pair_this_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, this_var)); test_uint(TgtA, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(TgtB, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, this_var)); test_uint(TgtB, it.entities[0]); @@ -2575,9 +2575,9 @@ void Variables_1_this_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ent, ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ent, ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, this_var)); test_uint(ent, it.entities[0]); @@ -2633,9 +2633,9 @@ void Variables_1_this_src_w_pair_this_rel_tgt(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(ent, ent), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(ent, ent), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, this_var)); test_uint(ent, it.entities[0]); @@ -2684,9 +2684,9 @@ void Variables_1_this_src_w_this_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, this_var)); test_uint(ent, it.entities[0]); @@ -2742,9 +2742,9 @@ void Variables_1_this_src_w_pair_this_rel_tgt_after_write(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(ent, ent), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(ent, ent), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(ent, ecs_iter_get_var(&it, this_var)); test_uint(ent, it.entities[0]); @@ -2786,10 +2786,10 @@ void Variables_2_constrain_src_from_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2801,18 +2801,18 @@ void Variables_2_constrain_src_from_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(RelB, ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2860,10 +2860,10 @@ void Variables_2_constrain_rel_from_src_w_ent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -2906,10 +2906,10 @@ void Variables_2_constrain_rel_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); @@ -2922,19 +2922,19 @@ void Variables_2_constrain_rel_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); @@ -2977,10 +2977,10 @@ void Variables_2_constrain_rel_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -2993,10 +2993,10 @@ void Variables_2_constrain_rel_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -3061,10 +3061,10 @@ void Variables_2_constrain_pair_rel_from_src_w_ent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3122,10 +3122,10 @@ void Variables_2_constrain_pair_rel_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); @@ -3138,19 +3138,19 @@ void Variables_2_constrain_pair_rel_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); @@ -3207,10 +3207,10 @@ void Variables_2_constrain_pair_rel_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -3223,10 +3223,10 @@ void Variables_2_constrain_pair_rel_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -3291,10 +3291,10 @@ void Variables_2_constrain_pair_tgt_from_src_w_ent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3352,10 +3352,10 @@ void Variables_2_constrain_pair_tgt_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); @@ -3368,19 +3368,19 @@ void Variables_2_constrain_pair_tgt_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); @@ -3437,10 +3437,10 @@ void Variables_2_constrain_pair_tgt_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -3453,10 +3453,10 @@ void Variables_2_constrain_pair_tgt_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -3528,10 +3528,10 @@ void Variables_2_constrain_pair_rel_tgt_from_src_w_ent(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3596,10 +3596,10 @@ void Variables_2_constrain_pair_rel_tgt_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); @@ -3612,19 +3612,19 @@ void Variables_2_constrain_pair_rel_tgt_from_src_w_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); @@ -3681,10 +3681,10 @@ void Variables_2_constrain_pair_rel_tgt_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); @@ -3697,10 +3697,10 @@ void Variables_2_constrain_pair_rel_tgt_from_src_w_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(2, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, it.entities[0]); test_uint(e3, it.entities[1]); @@ -3740,8 +3740,8 @@ void Variables_1_ent_src_set_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3782,8 +3782,8 @@ void Variables_1_ent_src_set_pair_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3795,8 +3795,8 @@ void Variables_1_ent_src_set_pair_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3843,8 +3843,8 @@ void Variables_1_ent_src_set_pair_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3856,8 +3856,8 @@ void Variables_1_ent_src_set_pair_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ent, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); + test_uint(ent, ecs_field_src(&it, 0)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3901,8 +3901,8 @@ void Variables_1_set_src_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -3953,8 +3953,8 @@ void Variables_1_set_src_var_w_pair(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4009,8 +4009,8 @@ void Variables_1_set_src_var_w_pair_set_rel(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4022,8 +4022,8 @@ void Variables_1_set_src_var_w_pair_set_rel(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4070,8 +4070,8 @@ void Variables_1_set_src_var_w_pair_set_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4083,8 +4083,8 @@ void Variables_1_set_src_var_w_pair_set_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4131,8 +4131,8 @@ void Variables_1_set_src_var_w_pair_set_rel_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4144,8 +4144,8 @@ void Variables_1_set_src_var_w_pair_set_rel_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -4189,8 +4189,8 @@ void Variables_1_set_src_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(RelA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); @@ -4242,8 +4242,8 @@ void Variables_1_set_src_this_w_pair(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); @@ -4299,8 +4299,8 @@ void Variables_1_set_src_this_w_pair_set_rel(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e1, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); @@ -4313,8 +4313,8 @@ void Variables_1_set_src_this_w_pair_set_rel(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e2, TgtA), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -4362,8 +4362,8 @@ void Variables_1_set_src_this_w_pair_set_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, e1), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); @@ -4376,8 +4376,8 @@ void Variables_1_set_src_this_w_pair_set_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(RelA, e2), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -4425,8 +4425,8 @@ void Variables_1_set_src_this_w_pair_set_rel_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e1, e1), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); @@ -4439,8 +4439,8 @@ void Variables_1_set_src_this_w_pair_set_rel_tgt(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(e2, e2), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -4482,8 +4482,8 @@ void Variables_1_set_src_this_to_empty_table(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 0); test_assert(it.table == t1); - test_uint(ecs_field_id(&it, 1), TagA); - test_uint(ecs_field_size(&it, 1), 0); + test_uint(ecs_field_id(&it, 0), TagA); + test_uint(ecs_field_size(&it, 0), 0); ecs_table_t* this_var = ecs_iter_get_var_as_table(&it, this_var_id); test_assert(this_var != NULL); test_assert(this_var == t1); @@ -4519,9 +4519,9 @@ void Variables_1_set_src_this_to_empty_table_w_component(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 0); test_assert(it.table == t1); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) == NULL); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) == NULL); ecs_table_t* this_var = ecs_iter_get_var_as_table(&it, this_var_id); test_assert(this_var != NULL); test_assert(this_var == t1); @@ -4558,9 +4558,9 @@ void Variables_1_set_src_this_to_empty_table_w_component_self(void) { test_assert(ecs_query_next(&it)); test_int(it.count, 0); test_assert(it.table == t1); - test_uint(ecs_field_id(&it, 1), ecs_id(Position)); - test_uint(ecs_field_size(&it, 1), sizeof(Position)); - test_assert(ecs_field(&it, Position, 1) == NULL); + test_uint(ecs_field_id(&it, 0), ecs_id(Position)); + test_uint(ecs_field_size(&it, 0), sizeof(Position)); + test_assert(ecs_field(&it, Position, 0) == NULL); ecs_table_t* this_var = ecs_iter_get_var_as_table(&it, this_var_id); test_assert(this_var != NULL); test_assert(this_var == t1); @@ -4591,7 +4591,7 @@ void Variables_1_set_src_this_to_entiy_in_table(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4604,7 +4604,7 @@ void Variables_1_set_src_this_to_entiy_in_table(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); @@ -4635,7 +4635,7 @@ void Variables_1_set_src_this_to_entiy_in_table_self(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -4648,7 +4648,7 @@ void Variables_1_set_src_this_to_entiy_in_table_self(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); @@ -4689,10 +4689,10 @@ void Variables_2_set_src_this(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4702,10 +4702,10 @@ void Variables_2_set_src_this(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4715,10 +4715,10 @@ void Variables_2_set_src_this(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(prefab, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(prefab, ecs_field_src(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -4756,10 +4756,10 @@ void Variables_2_set_src_this_self(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4769,10 +4769,10 @@ void Variables_2_set_src_this_self(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4816,18 +4816,18 @@ void Variables_2_set_src_this_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4837,18 +4837,18 @@ void Variables_2_set_src_this_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4858,18 +4858,18 @@ void Variables_2_set_src_this_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 30); test_int(p->y, 40); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 4); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(prefab, ecs_field_src(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(prefab, ecs_field_src(&it, 1)); test_bool(false, ecs_query_next(&it)); } @@ -4907,16 +4907,16 @@ void Variables_2_set_src_this_self_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4926,16 +4926,16 @@ void Variables_2_set_src_this_self_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 3); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -4985,12 +4985,12 @@ void Variables_2_set_src_this_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(Hello, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(Hello, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5000,12 +5000,12 @@ void Variables_2_set_src_this_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(Hello, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(Hello, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5015,12 +5015,12 @@ void Variables_2_set_src_this_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(Hello, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(prefab, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(Hello, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(prefab, ecs_field_src(&it, 1)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5064,12 +5064,12 @@ void Variables_2_set_src_this_self_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(Hello, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(Hello, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5079,12 +5079,12 @@ void Variables_2_set_src_this_self_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(Hello, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(Hello, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5134,23 +5134,23 @@ void Variables_2_set_src_this_component_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(m[0], 60); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5160,23 +5160,23 @@ void Variables_2_set_src_this_component_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 3); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(m[0], 60); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5186,23 +5186,23 @@ void Variables_2_set_src_this_component_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 30); test_int(p->y, 40); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 4); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(m[0], 60); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(prefab, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(prefab, ecs_field_src(&it, 1)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5246,23 +5246,23 @@ void Variables_2_set_src_this_self_component_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(m[0], 60); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5272,23 +5272,23 @@ void Variables_2_set_src_this_self_component_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 20); test_int(p->y, 30); - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 3); - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(m[0], 60); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_id(Mass), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_id(Mass), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(parent, ecs_field_src(&it, 3)); + test_uint(parent, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5338,12 +5338,12 @@ void Variables_2_set_src_this_w_exclusive_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(false, ecs_query_next(&it)); } @@ -5353,12 +5353,12 @@ void Variables_2_set_src_this_w_exclusive_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_bool(false, ecs_query_next(&it)); } @@ -5368,12 +5368,12 @@ void Variables_2_set_src_this_w_exclusive_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(prefab, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(prefab, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5412,10 +5412,10 @@ void Variables_2_set_src_this_self_w_exclusive_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, parent_1), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, parent_1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5425,10 +5425,10 @@ void Variables_2_set_src_this_self_w_exclusive_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, parent_2), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, parent_2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5478,12 +5478,12 @@ void Variables_2_set_src_this_self_w_exclusive_wildcard_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); - test_uint(Bar, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 1)); + test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(prefab, ecs_field_src(&it, 3)); + test_uint(prefab, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5493,12 +5493,12 @@ void Variables_2_set_src_this_self_w_exclusive_wildcard_w_up(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); - test_uint(Bar, ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 1)); + test_uint(Bar, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); test_uint(0, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(prefab, ecs_field_src(&it, 3)); + test_uint(prefab, ecs_field_src(&it, 2)); test_bool(false, ecs_query_next(&it)); } @@ -5581,19 +5581,19 @@ void Variables_2_set_src_this_w_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 20); test_int(p[0].y, 30); - test_uint(ecs_pair(Likes, Apples), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Likes, Apples), ecs_field_id(&it, 1)); } { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_int(p[0].x, 20); test_int(p[0].y, 30); - test_uint(ecs_pair(Likes, Pears), ecs_field_id(&it, 2)); + test_uint(ecs_pair(Likes, Pears), ecs_field_id(&it, 1)); } test_bool(false, ecs_query_next(&it)); @@ -5641,9 +5641,9 @@ void Variables_3_set_src_this_w_uncacheable_tag_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5654,9 +5654,9 @@ void Variables_3_set_src_this_w_uncacheable_tag_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5667,9 +5667,9 @@ void Variables_3_set_src_this_w_uncacheable_tag_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5717,12 +5717,12 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -5736,12 +5736,12 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -5755,12 +5755,12 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -5811,18 +5811,18 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -5836,18 +5836,18 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -5861,18 +5861,18 @@ void Variables_3_set_src_this_w_uncacheable_tag_component_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -5923,9 +5923,9 @@ void Variables_3_set_src_this_w_tag_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5936,9 +5936,9 @@ void Variables_3_set_src_this_w_tag_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5949,9 +5949,9 @@ void Variables_3_set_src_this_w_tag_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -5999,12 +5999,12 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -6018,12 +6018,12 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -6037,12 +6037,12 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -6093,18 +6093,18 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -6118,18 +6118,18 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -6143,18 +6143,18 @@ void Variables_3_set_src_this_w_component_uncacheable_tag_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -6205,9 +6205,9 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -6218,9 +6218,9 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -6231,9 +6231,9 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); test_bool(false, ecs_query_next(&it)); } @@ -6281,12 +6281,12 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -6300,12 +6300,12 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -6319,12 +6319,12 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -6375,18 +6375,18 @@ void Variables_3_set_src_this_w_component_component_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -6400,18 +6400,18 @@ void Variables_3_set_src_this_w_component_component_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_childof(p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_childof(p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -6425,18 +6425,18 @@ void Variables_3_set_src_this_w_component_component_uncacheable_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_childof(p2), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_childof(p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -6488,12 +6488,12 @@ void Variables_3_set_src_this_w_uncacheable_component_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 100); } @@ -6506,12 +6506,12 @@ void Variables_3_set_src_this_w_uncacheable_component_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 200); } @@ -6524,12 +6524,12 @@ void Variables_3_set_src_this_w_uncacheable_component_tag_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 300); } @@ -6580,17 +6580,17 @@ void Variables_3_set_src_this_w_uncacheable_component_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -6604,17 +6604,17 @@ void Variables_3_set_src_this_w_uncacheable_component_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -6628,17 +6628,17 @@ void Variables_3_set_src_this_w_uncacheable_component_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -6690,23 +6690,23 @@ void Variables_3_set_src_this_w_uncacheable_component_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -6720,23 +6720,23 @@ void Variables_3_set_src_this_w_uncacheable_component_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -6750,23 +6750,23 @@ void Variables_3_set_src_this_w_uncacheable_component_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 1); + Mass *m = ecs_field(&it, Mass, 0); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 2); + Position *p = ecs_field(&it, Position, 1); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -6818,12 +6818,12 @@ void Variables_3_set_src_this_w_tag_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 100); } @@ -6836,12 +6836,12 @@ void Variables_3_set_src_this_w_tag_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 200); } @@ -6854,12 +6854,12 @@ void Variables_3_set_src_this_w_tag_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 300); } @@ -6910,17 +6910,17 @@ void Variables_3_set_src_this_w_component_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -6934,17 +6934,17 @@ void Variables_3_set_src_this_w_component_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -6958,17 +6958,17 @@ void Variables_3_set_src_this_w_component_uncacheable_component_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); - test_uint(TagB, ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); + test_uint(TagB, ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -7020,23 +7020,23 @@ void Variables_3_set_src_this_w_component_uncacheable_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -7050,23 +7050,23 @@ void Variables_3_set_src_this_w_component_uncacheable_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -7080,23 +7080,23 @@ void Variables_3_set_src_this_w_component_uncacheable_component_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 1)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 2); + Mass *m = ecs_field(&it, Mass, 1); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 3); + Velocity *v = ecs_field(&it, Velocity, 2); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -7148,12 +7148,12 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } @@ -7166,12 +7166,12 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 200); } @@ -7184,12 +7184,12 @@ void Variables_3_set_src_this_w_tag_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 300); } @@ -7240,17 +7240,17 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); @@ -7264,17 +7264,17 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); @@ -7288,17 +7288,17 @@ void Variables_3_set_src_this_w_component_tag_uncacheable_component(void) { test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); @@ -7350,23 +7350,23 @@ void Variables_3_set_src_this_w_component_component_uncacheable_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e1); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 100); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 11); test_int(p->y, 21); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 1); @@ -7380,23 +7380,23 @@ void Variables_3_set_src_this_w_component_component_uncacheable_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e2); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p1), ecs_field_id(&it, 2)); test_uint(p1, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 200); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 12); test_int(p->y, 22); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 2); test_int(v->y, 2); @@ -7410,23 +7410,23 @@ void Variables_3_set_src_this_w_component_component_uncacheable_component(void) test_bool(true, ecs_query_next(&it)); test_int(it.count, 1); test_uint(it.entities[0], e3); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair_t(Mass, p2), ecs_field_id(&it, 2)); test_uint(p2, ecs_iter_get_var(&it, parent_var)); { - Mass *m = ecs_field(&it, Mass, 3); + Mass *m = ecs_field(&it, Mass, 2); test_assert(m != NULL); test_int(*m, 300); } { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 13); test_int(p->y, 23); } { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 3); test_int(v->y, 3); @@ -7666,48 +7666,48 @@ void Variables_2_join_by_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelA, ecs_field_id(&it, 0)); test_uint(RelA, ecs_field_id(&it, 1)); - test_uint(RelA, ecs_field_id(&it, 2)); - test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelB, ecs_field_id(&it, 0)); test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(RelB, ecs_field_id(&it, 0)); test_uint(RelB, ecs_field_id(&it, 1)); - test_uint(RelB, ecs_field_id(&it, 2)); - test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(TagA, TagB), ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -7755,48 +7755,48 @@ void Variables_2_join_by_pair_rel_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelA, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelB, TgtA), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(RelB, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -7844,48 +7844,48 @@ void Variables_2_join_by_pair_tgt_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtA), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtA, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 0)); test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 1)); - test_uint(ecs_pair(RelA, TgtB), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(TgtB, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -7932,23 +7932,23 @@ void Variables_2_cycle_w_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(e2, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e2, ecs_field_src(&it, 2)); - test_uint(e2, ecs_field_src(&it, 3)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(e1, ecs_field_src(&it, 2)); - test_uint(e1, ecs_field_src(&it, 3)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); @@ -8000,24 +8000,24 @@ void Variables_2_cycle_w_this_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e2, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e1, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e2, ecs_field_src(&it, 1)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(0, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); @@ -8064,24 +8064,24 @@ void Variables_2_cycle_w_var_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e2, ecs_field_id(&it, 1)); - test_uint(e1, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(e2, ecs_field_id(&it, 0)); + test_uint(e1, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(e1, ecs_field_id(&it, 1)); - test_uint(e2, ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(e1, ecs_field_id(&it, 0)); + test_uint(e2, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); @@ -8132,24 +8132,24 @@ void Variables_2_cycle_pair_w_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(e2, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e3, ecs_iter_get_var(&it, z_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(e3, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(e3, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e2, ecs_iter_get_var(&it, z_var)); @@ -8200,12 +8200,12 @@ void Variables_2_cycle_pair_w_this_var_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(e2, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e3, ecs_iter_get_var(&it, z_var)); @@ -8213,12 +8213,12 @@ void Variables_2_cycle_pair_w_this_var_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(e3, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(e3, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e2, ecs_iter_get_var(&it, z_var)); @@ -8270,12 +8270,12 @@ void Variables_2_cycle_pair_w_var_this_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e3, ecs_iter_get_var(&it, z_var)); @@ -8283,12 +8283,12 @@ void Variables_2_cycle_pair_w_var_this_var(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); - test_uint(0, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); + test_uint(0, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, this_var)); test_uint(e2, ecs_iter_get_var(&it, z_var)); @@ -8340,12 +8340,12 @@ void Variables_2_cycle_pair_w_var_var_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(e2, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(e2, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e3, ecs_iter_get_var(&it, this_var)); @@ -8353,12 +8353,12 @@ void Variables_2_cycle_pair_w_var_var_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 2)); - test_uint(TagA, ecs_field_id(&it, 3)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); - test_uint(e3, ecs_field_src(&it, 3)); + test_uint(ecs_pair(e1, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(e1, e3), ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 2)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); + test_uint(e3, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e2, ecs_iter_get_var(&it, this_var)); @@ -8410,46 +8410,46 @@ void Variables_2_cycle_pair_ent_var_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 2)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); @@ -8500,50 +8500,50 @@ void Variables_2_cycle_pair_ent_this_var(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e2, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e2, ecs_field_src(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, this_var)); test_uint(e2, ecs_iter_get_var(&it, y_var)); test_uint(e3, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e1, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e1, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(e3, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(e3, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e3, ecs_iter_get_var(&it, y_var)); test_uint(e2, it.entities[0]); @@ -8595,50 +8595,50 @@ void Variables_2_cycle_pair_ent_var_this(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 2)); - test_uint(e1, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); + test_uint(e1, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e1, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 2)); - test_uint(e3, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); + test_uint(e3, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e3, ecs_iter_get_var(&it, x_var)); test_uint(e2, ecs_iter_get_var(&it, this_var)); test_uint(e2, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e1), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e1, ecs_iter_get_var(&it, this_var)); test_uint(e1, it.entities[0]); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); - test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 1)); - test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 2)); - test_uint(e2, ecs_field_src(&it, 1)); - test_uint(0, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Likes, e3), ecs_field_id(&it, 0)); + test_uint(ecs_pair(Likes, e2), ecs_field_id(&it, 1)); + test_uint(e2, ecs_field_src(&it, 0)); + test_uint(0, ecs_field_src(&it, 1)); test_uint(e2, ecs_iter_get_var(&it, x_var)); test_uint(e3, ecs_iter_get_var(&it, this_var)); test_uint(e3, it.entities[0]); @@ -9154,7 +9154,7 @@ void Variables_no_this_anonymous_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(ecs_query_next(&it), true); - test_uint(TagA, ecs_field_id(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); test_bool(ecs_query_next(&it), false); ecs_query_fini(q); @@ -9184,8 +9184,8 @@ void Variables_no_this_anonymous_src_w_pair(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(ecs_query_next(&it), true); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, parent), ecs_field_id(&it, 1)); test_uint(parent, ecs_iter_get_var(&it, parent_var)); test_bool(ecs_query_next(&it), false); @@ -9210,7 +9210,7 @@ void Variables_no_this_anonymous_component_src(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(ecs_query_next(&it), true); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); test_bool(ecs_query_next(&it), false); ecs_query_fini(q); @@ -9273,19 +9273,19 @@ void Variables_lookup_from_table_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p4, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); test_bool(false, ecs_query_next(&it)); @@ -9339,20 +9339,20 @@ void Variables_lookup_from_entity_this(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(t1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(t4, it.entities[0]); - test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 1)); - test_uint(p4, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 0)); + test_uint(p4, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(p4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); @@ -9400,18 +9400,18 @@ void Variables_lookup_from_table(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p4, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p4, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); test_uint(p4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); @@ -9466,20 +9466,20 @@ void Variables_lookup_from_entity(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p4, it.entities[0]); - test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(t4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); @@ -9543,13 +9543,13 @@ void Variables_lookup_from_table_this_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 10); test_int(ptr->y, 20); @@ -9558,13 +9558,13 @@ void Variables_lookup_from_table_this_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p4, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 11); test_int(ptr->y, 22); @@ -9621,14 +9621,14 @@ void Variables_lookup_from_entity_this_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(t1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 10); test_int(ptr->y, 20); @@ -9637,14 +9637,14 @@ void Variables_lookup_from_entity_this_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(t4, it.entities[0]); - test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 1)); - test_uint(p4, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 0)); + test_uint(p4, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(p4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 11); test_int(ptr->y, 22); @@ -9694,14 +9694,14 @@ void Variables_lookup_from_table_component(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 10); test_int(ptr->y, 20); @@ -9709,13 +9709,13 @@ void Variables_lookup_from_table_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p4, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p4, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); test_uint(p4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 11); test_int(ptr->y, 22); @@ -9772,14 +9772,14 @@ void Variables_lookup_from_entity_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 10); test_int(ptr->y, 20); @@ -9788,14 +9788,14 @@ void Variables_lookup_from_entity_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p4, it.entities[0]); - test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(ecs_id(Position), ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(ecs_id(Position), ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(t4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); { - Position *ptr = ecs_field(&it, Position, 2); + Position *ptr = ecs_field(&it, Position, 1); test_assert(ptr != NULL); test_int(ptr->x, 11); test_int(ptr->y, 22); @@ -9856,12 +9856,12 @@ void Variables_lookup_from_table_two_children(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(child_a_1, ecs_field_src(&it, 2)); - test_uint(child_b_1, ecs_field_src(&it, 3)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(child_a_1, ecs_field_src(&it, 1)); + test_uint(child_b_1, ecs_field_src(&it, 2)); test_uint(child_a_1, ecs_iter_get_var(&it, child_a_var)); test_uint(child_b_1, ecs_iter_get_var(&it, child_b_var)); @@ -9927,12 +9927,12 @@ void Variables_lookup_from_entity_two_children(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(child_a_1, ecs_field_src(&it, 2)); - test_uint(child_b_1, ecs_field_src(&it, 3)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(child_a_1, ecs_field_src(&it, 1)); + test_uint(child_b_1, ecs_field_src(&it, 2)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(child_a_1, ecs_iter_get_var(&it, child_a_var)); test_uint(child_b_1, ecs_iter_get_var(&it, child_b_var)); @@ -9982,12 +9982,12 @@ void Variables_lookup_from_table_same_child_twice(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(child_a_1, ecs_field_src(&it, 1)); test_uint(child_a_1, ecs_field_src(&it, 2)); - test_uint(child_a_1, ecs_field_src(&it, 3)); test_uint(child_a_1, ecs_iter_get_var(&it, child_a_var)); test_bool(false, ecs_query_next(&it)); @@ -10042,12 +10042,12 @@ void Variables_lookup_from_entity_same_child_twice(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(TagC, ecs_field_id(&it, 3)); - test_uint(0, ecs_field_src(&it, 1)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(TagC, ecs_field_id(&it, 2)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(child_a_1, ecs_field_src(&it, 1)); test_uint(child_a_1, ecs_field_src(&it, 2)); - test_uint(child_a_1, ecs_field_src(&it, 3)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(child_a_1, ecs_iter_get_var(&it, child_a_var)); @@ -10095,21 +10095,21 @@ void Variables_lookup_from_table_not(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(p2, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(p2, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(p2, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_uint(p3, ecs_field_src(&it, 1)); - test_bool(true, ecs_field_is_set(&it, 1)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_uint(p3, ecs_field_src(&it, 0)); + test_bool(true, ecs_field_is_set(&it, 0)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(p3, ecs_iter_get_var(&it, x_var)); test_uint(child_3, ecs_iter_get_var(&it, child_var)); @@ -10164,20 +10164,20 @@ void Variables_lookup_from_entity_not(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p2, it.entities[0]); - test_uint(ecs_pair(Rel, t2), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(Rel, t2), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(t2, ecs_iter_get_var(&it, x_var)); test_uint(EcsWildcard, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p3, it.entities[0]); - test_uint(ecs_pair(Rel, t3), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(TagB, ecs_field_id(&it, 2)); - test_bool(false, ecs_field_is_set(&it, 2)); + test_uint(ecs_pair(Rel, t3), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(TagB, ecs_field_id(&it, 1)); + test_bool(false, ecs_field_is_set(&it, 1)); test_uint(t3, ecs_iter_get_var(&it, x_var)); test_uint(child_3, ecs_iter_get_var(&it, child_var)); @@ -10227,18 +10227,18 @@ void Variables_lookup_from_table_w_any_component(void) { ecs_iter_t it = ecs_query_iter(world, q); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p1, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p1, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(p1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(0, it.count); - test_uint(TagA, ecs_field_id(&it, 1)); - test_uint(p4, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); + test_uint(TagA, ecs_field_id(&it, 0)); + test_uint(p4, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); test_uint(p4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); @@ -10295,20 +10295,20 @@ void Variables_lookup_from_entity_w_any_component(void) { test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p1, it.entities[0]); - test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(child_1, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t1), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); + test_uint(child_1, ecs_field_src(&it, 1)); test_uint(t1, ecs_iter_get_var(&it, x_var)); test_uint(child_1, ecs_iter_get_var(&it, child_var)); test_bool(true, ecs_query_next(&it)); test_uint(1, it.count); test_uint(p4, it.entities[0]); - test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 1)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(EcsWildcard, ecs_field_id(&it, 2)); - test_uint(child_4, ecs_field_src(&it, 2)); + test_uint(ecs_pair(Rel, t4), ecs_field_id(&it, 0)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(EcsWildcard, ecs_field_id(&it, 1)); + test_uint(child_4, ecs_field_src(&it, 1)); test_uint(t4, ecs_iter_get_var(&it, x_var)); test_uint(child_4, ecs_iter_get_var(&it, child_var)); @@ -10358,20 +10358,20 @@ void Variables_lookup_as_tag(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(tag_a, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(a, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(tag_a, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(a, ecs_field_src(&it, 1)); test_uint(a, ecs_iter_get_var(&it, x_var)); test_uint(tag_a, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(tag_c, ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(c, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(tag_c, ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(c, ecs_field_src(&it, 1)); test_uint(c, ecs_iter_get_var(&it, x_var)); test_uint(tag_c, ecs_iter_get_var(&it, tag_var)); @@ -10421,20 +10421,20 @@ void Variables_lookup_as_relationship(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(tag_a, Tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(a, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(tag_a, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(a, ecs_field_src(&it, 1)); test_uint(a, ecs_iter_get_var(&it, x_var)); test_uint(tag_a, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(tag_c, Tgt), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(c, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(tag_c, Tgt), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(c, ecs_field_src(&it, 1)); test_uint(c, ecs_iter_get_var(&it, x_var)); test_uint(tag_c, ecs_iter_get_var(&it, tag_var)); @@ -10484,20 +10484,20 @@ void Variables_lookup_as_target(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, tag_a), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(a, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, tag_a), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(a, ecs_field_src(&it, 1)); test_uint(a, ecs_iter_get_var(&it, x_var)); test_uint(tag_a, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_c, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(Rel, tag_c), ecs_field_id(&it, 2)); - test_uint(0, ecs_field_src(&it, 1)); - test_uint(c, ecs_field_src(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(Rel, tag_c), ecs_field_id(&it, 1)); + test_uint(0, ecs_field_src(&it, 0)); + test_uint(c, ecs_field_src(&it, 1)); test_uint(c, ecs_iter_get_var(&it, x_var)); test_uint(tag_c, ecs_iter_get_var(&it, tag_var)); @@ -10540,14 +10540,14 @@ void Variables_lookup_assign_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(tag_a, ecs_iter_get_var(&it, x_var)); test_uint(tag_a, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_b, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); + test_uint(Foo, ecs_field_id(&it, 0)); test_uint(tag_b, ecs_iter_get_var(&it, x_var)); test_uint(tag_b, ecs_iter_get_var(&it, tag_var)); @@ -10596,16 +10596,16 @@ void Variables_lookup_eq_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_childof(parent_a), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_childof(parent_a), ecs_field_id(&it, 1)); test_uint(tag_ay, ecs_iter_get_var(&it, x_var)); test_uint(tag_ay, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_b, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_childof(parent_b), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_childof(parent_b), ecs_field_id(&it, 1)); test_uint(tag_by, ecs_iter_get_var(&it, x_var)); test_uint(tag_by, ecs_iter_get_var(&it, tag_var)); @@ -10654,24 +10654,24 @@ void Variables_lookup_neq_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_childof(parent_a), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_childof(parent_a), ecs_field_id(&it, 1)); test_uint(tag_ax, ecs_iter_get_var(&it, x_var)); test_uint(tag_ay, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_a, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_childof(parent_a), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_childof(parent_a), ecs_field_id(&it, 1)); test_uint(tag_az, ecs_iter_get_var(&it, x_var)); test_uint(tag_ay, ecs_iter_get_var(&it, tag_var)); test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(parent_b, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_childof(parent_b), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_childof(parent_b), ecs_field_id(&it, 1)); test_uint(tag_bx, ecs_iter_get_var(&it, x_var)); test_uint(tag_by, ecs_iter_get_var(&it, tag_var)); @@ -10938,8 +10938,8 @@ void Variables_1_trivial_1_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 1)); test_uint(p, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -10973,9 +10973,9 @@ void Variables_2_trivial_1_var(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); test_uint(p, ecs_iter_get_var(&it, x_var)); test_bool(false, ecs_query_next(&it)); @@ -11007,10 +11007,10 @@ void Variables_1_trivial_1_var_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -11048,18 +11048,18 @@ void Variables_2_trivial_1_var_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_assert(ecs_field(&it, Velocity, 2) != NULL); + test_assert(ecs_field(&it, Velocity, 1) != NULL); { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -11092,8 +11092,8 @@ void Variables_1_trivial_1_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -11123,9 +11123,9 @@ void Variables_2_trivial_1_wildcard(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -11153,10 +11153,10 @@ void Variables_1_trivial_1_wildcard_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -11190,18 +11190,18 @@ void Variables_2_trivial_1_wildcard_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, p), ecs_field_id(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_assert(ecs_field(&it, Velocity, 2) != NULL); + test_assert(ecs_field(&it, Velocity, 1) != NULL); { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); @@ -11233,8 +11233,8 @@ void Variables_1_trivial_1_any(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 1)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -11264,9 +11264,9 @@ void Variables_2_trivial_1_any(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(Foo, ecs_field_id(&it, 1)); - test_uint(Bar, ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(Foo, ecs_field_id(&it, 0)); + test_uint(Bar, ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 2)); test_bool(false, ecs_query_next(&it)); ecs_query_fini(q); @@ -11294,10 +11294,10 @@ void Variables_1_trivial_1_any_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 2)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 1)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); @@ -11331,18 +11331,18 @@ void Variables_2_trivial_1_any_component(void) { test_bool(true, ecs_query_next(&it)); test_int(1, it.count); test_uint(e, it.entities[0]); - test_uint(ecs_id(Position), ecs_field_id(&it, 1)); - test_uint(ecs_id(Velocity), ecs_field_id(&it, 2)); - test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 3)); + test_uint(ecs_id(Position), ecs_field_id(&it, 0)); + test_uint(ecs_id(Velocity), ecs_field_id(&it, 1)); + test_uint(ecs_pair(EcsChildOf, EcsWildcard), ecs_field_id(&it, 2)); { - Position *p = ecs_field(&it, Position, 1); + Position *p = ecs_field(&it, Position, 0); test_assert(p != NULL); test_int(p->x, 10); test_int(p->y, 20); } - test_assert(ecs_field(&it, Velocity, 2) != NULL); + test_assert(ecs_field(&it, Velocity, 1) != NULL); { - Velocity *v = ecs_field(&it, Velocity, 2); + Velocity *v = ecs_field(&it, Velocity, 1); test_assert(v != NULL); test_int(v->x, 1); test_int(v->y, 2); diff --git a/test/query/src/util.c b/test/query/src/util.c index 71c9ef7e1..2878e490d 100644 --- a/test/query/src/util.c +++ b/test/query/src/util.c @@ -20,9 +20,9 @@ void probe_system_w_ctx( int i; for (i = 0; i < ctx->term_count; i ++) { ctx->c[ctx->invoked][i] = it->ids[i]; - ctx->s[ctx->invoked][i] = ecs_field_src(it, i + 1); + ctx->s[ctx->invoked][i] = ecs_field_src(it, i); - ecs_id_t e = ecs_field_id(it, i + 1); + ecs_id_t e = ecs_field_id(it, i); test_assert(e != 0); }