Changeset 167 in flair-src for trunk/lib/FlairCore/src/Vector3D.h

Timestamp:

04/12/17 13:59:38 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

File:

• trunk/lib/FlairCore/src/Vector3D.h (modified) (18 diffs)

trunk/lib/FlairCore/src/Vector3D.h

@@ -15 +15 @@
 
 #include <stddef.h>
+#include <Vector2D.h>
 
 namespace flair {
 namespace core {
-class Vector2D;
 class RotationMatrix;
 class Quaternion;
@@ -26 +26 @@
 * \brief Class defining a 3D vector
 */
+template <typename T>
 class Vector3D {
 public:
@@ -37 +38 @@
   * \param z
   */
-  Vector3D(float x = 0, float y = 0, float z = 0);
+  Vector3D(T x = 0, T y = 0, T z = 0);
 
   /*!
@@ -48 +49 @@
   * \brief x
   */
-  float x;
+  T x;
 
   /*!
   * \brief y
   */
-  float y;
+  T y;
 
   /*!
   * \brief z
   */
-  float z;
+  T z;
 
   /*!
@@ -126 +127 @@
   * \param vector destination
   */
-  void To2Dxy(Vector2D &vector) const;
+  void To2Dxy(Vector2D<T> &vector) const;
 
   /*!
@@ -135 +136 @@
   * \return destination
   */
-  Vector2D To2Dxy(void) const;
+  Vector2D<T> To2Dxy(void) const;
 
   /*!
@@ -157 +158 @@
   * \param max maximum value
   */
-  void Saturate(const Vector3D &min, const Vector3D &max);
+  void Saturate(const Vector3D<T> &min, const Vector3D<T> &max);
 
   /*!
@@ -176 +177 @@
   * \param value saturation Vector3D value
   */
-  void Saturate(const Vector3D &value);
+  void Saturate(const Vector3D<T> &value);
 
   /*!
@@ -188 +189 @@
   void Saturate(float value);
 
-  float &operator[](size_t idx);
-  const float &operator[](size_t idx) const;
-  Vector3D &operator=(const Vector3D &vector);
-  Vector3D &operator+=(const Vector3D &vector);
-  Vector3D &operator-=(const Vector3D &vector);
+  T &operator[](size_t idx);
+  const T &operator[](size_t idx) const;
+  //Vector3D<T> &operator=(const Vector3D<T> &vector);
+  template<typename S> Vector3D<T> &operator=(const Vector3D<S> &vector) {
+    x = vector.x;
+    y = vector.y;
+    z = vector.z;
+    return (*this);
+  }
+  Vector3D<T> &operator+=(const Vector3D<T> &vector);
+  Vector3D<T> &operator-=(const Vector3D<T> &vector);
 
 private:
 };
 
+typedef Vector3D<float> Vector3Df;
+
 /*! Add
 *
@@ -206 +215 @@
 * \return vectorA+vectorB
 */
-Vector3D operator+(const Vector3D &vectorA, const Vector3D &vectorB);
+template<typename T> Vector3D<T> operator+(const Vector3D<T> &vectorA, const Vector3D<T> &vectorB);
 
 /*! Substract
@@ -217 +226 @@
 * \return vectorA-vectorB
 */
-Vector3D operator-(const Vector3D &vectorA, const Vector3D &vectorB);
+template<typename T> Vector3D<T> operator-(const Vector3D<T> &vectorA, const Vector3D<T> &vectorB);
 
 /*! Minus
@@ -227 +236 @@
 * \return -vector
 */
-Vector3D operator-(const Vector3D &vector);
+template<typename T> Vector3D<T> operator-(const Vector3D<T> &vector);
 
 /*! Divid
@@ -238 +247 @@
 * \return vector/coefficient
 */
-Vector3D operator/(const Vector3D &vector, float coeff);
+template<typename T> Vector3D<T> operator/(const Vector3D<T> &vector, float coeff);
 
 /*! Hadamard product
@@ -249 +258 @@
 * \return Hadamard product
 */
-Vector3D operator*(const Vector3D &vectorA, const Vector3D &vectorB);
+template<typename T> Vector3D<T> operator*(const Vector3D<T> &vectorA, const Vector3D<T> &vectorB);
 
 /*! Multiply
@@ -260 +269 @@
 * \return coefficient*vector
 */
-Vector3D operator*(const Vector3D &vector, float coeff);
+template<typename T> Vector3D<T> operator*(const Vector3D<T> &vector, float coeff);
 
 /*! Multiply
@@ -271 +280 @@
 * \return coefficient*vector
 */
-Vector3D operator*(float coeff, const Vector3D &vector);
+template<typename T> Vector3D<T> operator*(float coeff, const Vector3D<T> &vector);
 
 /*! Cross product
@@ -282 +291 @@
 * \return cross product
 */
-Vector3D CrossProduct(const Vector3D &vectorA, const Vector3D &vectorB);
+template<typename T> Vector3D<T> CrossProduct(const Vector3D<T> &vectorA, const Vector3D<T> &vectorB);
 
 /*! Dot product
@@ -293 +302 @@
 * \return dot product
 */
-float DotProduct(const Vector3D &vectorA, const Vector3D &vectorB);
+template<typename T> float DotProduct(const Vector3D<T> &vectorA, const Vector3D<T> &vectorB);
 
 } // end namespace core