NukeBird/zecsy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement ensure method

Browse source
This commit is contained in:
NukeBird 2025-02-21 18:26:24 +03:00
parent e99adff481
commit 5afe852f75
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/zecsy.cpp
View file

@ -67,13 +67,12 @@ TEST_CASE("Attach a simple component to an entity and verify it is correctly "
world w; world w;
auto e1 = w.make_entity(); auto e1 = w.make_entity();
w.set(e1, ChoosenOne{});
w.set(e1, ChoosenOne{});
REQUIRE(w.has<ChoosenOne>(e1)); REQUIRE(w.has<ChoosenOne>(e1));
auto e2 = w.make_entity(); auto e2 = w.make_entity();
w.set(e2, ChoosenOne{}); w.set(e2, ChoosenOne{});
REQUIRE(w.has<ChoosenOne>(e2)); REQUIRE(w.has<ChoosenOne>(e2));
} }
@ -94,8 +93,15 @@ TEST_CASE("Retrieve a component from an entity and verify its data matches "
REQUIRE(w.get<Comp>(e).v == 0); REQUIRE(w.get<Comp>(e).v == 0);
w.get<Comp>(e).v = 77; w.get<Comp>(e).v = 77;
REQUIRE(w.get<Comp>(e).v == 77); REQUIRE(w.get<Comp>(e).v == 77);
w.ensure<Comp>(e).v = 4;
REQUIRE(w.ensure<Comp>(e).v == 4);
REQUIRE(w.get<Comp>(e).v == 4);
w.remove<Comp>(e);
w.ensure<Comp>(e).v = 123;
REQUIRE(w.get<Comp>(e).v == 123);
} }
TEST_CASE( TEST_CASE(
@ -112,7 +118,6 @@ TEST_CASE(
w.set(e, ChoosenOne{}); w.set(e, ChoosenOne{});
REQUIRE_NOTHROW(w.remove<ChoosenOne>(e)); REQUIRE_NOTHROW(w.remove<ChoosenOne>(e));
REQUIRE_FALSE(w.has<ChoosenOne>(e)); REQUIRE_FALSE(w.has<ChoosenOne>(e));
} }

14
zecsy.hpp
View file

@ -70,6 +70,9 @@ namespace zecsy
void set(entity_id e, const First& comp0, const Second& comp1, void set(entity_id e, const First& comp0, const Second& comp1,
const Rest&... rest_comps); const Rest&... rest_comps);
template<Component T>
T& ensure(entity_id e);
template<Component T> template<Component T>
void remove(entity_id e); void remove(entity_id e);
@ -219,6 +222,17 @@ namespace zecsy
return false; return false;
} }
template<Component T>
T& world::ensure(entity_id e)
{
if(!has<T>(e))
{
set<T>(e);
}
return get<T>(e);
}
template<Component T> template<Component T>
inline T& world::get(entity_id e) inline T& world::get(entity_id e)
{ {