preparing serialization of entities

2026-09-06 12:08:31 -04:00
parent d7825270ee
commit 62e6284976
11 changed files with 138 additions and 62 deletions
@@ -7,24 +7,41 @@
 #include <Engine/Class.h>

 #define DECLARE_ENTITY()                                                                                               \
-    Entity*             Base;                                                                                          \
-    static const Class* Kind;
+    Entity*       Base;                                                                                                \
+    static Class* Kind;

 // Will register the class globally at launch
 #define DEFINE_ENTITY(entity)                                                                                          \
-    constexpr Class entityKind##entity =                                                                               \
+    Class entityKind##entity =                                                                                         \
        MakeClass(ConstString(#entity), (uint8)Entity_Type::entity, sizeof(entity), alignof(entity), nullptr);         \
-    const Class* entity::Kind = &entityKind##entity;
+    Class* entity::Kind = &entityKind##entity;

 #define DEFINE_ENTITY_SERIALIZED(entity, serialize_fct)                                                                \
-    constexpr Class entityKind##entity =                                                                               \
+    Class entityKind##entity =                                                                                         \
        MakeClass(ConstString(#entity), (uint8)Entity_Type::entity, sizeof(entity), alignof(entity), serialize_fct);   \
-    const Class* entity::Kind = &entityKind##entity;
+    Class* entity::Kind = &entityKind##entity;

 struct EntityManager;
 using DerivedType = void*;
 using EntityID    = uint64_t;

+struct Entity final
+{
+    EntityID    ID      = 0;
+    Class*      Kind    = nullptr;
+    DerivedType Derived = nullptr;
+    float       X       = 0.0f;
+    float       Y       = 0.0f;
+    float       Z       = 0.0f;
+};
+
+struct Inert
+{
+    DECLARE_ENTITY()
+
+    index_t MeshInstance = indexMax;
+};
+
 // clang-format off
 #define ENTITY_TYPE_LIST(X) X(Inert),

@@ -41,33 +58,25 @@ inline const char* kEntity_type_names[] = {
    ENTITY_TYPE_LIST(AS_STR)
    "Count"
 };
+#undef AS_STR
+
+#define AS_CLASS(name) name::Kind
+inline Class* kEntity_type_class_ptr[]
+{
+    ENTITY_TYPE_LIST(AS_CLASS)
+    nullptr
+};
+#undef AS_CLASS

 #define ENTITY(kind) ToUnderlying(Entity_Type::kind)
 // clang-format on

-struct Entity final
-{
-    EntityID     ID      = 0;
-    const Class* Kind    = nullptr;
-    DerivedType  Derived = nullptr;
-    float        X       = 0.0f;
-    float        Y       = 0.0f;
-    float        Z       = 0.0f;
-};
-
 // Can reinterpret cast to this to have the offset of Base and Kind for any entity
 struct entity_template
 {
    DECLARE_ENTITY();
 };

-struct Inert
-{
-    DECLARE_ENTITY()
-
-    index_t MeshInstance = indexMax;
-};
-
 //
 template <typename EntityType>
 concept EntityConcept = requires(EntityType entity) {
@@ -105,3 +114,5 @@ template <typename EntityType>
    Assert(IsA<EntityType>(entity));
    return static_cast<EntityType*>(entity->Derived);
 }
+
+void serialize(archive& ar, NonNullPtr<Entity> entity);