Added field typename metadata to component traits.

gscept · Mar 20, 2024 · 7e7ecb5 · 7e7ecb5
1 parent 3851d97
commit 7e7ecb5
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 1 deletion.
diff --git a/code/application/basegamefeature/components/orientation.h b/code/application/basegamefeature/components/orientation.h
@@ -33,6 +33,12 @@ struct Orientation::Traits
         "z",
         "w"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "float",
+        "float",
+        "float",
+        "float"
+    };
     using field_types = std::tuple<float, float, float, float>;
     static constexpr size_t field_byte_offsets[num_fields] = {
         offsetof(Orientation, x),

diff --git a/code/application/basegamefeature/components/position.h b/code/application/basegamefeature/components/position.h
@@ -32,6 +32,11 @@ struct Position::Traits
         "y",
         "z"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "float",
+        "float",
+        "float"
+    };
     using field_types = std::tuple<float, float, float>;
     static constexpr size_t field_byte_offsets[num_fields] = {
         offsetof(Position, x),

diff --git a/code/application/basegamefeature/components/scale.h b/code/application/basegamefeature/components/scale.h
@@ -36,6 +36,11 @@ struct Scale::Traits
         "y",
         "z"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "float",
+        "float",
+        "float"
+    };
     using field_types = std::tuple<float, float, float>;
     static constexpr size_t field_byte_offsets[num_fields] = {
         offsetof(Scale, x),

diff --git a/code/application/basegamefeature/components/velocity.h b/code/application/basegamefeature/components/velocity.h
@@ -43,6 +43,11 @@ struct Velocity::Traits
         "y",
         "z"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "float",
+        "float",
+        "float"
+    };
     using field_types = std::tuple<float, float, float>;
     static constexpr size_t field_byte_offsets[num_fields] = {
         offsetof(Velocity, x),
@@ -66,6 +71,11 @@ struct AngularVelocity::Traits
         "y",
         "z"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "float",
+        "float",
+        "float"
+    };
     using field_types = std::tuple<float, float, float>;
     static constexpr size_t field_byte_offsets[num_fields] = {
         offsetof(AngularVelocity, x),

diff --git a/code/application/game/component.h b/code/application/game/component.h
@@ -82,6 +82,7 @@ class ComponentInterface : public MemDb::Attribute
         this->fullyQualifiedName = T::Traits::fully_qualified_name;
         this->numFields = T::Traits::num_fields;
         this->fieldNames = (const char**)T::Traits::field_names;
+        this->fieldTypenames = (const char**)T::Traits::field_typenames;
         this->fieldByteOffsets = (const size_t*)T::Traits::field_byte_offsets;
     }
 
@@ -91,13 +92,15 @@ class ComponentInterface : public MemDb::Attribute
     const char* GetName() const { return componentName; }
     const char* GetFullyQualifiedName() const { return fullyQualifiedName; }
     const char** GetFieldNames() const { return fieldNames; };
+    const char** GetFieldTypenames() const { return fieldTypenames; };
     const size_t* GetFieldByteOffsets() const { return fieldByteOffsets; };
     size_t const GetNumFields() const { return numFields; };
 
 private:
     const char* componentName = nullptr;
     const char* fullyQualifiedName = nullptr;
     const char** fieldNames = nullptr;
+    const char** fieldTypenames = nullptr;
     const size_t* fieldByteOffsets = nullptr;
     size_t numFields = 0;
 };

diff --git a/code/application/game/entity.h b/code/application/game/entity.h
@@ -63,6 +63,9 @@ struct Entity::Traits
     static constexpr const char* field_names[num_fields] = {
         "id"
     };
+    static constexpr const char* field_typenames[num_fields] = {
+        "uint"
+    };
     static constexpr size_t field_byte_offsets[num_fields] = { 0 };
 
     /// This is the column that the entity "owner" will reside in, in every table.

diff --git a/fips-files/generators/IDLC/idlcomponent.py b/fips-files/generators/IDLC/idlcomponent.py
@@ -142,6 +142,15 @@ def WriteComponentHeaderDeclarations(f, document):
             for v in c.variables:
                 f.WriteLine('    "{}",'.format(v.name))
             f.WriteLine('};')
+            f.WriteLine('static constexpr const char* field_typenames[num_fields] = {')
+            for i, v in enumerate(c.variables):
+                f.Write('    "{}"'.format(IDLTypes.GetCppTypeString(v.type)))
+                if i < (len(c.variables) - 1):
+                    f.WriteLine(",")
+                else:
+                    f.WriteLine("")
+            f.WriteLine('};')
+
             f.WriteLine('using field_types = std::tuple<')
             for i, v in enumerate(c.variables):
                 f.Write('    {}'.format(IDLTypes.GetCppTypeString(v.type)))
@@ -156,6 +165,7 @@ def WriteComponentHeaderDeclarations(f, document):
             f.WriteLine('};')
         else:
             f.WriteLine('static constexpr const char** field_names = nullptr;')
+            f.WriteLine('static constexpr const char** field_typenames = nullptr;')
             f.WriteLine('static constexpr size_t* field_byte_offsets = nullptr;')
 
 

diff --git a/fips-files/generators/NIDL.py b/fips-files/generators/NIDL.py
@@ -1,4 +1,4 @@
-Version = 141
+Version = 142
 
 import sys
 if __name__ == '__main__':