Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: update remaining C++ tests for packed Entity struct

esengineca136edc070a
diff --git a/tests/ecs/test_sparse_set.cpp b/tests/ecs/test_sparse_set.cpp
index 4476148c8..0fbc48a64 100644
--- a/tests/ecs/test_sparse_set.cpp
+++ b/tests/ecs/test_sparse_set.cpp
@@ -29,107 +29,107 @@ TEST_CASE("sparse_set_empty_state") {
CHECK(set.empty());
CHECK_EQ(set.size(), 0u);
CHECK_EQ(set.begin(), set.end());
- CHECK(!set.contains(0));
- CHECK(!set.contains(100));
- CHECK(set.tryGet(0) == nullptr);
+ CHECK(!set.contains(esengine::Entity::make(0, 1)));
+ CHECK(!set.contains(esengine::Entity::make(100, 1)));
+ CHECK(set.tryGet(esengine::Entity::make(0, 1)) == nullptr);
}
TEST_CASE("sparse_set_emplace_and_get") {
esengine::ecs::SparseSet<test::Position> set;
- auto& p = set.emplace(5, 10.0f, 20.0f);
+ auto& p = set.emplace(esengine::Entity::make(5, 1), 10.0f, 20.0f);
CHECK_EQ(p.x, 10.0f);
CHECK_EQ(p.y, 20.0f);
- CHECK(set.contains(5));
+ CHECK(set.contains(esengine::Entity::make(5, 1)));
CHECK_EQ(set.size(), 1u);
- auto& retrieved = set.get(5);
+ auto& retrieved = set.get(esengine::Entity::make(5, 1));
CHECK_EQ(retrieved.x, 10.0f);
CHECK_EQ(retrieved.y, 20.0f);
}
TEST_CASE("sparse_set_try_get") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(3, 1.0f, 2.0f);
+ set.emplace(esengine::Entity::make(3, 1), 1.0f, 2.0f);
- auto* found = set.tryGet(3);
+ auto* found = set.tryGet(esengine::Entity::make(3, 1));
CHECK(found != nullptr);
CHECK_EQ(found->x, 1.0f);
- auto* notFound = set.tryGet(99);
+ auto* notFound = set.tryGet(esengine::Entity::make(99, 1));
CHECK(notFound == nullptr);
}
TEST_CASE("sparse_set_swap_and_pop_correctness") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(0, 1.0f, 1.0f);
- set.emplace(1, 2.0f, 2.0f);
- set.emplace(2, 3.0f, 3.0f);
- set.emplace(3, 4.0f, 4.0f);
+ set.emplace(esengine::Entity::make(0, 1), 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(1, 1), 2.0f, 2.0f);
+ set.emplace(esengine::Entity::make(2, 1), 3.0f, 3.0f);
+ set.emplace(esengine::Entity::make(3, 1), 4.0f, 4.0f);
- set.remove(1);
+ set.remove(esengine::Entity::make(1, 1));
- CHECK(!set.contains(1));
+ CHECK(!set.contains(esengine::Entity::make(1, 1)));
CHECK_EQ(set.size(), 3u);
- CHECK_EQ(set.get(0).x, 1.0f);
- CHECK_EQ(set.get(2).x, 3.0f);
- CHECK_EQ(set.get(3).x, 4.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(0, 1)).x, 1.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(2, 1)).x, 3.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(3, 1)).x, 4.0f);
- set.remove(0);
+ set.remove(esengine::Entity::make(0, 1));
CHECK_EQ(set.size(), 2u);
- CHECK_EQ(set.get(2).x, 3.0f);
- CHECK_EQ(set.get(3).x, 4.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(2, 1)).x, 3.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(3, 1)).x, 4.0f);
}
TEST_CASE("sparse_set_remove_last_element") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(10, 1.0f, 1.0f);
- set.emplace(20, 2.0f, 2.0f);
+ set.emplace(esengine::Entity::make(10, 1), 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(20, 1), 2.0f, 2.0f);
- set.remove(20);
+ set.remove(esengine::Entity::make(20, 1));
CHECK_EQ(set.size(), 1u);
- CHECK(set.contains(10));
- CHECK(!set.contains(20));
- CHECK_EQ(set.get(10).x, 1.0f);
+ CHECK(set.contains(esengine::Entity::make(10, 1)));
+ CHECK(!set.contains(esengine::Entity::make(20, 1)));
+ CHECK_EQ(set.get(esengine::Entity::make(10, 1)).x, 1.0f);
}
TEST_CASE("sparse_set_remove_only_element") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(42, 5.0f, 5.0f);
- set.remove(42);
+ set.emplace(esengine::Entity::make(42, 1), 5.0f, 5.0f);
+ set.remove(esengine::Entity::make(42, 1));
CHECK(set.empty());
- CHECK(!set.contains(42));
+ CHECK(!set.contains(esengine::Entity::make(42, 1)));
}
TEST_CASE("sparse_set_page_boundary") {
esengine::ecs::SparseSet<test::Position> set;
- constexpr esengine::Entity PAGE_SIZE = esengine::ecs::SparseSet<test::Position>::SPARSE_PAGE_SIZE;
+ constexpr esengine::u32 PAGE_SIZE = esengine::ecs::SparseSet<test::Position>::SPARSE_PAGE_SIZE;
- set.emplace(0, 1.0f, 1.0f);
- set.emplace(PAGE_SIZE - 1, 2.0f, 2.0f);
- set.emplace(PAGE_SIZE, 3.0f, 3.0f);
- set.emplace(PAGE_SIZE + 1, 4.0f, 4.0f);
+ set.emplace(esengine::Entity::make(0, 1), 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(PAGE_SIZE - 1, 1), 2.0f, 2.0f);
+ set.emplace(esengine::Entity::make(PAGE_SIZE, 1), 3.0f, 3.0f);
+ set.emplace(esengine::Entity::make(PAGE_SIZE + 1, 1), 4.0f, 4.0f);
CHECK_EQ(set.size(), 4u);
- CHECK_EQ(set.get(0).x, 1.0f);
- CHECK_EQ(set.get(PAGE_SIZE - 1).x, 2.0f);
- CHECK_EQ(set.get(PAGE_SIZE).x, 3.0f);
- CHECK_EQ(set.get(PAGE_SIZE + 1).x, 4.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(0, 1)).x, 1.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(PAGE_SIZE - 1, 1)).x, 2.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(PAGE_SIZE, 1)).x, 3.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(PAGE_SIZE + 1, 1)).x, 4.0f);
}
TEST_CASE("sparse_set_large_entity_id") {
esengine::ecs::SparseSet<test::Position> set;
- constexpr esengine::Entity LARGE_ID = 100000;
+ const esengine::Entity LARGE_ID = esengine::Entity::make(100000, 1);
set.emplace(LARGE_ID, 99.0f, 99.0f);
@@ -141,22 +141,24 @@ TEST_CASE("sparse_set_large_entity_id") {
TEST_CASE("sparse_set_interleaved_insert_remove") {
esengine::ecs::SparseSet<test::Position> set;
- for (esengine::Entity i = 0; i < 100; ++i) {
- set.emplace(i, static_cast<float>(i), 0.0f);
+ for (esengine::u32 i = 0; i < 100; ++i) {
+ esengine::Entity e = esengine::Entity::make(i, 1);
+ set.emplace(e, static_cast<float>(i), 0.0f);
}
CHECK_EQ(set.size(), 100u);
- for (esengine::Entity i = 0; i < 100; i += 2) {
- set.remove(i);
+ for (esengine::u32 i = 0; i < 100; i += 2) {
+ set.remove(esengine::Entity::make(i, 1));
}
CHECK_EQ(set.size(), 50u);
- for (esengine::Entity i = 0; i < 100; ++i) {
+ for (esengine::u32 i = 0; i < 100; ++i) {
+ esengine::Entity e = esengine::Entity::make(i, 1);
if (i % 2 == 0) {
- CHECK(!set.contains(i));
+ CHECK(!set.contains(e));
} else {
- CHECK(set.contains(i));
- CHECK_EQ(set.get(i).x, static_cast<float>(i));
+ CHECK(set.contains(e));
+ CHECK_EQ(set.get(e).x, static_cast<float>(i));
}
}
}
@@ -164,8 +166,8 @@ TEST_CASE("sparse_set_interleaved_insert_remove") {
TEST_CASE("sparse_set_clear") {
esengine::ecs::SparseSet<test::Position> set;
- for (esengine::Entity i = 0; i < 50; ++i) {
- set.emplace(i, 0.0f, 0.0f);
+ for (esengine::u32 i = 0; i < 50; ++i) {
+ set.emplace(esengine::Entity::make(i, 1), 0.0f, 0.0f);
}
CHECK_EQ(set.size(), 50u);
@@ -173,29 +175,29 @@ TEST_CASE("sparse_set_clear") {
CHECK(set.empty());
CHECK_EQ(set.size(), 0u);
- for (esengine::Entity i = 0; i < 50; ++i) {
- CHECK(!set.contains(i));
+ for (esengine::u32 i = 0; i < 50; ++i) {
+ CHECK(!set.contains(esengine::Entity::make(i, 1)));
}
}
TEST_CASE("sparse_set_reuse_after_clear") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(5, 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(5, 1), 1.0f, 1.0f);
set.clear();
- set.emplace(5, 2.0f, 2.0f);
+ set.emplace(esengine::Entity::make(5, 1), 2.0f, 2.0f);
- CHECK(set.contains(5));
- CHECK_EQ(set.get(5).x, 2.0f);
+ CHECK(set.contains(esengine::Entity::make(5, 1)));
+ CHECK_EQ(set.get(esengine::Entity::make(5, 1)).x, 2.0f);
CHECK_EQ(set.size(), 1u);
}
TEST_CASE("sparse_set_iteration_order") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(10, 10.0f, 0.0f);
- set.emplace(5, 5.0f, 0.0f);
- set.emplace(20, 20.0f, 0.0f);
+ set.emplace(esengine::Entity::make(10, 1), 10.0f, 0.0f);
+ set.emplace(esengine::Entity::make(5, 1), 5.0f, 0.0f);
+ set.emplace(esengine::Entity::make(20, 1), 20.0f, 0.0f);
std::vector<esengine::Entity> iterated;
for (auto entity : set) {
@@ -204,17 +206,17 @@ TEST_CASE("sparse_set_iteration_order") {
CHECK_EQ(iterated.size(), 3u);
- CHECK(std::find(iterated.begin(), iterated.end(), 5) != iterated.end());
- CHECK(std::find(iterated.begin(), iterated.end(), 10) != iterated.end());
- CHECK(std::find(iterated.begin(), iterated.end(), 20) != iterated.end());
+ CHECK(std::find(iterated.begin(), iterated.end(), esengine::Entity::make(5, 1)) != iterated.end());
+ CHECK(std::find(iterated.begin(), iterated.end(), esengine::Entity::make(10, 1)) != iterated.end());
+ CHECK(std::find(iterated.begin(), iterated.end(), esengine::Entity::make(20, 1)) != iterated.end());
}
TEST_CASE("sparse_set_components_dense_array") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(0, 1.0f, 1.0f);
- set.emplace(5, 2.0f, 2.0f);
- set.emplace(10, 3.0f, 3.0f);
+ set.emplace(esengine::Entity::make(0, 1), 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(5, 1), 2.0f, 2.0f);
+ set.emplace(esengine::Entity::make(10, 1), 3.0f, 3.0f);
auto& components = set.components();
CHECK_EQ(components.size(), 3u);
@@ -229,13 +231,13 @@ TEST_CASE("sparse_set_components_dense_array") {
TEST_CASE("sparse_set_index_of") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(100, 1.0f, 0.0f);
- set.emplace(200, 2.0f, 0.0f);
- set.emplace(300, 3.0f, 0.0f);
+ set.emplace(esengine::Entity::make(100, 1), 1.0f, 0.0f);
+ set.emplace(esengine::Entity::make(200, 1), 2.0f, 0.0f);
+ set.emplace(esengine::Entity::make(300, 1), 3.0f, 0.0f);
- auto idx100 = set.indexOf(100);
- auto idx200 = set.indexOf(200);
- auto idx300 = set.indexOf(300);
+ auto idx100 = set.indexOf(esengine::Entity::make(100, 1));
+ auto idx200 = set.indexOf(esengine::Entity::make(200, 1));
+ auto idx300 = set.indexOf(esengine::Entity::make(300, 1));
CHECK_NE(idx100, idx200);
CHECK_NE(idx200, idx300);
@@ -248,33 +250,34 @@ TEST_CASE("sparse_set_index_of") {
TEST_CASE("sparse_set_modify_via_reference") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(7, 1.0f, 1.0f);
+ set.emplace(esengine::Entity::make(7, 1), 1.0f, 1.0f);
- set.get(7).x = 999.0f;
+ set.get(esengine::Entity::make(7, 1)).x = 999.0f;
- CHECK_EQ(set.get(7).x, 999.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(7, 1)).x, 999.0f);
}
TEST_CASE("sparse_set_heavy_component") {
esengine::ecs::SparseSet<test::Heavy> set;
for (int i = 0; i < 100; ++i) {
- set.emplace(static_cast<esengine::Entity>(i), i);
+ set.emplace(esengine::Entity::make(static_cast<esengine::u32>(i), 1), i);
}
for (int i = 0; i < 100; ++i) {
- CHECK_EQ(set.get(static_cast<esengine::Entity>(i)).id, i);
+ CHECK_EQ(set.get(esengine::Entity::make(static_cast<esengine::u32>(i), 1)).id, i);
}
for (int i = 0; i < 50; ++i) {
- set.remove(static_cast<esengine::Entity>(i * 2));
+ set.remove(esengine::Entity::make(static_cast<esengine::u32>(i * 2), 1));
}
for (int i = 0; i < 100; ++i) {
+ esengine::Entity e = esengine::Entity::make(static_cast<esengine::u32>(i), 1);
if (i % 2 == 0) {
- CHECK(!set.contains(static_cast<esengine::Entity>(i)));
+ CHECK(!set.contains(e));
} else {
- CHECK_EQ(set.get(static_cast<esengine::Entity>(i)).id, i);
+ CHECK_EQ(set.get(e).id, i);
}
}
}
@@ -282,16 +285,16 @@ TEST_CASE("sparse_set_heavy_component") {
TEST_CASE("sparse_set_rebuild_sparse") {
esengine::ecs::SparseSet<test::Position> set;
- set.emplace(0, 1.0f, 0.0f);
- set.emplace(10, 2.0f, 0.0f);
- set.emplace(20, 3.0f, 0.0f);
+ set.emplace(esengine::Entity::make(0, 1), 1.0f, 0.0f);
+ set.emplace(esengine::Entity::make(10, 1), 2.0f, 0.0f);
+ set.emplace(esengine::Entity::make(20, 1), 3.0f, 0.0f);
set.rebuildSparse();
- CHECK(set.contains(0));
- CHECK(set.contains(10));
- CHECK(set.contains(20));
- CHECK_EQ(set.get(0).x, 1.0f);
- CHECK_EQ(set.get(10).x, 2.0f);
- CHECK_EQ(set.get(20).x, 3.0f);
+ CHECK(set.contains(esengine::Entity::make(0, 1)));
+ CHECK(set.contains(esengine::Entity::make(10, 1)));
+ CHECK(set.contains(esengine::Entity::make(20, 1)));
+ CHECK_EQ(set.get(esengine::Entity::make(0, 1)).x, 1.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(10, 1)).x, 2.0f);
+ CHECK_EQ(set.get(esengine::Entity::make(20, 1)).x, 3.0f);
}
diff --git a/tests/tilemap/test_tilemap.cpp b/tests/tilemap/test_tilemap.cpp
index b667ca4ce..e743fb47e 100644
--- a/tests/tilemap/test_tilemap.cpp
+++ b/tests/tilemap/test_tilemap.cpp
@@ -6,105 +6,107 @@
using namespace esengine;
using namespace esengine::tilemap;
+static Entity E(u32 idx) { return Entity::make(idx, 1); }
+
TEST_CASE("tilemap_init_layer") {
TilemapSystem sys;
SUBCASE("layer does not exist before init") {
- CHECK_FALSE(sys.hasLayer(0));
+ CHECK_FALSE(sys.hasLayer(E(0)));
}
SUBCASE("layer exists after init") {
- sys.initLayer(0, 10, 8, 32.0f, 32.0f);
- CHECK(sys.hasLayer(0));
+ sys.initLayer(E(0), 10, 8, 32.0f, 32.0f);
+ CHECK(sys.hasLayer(E(0)));
}
SUBCASE("layer destroyed after destroy") {
- sys.initLayer(0, 10, 8, 32.0f, 32.0f);
- sys.destroyLayer(0);
- CHECK_FALSE(sys.hasLayer(0));
+ sys.initLayer(E(0), 10, 8, 32.0f, 32.0f);
+ sys.destroyLayer(E(0));
+ CHECK_FALSE(sys.hasLayer(E(0)));
}
SUBCASE("multiple layers") {
- sys.initLayer(1, 10, 10, 32.0f, 32.0f);
- sys.initLayer(2, 20, 20, 16.0f, 16.0f);
- CHECK(sys.hasLayer(1));
- CHECK(sys.hasLayer(2));
- sys.destroyLayer(1);
- CHECK_FALSE(sys.hasLayer(1));
- CHECK(sys.hasLayer(2));
+ sys.initLayer(E(1), 10, 10, 32.0f, 32.0f);
+ sys.initLayer(E(2), 20, 20, 16.0f, 16.0f);
+ CHECK(sys.hasLayer(E(1)));
+ CHECK(sys.hasLayer(E(2)));
+ sys.destroyLayer(E(1));
+ CHECK_FALSE(sys.hasLayer(E(1)));
+ CHECK(sys.hasLayer(E(2)));
}
}
TEST_CASE("tilemap_set_get_tile") {
TilemapSystem sys;
- sys.initLayer(0, 10, 8, 32.0f, 32.0f);
+ sys.initLayer(E(0), 10, 8, 32.0f, 32.0f);
SUBCASE("all tiles start empty") {
- CHECK_EQ(sys.getTile(0, 0, 0), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 5, 3), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 9, 7), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 0, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 5, 3), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 9, 7), EMPTY_TILE);
}
SUBCASE("set and get single tile") {
- sys.setTile(0, 3, 4, 42);
- CHECK_EQ(sys.getTile(0, 3, 4), 42);
- CHECK_EQ(sys.getTile(0, 3, 3), EMPTY_TILE);
+ sys.setTile(E(0), 3, 4, 42);
+ CHECK_EQ(sys.getTile(E(0), 3, 4), 42);
+ CHECK_EQ(sys.getTile(E(0), 3, 3), EMPTY_TILE);
}
SUBCASE("overwrite tile") {
- sys.setTile(0, 0, 0, 10);
- sys.setTile(0, 0, 0, 20);
- CHECK_EQ(sys.getTile(0, 0, 0), 20);
+ sys.setTile(E(0), 0, 0, 10);
+ sys.setTile(E(0), 0, 0, 20);
+ CHECK_EQ(sys.getTile(E(0), 0, 0), 20);
}
SUBCASE("out of bounds returns EMPTY_TILE") {
- CHECK_EQ(sys.getTile(0, -1, 0), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 10, 0), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 0, 8), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 0, -1), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), -1, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 10, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 0, 8), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 0, -1), EMPTY_TILE);
}
SUBCASE("set out of bounds is no-op") {
- sys.setTile(0, -1, 0, 99);
- sys.setTile(0, 10, 0, 99);
- CHECK_EQ(sys.getTile(0, 0, 0), EMPTY_TILE);
+ sys.setTile(E(0), -1, 0, 99);
+ sys.setTile(E(0), 10, 0, 99);
+ CHECK_EQ(sys.getTile(E(0), 0, 0), EMPTY_TILE);
}
SUBCASE("non-existent layer returns EMPTY_TILE") {
- CHECK_EQ(sys.getTile(999, 0, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(999), 0, 0), EMPTY_TILE);
}
}
TEST_CASE("tilemap_fill_rect") {
TilemapSystem sys;
- sys.initLayer(0, 10, 8, 32.0f, 32.0f);
+ sys.initLayer(E(0), 10, 8, 32.0f, 32.0f);
SUBCASE("fill 3x2 region") {
- sys.fillRect(0, 2, 1, 3, 2, 5);
- CHECK_EQ(sys.getTile(0, 2, 1), 5);
- CHECK_EQ(sys.getTile(0, 3, 1), 5);
- CHECK_EQ(sys.getTile(0, 4, 1), 5);
- CHECK_EQ(sys.getTile(0, 2, 2), 5);
- CHECK_EQ(sys.getTile(0, 3, 2), 5);
- CHECK_EQ(sys.getTile(0, 4, 2), 5);
- CHECK_EQ(sys.getTile(0, 1, 1), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 5, 1), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 2, 0), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 2, 3), EMPTY_TILE);
+ sys.fillRect(E(0), 2, 1, 3, 2, 5);
+ CHECK_EQ(sys.getTile(E(0), 2, 1), 5);
+ CHECK_EQ(sys.getTile(E(0), 3, 1), 5);
+ CHECK_EQ(sys.getTile(E(0), 4, 1), 5);
+ CHECK_EQ(sys.getTile(E(0), 2, 2), 5);
+ CHECK_EQ(sys.getTile(E(0), 3, 2), 5);
+ CHECK_EQ(sys.getTile(E(0), 4, 2), 5);
+ CHECK_EQ(sys.getTile(E(0), 1, 1), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 5, 1), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 2, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 2, 3), EMPTY_TILE);
}
SUBCASE("fill clamps to bounds") {
- sys.fillRect(0, 8, 6, 5, 5, 7);
- CHECK_EQ(sys.getTile(0, 8, 6), 7);
- CHECK_EQ(sys.getTile(0, 9, 7), 7);
- CHECK_EQ(sys.getTile(0, 9, 6), 7);
- CHECK_EQ(sys.getTile(0, 8, 7), 7);
+ sys.fillRect(E(0), 8, 6, 5, 5, 7);
+ CHECK_EQ(sys.getTile(E(0), 8, 6), 7);
+ CHECK_EQ(sys.getTile(E(0), 9, 7), 7);
+ CHECK_EQ(sys.getTile(E(0), 9, 6), 7);
+ CHECK_EQ(sys.getTile(E(0), 8, 7), 7);
}
}
TEST_CASE("tilemap_set_tiles_bulk") {
TilemapSystem sys;
- sys.initLayer(0, 4, 3, 32.0f, 32.0f);
+ sys.initLayer(E(0), 4, 3, 32.0f, 32.0f);
std::vector<u16> tiles = {
1, 2, 3, 4,
@@ -112,27 +114,27 @@ TEST_CASE("tilemap_set_tiles_bulk") {
9, 10, 11, 12
};
- sys.setTiles(0, tiles.data(), static_cast<u32>(tiles.size()));
+ sys.setTiles(E(0), tiles.data(), static_cast<u32>(tiles.size()));
- CHECK_EQ(sys.getTile(0, 0, 0), 1);
- CHECK_EQ(sys.getTile(0, 3, 0), 4);
- CHECK_EQ(sys.getTile(0, 1, 1), EMPTY_TILE);
- CHECK_EQ(sys.getTile(0, 3, 1), 8);
- CHECK_EQ(sys.getTile(0, 0, 2), 9);
- CHECK_EQ(sys.getTile(0, 3, 2), 12);
+ CHECK_EQ(sys.getTile(E(0), 0, 0), 1);
+ CHECK_EQ(sys.getTile(E(0), 3, 0), 4);
+ CHECK_EQ(sys.getTile(E(0), 1, 1), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 3, 1), 8);
+ CHECK_EQ(sys.getTile(E(0), 0, 2), 9);
+ CHECK_EQ(sys.getTile(E(0), 3, 2), 12);
}
TEST_CASE("tilemap_set_tiles_partial") {
TilemapSystem sys;
- sys.initLayer(0, 4, 3, 32.0f, 32.0f);
+ sys.initLayer(E(0), 4, 3, 32.0f, 32.0f);
std::vector<u16> partial = {1, 2, 3};
- sys.setTiles(0, partial.data(), static_cast<u32>(partial.size()));
+ sys.setTiles(E(0), partial.data(), static_cast<u32>(partial.size()));
- CHECK_EQ(sys.getTile(0, 0, 0), 1);
- CHECK_EQ(sys.getTile(0, 1, 0), 2);
- CHECK_EQ(sys.getTile(0, 2, 0), 3);
- CHECK_EQ(sys.getTile(0, 3, 0), EMPTY_TILE);
+ CHECK_EQ(sys.getTile(E(0), 0, 0), 1);
+ CHECK_EQ(sys.getTile(E(0), 1, 0), 2);
+ CHECK_EQ(sys.getTile(E(0), 2, 0), 3);
+ CHECK_EQ(sys.getTile(E(0), 3, 0), EMPTY_TILE);
}
TEST_CASE("tilemap_compute_visible_range") {