Jelajahi Sumber

Improve vector conversion makro

Kajetan Johannes Hammerle 3 minggu lalu
induk
melakukan
b977e409e2
1 mengubah file dengan 7 tambahan dan 9 penghapusan
  1. 7 9
      include/core/Vector.h

+ 7 - 9
include/core/Vector.h

@@ -45,14 +45,12 @@ CORE_DEFINE_VECTOR(4, CoreIntVector4, IV4, int)
 CoreVector3* coreAngles(CoreVector3* r, float lengthAngle, float widthAngle);
 CoreVector3* coreCross(CORE_VECTOR_OP3(CoreVector3));
 
-#define CORE_DEFINE_VECTOR_CONVERSION(a, b, name)                              \
-    a* coreConvert##name(a* r, const b* c)
-
-CORE_DEFINE_VECTOR_CONVERSION(CoreVector2, CoreIntVector2, IV2);
-CORE_DEFINE_VECTOR_CONVERSION(CoreVector3, CoreIntVector3, IV3);
-CORE_DEFINE_VECTOR_CONVERSION(CoreVector4, CoreIntVector4, IV4);
-CORE_DEFINE_VECTOR_CONVERSION(CoreIntVector2, CoreVector2, V2);
-CORE_DEFINE_VECTOR_CONVERSION(CoreIntVector3, CoreVector3, V3);
-CORE_DEFINE_VECTOR_CONVERSION(CoreIntVector4, CoreVector4, V4);
+#define CORE_DEFINE_VECTOR_CONVERSION(a, nameA, b, nameB)                      \
+    a* coreConvert##nameB(a* r, const b* c);                                   \
+    b* coreConvert##nameA(b* r, const a* c)
+
+CORE_DEFINE_VECTOR_CONVERSION(CoreVector2, V2, CoreIntVector2, IV2);
+CORE_DEFINE_VECTOR_CONVERSION(CoreVector3, V3, CoreIntVector3, IV3);
+CORE_DEFINE_VECTOR_CONVERSION(CoreVector4, V4, CoreIntVector4, IV4);
 
 #endif