refactor(core): add AUTO_MAT1 and AUTO_VEC1 macros

GameDevTecnico · Sep 28, 2023 · 553695c · 553695c
1 parent be79c91
commit 553695c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/core/src/cubos/core/reflection/external/glm.cpp b/core/src/cubos/core/reflection/external/glm.cpp
@@ -33,20 +33,16 @@ class AddressOfImpl final : public FieldsTrait::AddressOf
 #define AUTO_CONSTRUCTIBLE(type)                                                                                       \
     ConstructibleTrait::typed<type>().withDefaultConstructor().withCopyConstructor().withMoveConstructor().build()
 
-#define AUTO_VEC2(type) FieldsTrait().withField("x", &type::x).withField("y", &type::y)
-
+#define AUTO_VEC1(type) FieldsTrait().withField("x", &type::x)
+#define AUTO_VEC2(type) AUTO_VEC1(type).withField("y", &type::y)
 #define AUTO_VEC3(type) AUTO_VEC2(type).withField("z", &type::z)
-
 #define AUTO_VEC4(type) AUTO_VEC3(type).withField("w", &type::w)
 
+#define AUTO_MAT1(type, column_type) FieldsTrait().withField(reflect<column_type>(), "a", new AddressOfImpl<type>(0))
 #define AUTO_MAT2(type, column_type)                                                                                   \
-    FieldsTrait()                                                                                                      \
-        .withField(reflect<column_type>(), "a", new AddressOfImpl<type>(0))                                            \
-        .withField(reflect<column_type>(), "b", new AddressOfImpl<type>(1))
-
+    AUTO_MAT1(type, column_type).withField(reflect<column_type>(), "b", new AddressOfImpl<type>(1))
 #define AUTO_MAT3(type, column_type)                                                                                   \
     AUTO_MAT2(type, column_type).withField(reflect<column_type>(), "c", new AddressOfImpl<type>(2))
-
 #define AUTO_MAT4(type, column_type)                                                                                   \
     AUTO_MAT3(type, column_type).withField(reflect<column_type>(), "d", new AddressOfImpl<type>(3))