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

Custom concept for components

Browse source
This commit is contained in:
NukeBird 2025-02-18 22:27:54 +03:00
parent c7f04c9d21
commit 006d9fc95e
2 changed files with 61 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/zecsy.cpp
View file

@ -1,5 +1,4 @@
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <string>
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <catch2/catch_all.hpp> #include <catch2/catch_all.hpp>
@ -74,9 +73,9 @@ TEST_CASE("Attach a simple component to an entity and verify it is correctly "
REQUIRE(w.has<ChoosenOne>(e2)); REQUIRE(w.has<ChoosenOne>(e2));
} }
struct Name struct Comp
{ {
std::string value; int v = 0;
}; };
TEST_CASE("Retrieve a component from an entity and verify its data matches " TEST_CASE("Retrieve a component from an entity and verify its data matches "
@ -85,13 +84,13 @@ TEST_CASE("Retrieve a component from an entity and verify its data matches "
world w; world w;
auto e = w.make_entity(); auto e = w.make_entity();
w.set(e, Name{"zecsy!"}); w.set(e, Comp());
REQUIRE(w.get<Name>(e).value == "zecsy!"); REQUIRE(w.get<Comp>(e).v == 0);
w.get<Name>(e).value = "super-zecsy!"; w.get<Comp>(e).v = 77;
REQUIRE(w.get<Name>(e).value == "super-zecsy!"); REQUIRE(w.get<Comp>(e).v == 77);
} }
TEST_CASE( TEST_CASE(
@ -161,15 +160,15 @@ TEST_CASE("Attach multiple components to an entity and verify all are "
world w; world w;
auto e = w.make_entity(); auto e = w.make_entity();
w.set(e, ChoosenOne{}, Name{"zecsy"}); w.set(e, ChoosenOne{}, Comp{});
REQUIRE(w.has<ChoosenOne, Name>(e)); REQUIRE(w.has<ChoosenOne, Comp>(e));
w.remove<ChoosenOne, Name>(e); w.remove<ChoosenOne, Comp>(e);
REQUIRE_FALSE(w.has<ChoosenOne, Name>(e)); REQUIRE_FALSE(w.has<ChoosenOne, Comp>(e));
REQUIRE_FALSE(w.has<ChoosenOne>(e)); REQUIRE_FALSE(w.has<ChoosenOne>(e));
REQUIRE_FALSE(w.has<Name>(e)); REQUIRE_FALSE(w.has<Comp>(e));
} }
TEST_CASE("Create a simple system that processes entities with a specific " TEST_CASE("Create a simple system that processes entities with a specific "

82
zecsy.hpp
View file

@ -6,13 +6,33 @@
#include <functional> #include <functional>
#include <set> #include <set>
#include <stdexcept> #include <stdexcept>
#include <type_traits>
#include <unordered_map> #include <unordered_map>
#include <variant>
#include <vector> #include <vector>
#include <concepts>
namespace zecsy namespace zecsy
{ {
using entity_id = uint64_t; using entity_id = uint64_t;
/*
* Actually, not a pure POD. Gotta figure out a better name
*/
template<typename... T>
concept Component = []
{
static_assert((std::is_default_constructible_v<T> && ...),
"Should have a default constructor");
static_assert((std::is_trivially_copyable_v<T> && ...),
"Should be trivially copyable");
static_assert((std::is_trivially_destructible_v<T> && ...),
"Should be trivially destructible");
static_assert((std::is_standard_layout_v<T> && ...),
"Should have standard layout");
return true;
}();
/* /*
* Using std::set for entities_set to maintain sorted order, which can * Using std::set for entities_set to maintain sorted order, which can
* improve cache locality during queries and iterations. * improve cache locality during queries and iterations.
@ -22,32 +42,32 @@ namespace zecsy
class component_storage final class component_storage final
{ {
public: public:
template<typename T> template<Component T>
bool has(entity_id e) const; bool has(entity_id e) const;
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
bool has(entity_id e) const; bool has(entity_id e) const;
template<typename T> template<Component T>
T& get(entity_id e); T& get(entity_id e);
template<typename T> template<Component T>
void set(entity_id e); void set(entity_id e);
template<typename T> template<Component T>
void set(entity_id e, const T& comp); void set(entity_id e, const T& comp);
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
void set(entity_id e); void set(entity_id e);
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
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<typename T> template<Component T>
void remove(entity_id e); void remove(entity_id e);
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
void remove(entity_id e); void remove(entity_id e);
private: private:
@ -75,7 +95,7 @@ namespace zecsy
inline component_storage::comp_id component_storage::next_component_id = 0; inline component_storage::comp_id component_storage::next_component_id = 0;
template<typename T> template<Component T>
inline bool component_storage::has(entity_id e) const inline bool component_storage::has(entity_id e) const
{ {
auto id = get_component_id<T>(); auto id = get_component_id<T>();
@ -86,7 +106,7 @@ namespace zecsy
return false; return false;
} }
template<typename T> template<Component T>
inline T& component_storage::get(entity_id e) inline T& component_storage::get(entity_id e)
{ {
auto id = get_component_id<T>(); auto id = get_component_id<T>();
@ -101,7 +121,7 @@ namespace zecsy
return *reinterpret_cast<T*>(&pool.data[index * sizeof(T)]); return *reinterpret_cast<T*>(&pool.data[index * sizeof(T)]);
} }
template<typename T> template<Component T>
inline void component_storage::set(entity_id e, const T& comp) inline void component_storage::set(entity_id e, const T& comp)
{ {
auto id = get_component_id<T>(); auto id = get_component_id<T>();
@ -124,13 +144,13 @@ namespace zecsy
pool.index_to_entity[index] = e; pool.index_to_entity[index] = e;
} }
template<typename T> template<Component T>
inline void component_storage::set(entity_id e) inline void component_storage::set(entity_id e)
{ {
set(e, T{}); set(e, T{});
} }
template<typename T> template<Component T>
inline void component_storage::remove(entity_id e) inline void component_storage::remove(entity_id e)
{ {
auto id = get_component_id<T>(); auto id = get_component_id<T>();
@ -153,13 +173,13 @@ namespace zecsy
pool.index_to_entity.erase(index); pool.index_to_entity.erase(index);
} }
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
inline bool component_storage::has(entity_id e) const inline bool component_storage::has(entity_id e) const
{ {
return has<First>(e) && has<Second>(e) && (has<Rest>(e) && ...); return has<First>(e) && has<Second>(e) && (has<Rest>(e) && ...);
} }
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
inline void component_storage::set(entity_id e) inline void component_storage::set(entity_id e)
{ {
set(e, First{}); set(e, First{});
@ -167,7 +187,7 @@ namespace zecsy
(set(e, Rest{}), ...); (set(e, Rest{}), ...);
} }
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
inline void component_storage::set(entity_id e, const First& comp0, inline void component_storage::set(entity_id e, const First& comp0,
const Second& comp1, const Second& comp1,
const Rest&... rest_comps) const Rest&... rest_comps)
@ -177,7 +197,7 @@ namespace zecsy
(set(e, rest_comps), ...); (set(e, rest_comps), ...);
} }
template<typename First, typename Second, typename... Rest> template<Component First, Component Second, Component... Rest>
inline void component_storage::remove(entity_id e) inline void component_storage::remove(entity_id e)
{ {
remove<First>(e); remove<First>(e);
@ -193,7 +213,6 @@ namespace zecsy
void add_system(int freq, auto&& func); void add_system(int freq, auto&& func);
void update(float dt); void update(float dt);
private: private:
struct system_handler struct system_handler
{ {
@ -238,24 +257,23 @@ namespace zecsy
void destroy_entity(entity_id e); void destroy_entity(entity_id e);
bool is_alive(entity_id e) const; bool is_alive(entity_id e) const;
template<typename... T> template<Component... T>
bool has(entity_id e) const; bool has(entity_id e) const;
template<typename T> template<Component T>
T& get(entity_id e); T& get(entity_id e);
template<typename... T> template<Component... T>
void set(entity_id e); void set(entity_id e);
template<typename... T> template<Component... T>
void set(entity_id e, const T&... comps); void set(entity_id e, const T&... comps);
template<typename... T> template<Component... T>
void remove(entity_id e); void remove(entity_id e);
template<typename... T> template<Component... T>
void query(auto&& system); void query(auto&& system);
private: private:
entities_set alive_entities; entities_set alive_entities;
entity_id entity_counter = 0; entity_id entity_counter = 0;
@ -279,37 +297,37 @@ namespace zecsy
return alive_entities.contains(e); return alive_entities.contains(e);
} }
template<typename... T> template<Component... T>
inline bool world::has(entity_id e) const inline bool world::has(entity_id e) const
{ {
return storage.has<T...>(e); return storage.has<T...>(e);
} }
template<typename T> template<Component T>
inline T& world::get(entity_id e) inline T& world::get(entity_id e)
{ {
return storage.get<T>(e); return storage.get<T>(e);
} }
template<typename... T> template<Component... T>
inline void world::set(entity_id e) inline void world::set(entity_id e)
{ {
storage.set<T...>(e); storage.set<T...>(e);
} }
template<typename... T> template<Component... T>
inline void world::set(entity_id e, const T&... comps) inline void world::set(entity_id e, const T&... comps)
{ {
storage.set(e, comps...); storage.set(e, comps...);
} }
template<typename... T> template<Component... T>
inline void world::remove(entity_id e) inline void world::remove(entity_id e)
{ {
storage.remove<T...>(e); storage.remove<T...>(e);
} }
template<typename... T> template<Component... T>
inline void world::query(auto&& system) inline void world::query(auto&& system)
{ {
for(auto e: alive_entities) for(auto e: alive_entities)