Refactor vector3_t #1645

cmake/f3dOptions.cmake

@@ -129,6 +129,11 @@ function(_parse_json_option _top_json)
        elseif(_option_type STREQUAL "ratio")
          set(_option_actual_type "f3d::ratio_t")
          set(_option_variant_type "double")
+       elseif(_option_type STREQUAL "vector")
+         set(_option_actual_type "f3d::vector3_t")
+         set(_option_variant_type "std::vector<double>")
+         set(_option_default_value_start "{")
+         set(_option_default_value_end "}")
        endif()
 
        # Add option to struct and methods

library/options.json

@@ -4,6 +4,10 @@
       "type": "string",
       "default_value": "+Y"
     },
+    "up_direction2": {
+      "type": "vector",
+      "default_value": "0, 1, 0"
+    },
     "animation": {
       "autoplay": {
         "type": "bool",

library/private/options_tools.h.in

@@ -5,7 +5,9 @@
 #include "types.h"
 
 #include <algorithm>
+#include <exception>
 #include <sstream>
+#include <vector>
 
 namespace f3d
 {
@@ -181,6 +183,21 @@ ratio_t parse(const std::string& str)
   }
 }
 
+//----------------------------------------------------------------------------
+/**
+ * Parse provided string into a vector3_t.
+ */
+template<>
+vector3_t parse(const std::string& str)
+{
+  std::vector vec = parse<std::vector<double>>(str);
+  if (vec.size() != 3)
+  {
+    throw options::parsing_exception("cannot parse " + str + " to a vector3_t");
+  }
+  return { vec[0], vec[1], vec[2] };
+}
+
 //----------------------------------------------------------------------------
 /**
  * Return provided string stripped of leading and trailing spaces.
@@ -242,6 +259,24 @@ std::string format(const ratio_t& var)
   return options_tools::format(val);
 }
 
+//----------------------------------------------------------------------------
+/**
+ * Format provided var into a string from provided vector3_t
+ * rely on format(double&)
+ */
+template<>
+std::string format(const vector3_t& var)
+{
+  std::ostringstream stream;
+  unsigned int i = 0;
+  for (auto& elem : var)
+  {
+    stream << ((i > 0) ? ", " : "") << options_tools::format(elem);
+    i++;
+  }
+  return stream.str();
+}
+
 //----------------------------------------------------------------------------
 /**
  * Generate (returns) a string from provided string

library/public/types.h

@@ -4,6 +4,8 @@
 #include "export.h"
 
 #include <array>
+#include <cmath>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -21,18 +23,6 @@
   }
 };
 
-/**
- * Describe a 3D vector.
- */
-struct F3D_EXPORT vector3_t : std::array<double, 3>
-{
-  template<typename... Args>
-  vector3_t(Args&&... args)
-    : array({ double(std::forward<Args>(args))... })
-  {
-  }
-};
-
 /**
  * Describe an angle in degrees.
  */
@@ -82,6 +72,54 @@
    */
   F3D_EXPORT std::pair<bool, std::string> isValid() const;
 };
+
+/**
+ * Describe a 3D vector.
+ */
+struct vector3_t : std::array<double, 3>
+{
+  vector3_t() = default;
+  vector3_t(double x, double y, double z)
+    : array{ x, y, z }
+  {
+  }
+  vector3_t(const std::vector<double>& vec)
+  {
+    if (vec.size() != 3)
+    {
+      throw std::runtime_error("cannot create a vector3_t");
+    }
+    _M_elems[0] = vec[0];
+    _M_elems[1] = vec[1];
+    _M_elems[2] = vec[2];
+  }
+
+  operator std::vector<double>() const
+  {
+    return { _M_elems[0], _M_elems[1], _M_elems[2] };
+  }
+
+  static vector3_t fromSphericalCoordinates(double theta, double phi)
+  {
+    return { std::sin(phi) * std::cos(theta), std::sin(phi) * std::cos(theta), std::cos(phi) };
+  }
+  static vector3_t x()
+  {
+    return { 1, 0, 0 };
+  }
+  static vector3_t y()
+  {
+    return { 0, 1, 0 };
+  }
+  static vector3_t z()
+  {
+    return { 0, 0, 1 };
+  }
+  static vector3_t zero()
+  {
+    return { 0, 0, 0 };
+  }
+};
 }
 
 #endif