Changeset 196:90c862451791 in rrlib_math

Timestamp:

23.03.2020 22:58:50 (3 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Adds explicit template rrlib_rtti tDataTypeInfo instantiations for various vector types

Files:

• rtti.cpp (modified) (4 diffs)
• tVector.h (modified) (1 diff)
• vector/rtti.h (added)
• vector/tVector.h (modified) (2 diffs)

rtti.cpp

@@ -35 +35 @@
 //----------------------------------------------------------------------
 #include "rrlib/rtti/tStaticTypeRegistration.h"
+#include "rrlib/util/string.h"
 
 //----------------------------------------------------------------------
@@ -61 +62 @@
 
 tStaticTypeRegistration init_type = tStaticTypeRegistration("rrlib_math").
-                                    Add<tVec2d>("Vector2d").
-                                    Add<tVec3d>("Vector3d").
-                                    Add<tVec6d>("Vector6d").
-                                    Add<tVec2i>("Vector2i").
-                                    Add<tVec3i>("Vector3i").
-                                    Add<tVec6i>("Vector6i").
+                                    Add<tVec2d>().
+                                    Add<tVec3d>().
+                                    Add<tVec6d>().
+                                    Add<tVec2f>().
+                                    Add<tVec3f>().
+                                    Add<tVec6f>().
+                                    Add<tVec2i>().
+                                    Add<tVec3i>().
+                                    Add<tVec6i>().
                                     Add<tMat2x2d>("Matrix2x2d").
                                     Add<tMat3x3d>("Matrix3x3d").
@@ -114 +118 @@
 }
 
+util::tManagedConstCharPointer GetRRLibRttiCartesianVectorTypeName(const tType& type)
+{
+  auto rrlib_rtti_name = rrlib::rtti::detail::tTypeInfo::GetDefaultTypeNameFromRttiName(type.GetRttiName());
+  std::string rrlib_rtti_name_string(rrlib_rtti_name.Get());
+  if (rrlib_rtti_name_string.find("<") == std::string::npos)
+  {
+    return rrlib_rtti_name;
+  }
+
+  std::stringstream result;
+  result << "Vector";
+
+  std::string template_arguments = rrlib_rtti_name_string.substr(rrlib_rtti_name_string.find("<") + 1);
+  std::vector<std::string> tokens;
+  util::Tokenize(template_arguments, tokens, ",");
+  if (tokens.size() < 2)
+  {
+    return rrlib_rtti_name;
+  }
+  util::TrimWhitespace(tokens[0]);
+  util::TrimWhitespace(tokens[1]);
+  size_t dimension_length = 1;
+  while (tokens[0].length() > dimension_length && std::isdigit(tokens[0][dimension_length]))
+  {
+    dimension_length++;
+  }
+  result << tokens[0].substr(0, dimension_length) << tokens[1][0];
+  //std::cout << "Generated " << result.str() << "\n" << tokens[0];
+  return util::tManagedConstCharPointer(result.str().c_str(), true);
+}
+
 }
 
 namespace rtti
 {
+
+// angle/rtti.h
 template class detail::tDataTypeInfo<math::tAngle<double, math::angle::Radian, math::angle::Signed>>;
 template class detail::tDataTypeInfo<math::tAngle<double, math::angle::Degree, math::angle::Signed>>;
@@ -143 +180 @@
 template class detail::tDataTypeInfo<std::vector<math::tAngle<float, math::angle::Radian, math::angle::NoWrap>>>;
 template class detail::tDataTypeInfo<std::vector<math::tAngle<float, math::angle::Degree, math::angle::NoWrap>>>;
+
+// vector/rtti.h
+template class detail::tDataTypeInfo<math::tVector<2, double, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<3, double, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<6, double, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<2, float, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<3, float, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<6, float, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<2, int, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<3, int, math::vector::Cartesian>>;
+template class detail::tDataTypeInfo<math::tVector<6, int, math::vector::Cartesian>>;
+
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<2, double, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<3, double, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<6, double, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<2, float, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<3, float, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<6, float, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<2, int, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<3, int, math::vector::Cartesian>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<math::tVector<6, int, math::vector::Cartesian>>::type>;
+
+template class detail::tDataTypeInfo<std::vector<math::tVector<2, double, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<3, double, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<6, double, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<2, float, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<3, float, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<6, float, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<2, int, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<3, int, math::vector::Cartesian>>>;
+template class detail::tDataTypeInfo<std::vector<math::tVector<6, int, math::vector::Cartesian>>>;
+
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<2, double, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<3, double, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<6, double, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<2, float, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<3, float, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<6, float, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<2, int, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<3, int, math::vector::Cartesian>>>::type>;
+template class detail::tDataTypeInfo<typename UnderlyingType<std::vector<math::tVector<6, int, math::vector::Cartesian>>>::type>;
+
 }
 

tVector.h

@@ -84 +84 @@
 
 #include "rrlib/math/vector/functions.h"
+#include "rrlib/math/vector/rtti.h"
 
 #undef __rrlib_math__vector__include_guard__

vector/tVector.h

@@ -43 +43 @@
 //----------------------------------------------------------------------
 #include <functional>
-
-#ifdef _LIB_RRLIB_RTTI_PRESENT_
-#include "rrlib/rtti/rtti.h"
-#endif
 
 //----------------------------------------------------------------------
@@ -129 +125 @@
 //----------------------------------------------------------------------
 }
-
-#ifdef _LIB_RRLIB_RTTI_PRESENT_
-namespace rtti
-{
-template <size_t Tdimension, typename TElement, template <size_t, typename, typename ...> class TData, typename ... TAdditionalDataParameters>
-struct UnderlyingType<math::tVector<Tdimension, TElement, TData, TAdditionalDataParameters...>>
-{
-  typedef math::tVector<Tdimension, TElement, TData, TAdditionalDataParameters...> tInternalVectorType;
-
-  typedef std::array<TElement, Tdimension> type;
-  static_assert(sizeof(type) == sizeof(tInternalVectorType), "Invalid trait implementation");
-  enum { cREVERSE_CAST_VALID = true };
-  enum { cBINARY_SERIALIZATION_DIFFERS = false };
-  enum { cOTHER_SERIALIZATION_DIFFERS = true };
-  enum { cINHERITS_ELEMENT_ACCESS_CONVERSION_OPERATIONS = true };
-};
-}
-#endif
-
 }