lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add declare_uuid macro to simplify creating ecs component classes

Browse source
This commit is contained in:
Nikita Lisitsa 2023-08-23 00:04:41 +03:00
parent 2d2362d85c
commit fee1f647b2
4 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/ecs/include/psemek/ecs/declare_uuid.hpp Normal file
View file

@ -0,0 +1,6 @@
#pragma once
#include <psemek/util/uuid.hpp>
#define psemek_declare_uuid(seed) \
static ::psemek::util::uuid uuid() { static constexpr auto value = ::psemek::util::make_uuid(seed); return value; }

11
libs/ecs/tests/apply.cpp
View file

@ -1,6 +1,7 @@
#include <psemek/test/test.hpp> #include <psemek/test/test.hpp>
#include <psemek/ecs/entity_container.hpp> #include <psemek/ecs/entity_container.hpp>
#include <psemek/ecs/declare_uuid.hpp>
#include <psemek/random/generator.hpp> #include <psemek/random/generator.hpp>
#include <psemek/random/uniform.hpp> #include <psemek/random/uniform.hpp>
@ -14,20 +15,14 @@ namespace
{ {
int value; int value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_1")
{
return {1, 0};
}
}; };
struct component_2 struct component_2
{ {
int value; int value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_2")
{
return {2, 0};
}
}; };
} }

21
libs/ecs/tests/component.cpp
View file

@ -1,6 +1,7 @@
#include <psemek/test/test.hpp> #include <psemek/test/test.hpp>
#include <psemek/ecs/entity_container.hpp> #include <psemek/ecs/entity_container.hpp>
#include <psemek/ecs/declare_uuid.hpp>
#include <psemek/random/generator.hpp> #include <psemek/random/generator.hpp>
#include <psemek/random/uniform.hpp> #include <psemek/random/uniform.hpp>
@ -14,40 +15,28 @@ namespace
{ {
int value; int value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_small")
{
return {1, 0};
}
}; };
struct component_big struct component_big
{ {
int values[16]; int values[16];
static constexpr util::uuid uuid() psemek_declare_uuid("component_big")
{
return {2, 0};
}
}; };
struct component_noncopyable struct component_noncopyable
{ {
std::unique_ptr<int> value; std::unique_ptr<int> value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_noncopyable")
{
return {2, 0};
}
}; };
struct component_counter struct component_counter
{ {
std::shared_ptr<int> value; std::shared_ptr<int> value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_counter")
{
return {2, 0};
}
}; };
} }

12
libs/ecs/tests/entity.cpp
View file

@ -1,8 +1,10 @@
#include <psemek/test/test.hpp> #include <psemek/test/test.hpp>
#include <psemek/ecs/entity_container.hpp> #include <psemek/ecs/entity_container.hpp>
#include <psemek/ecs/declare_uuid.hpp>
#include <psemek/random/generator.hpp> #include <psemek/random/generator.hpp>
#include <psemek/random/uniform.hpp> #include <psemek/random/uniform.hpp>
#include <psemek/log/log.hpp>
using namespace psemek; using namespace psemek;
using namespace psemek::ecs; using namespace psemek::ecs;
@ -14,20 +16,14 @@ namespace
{ {
int value; int value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_1")
{
return {1, 0};
}
}; };
struct component_2 struct component_2
{ {
int value; int value;
static constexpr util::uuid uuid() psemek_declare_uuid("component_2")
{
return {2, 0};
}
}; };
} }