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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

File:

• trunk/lib/FlairCore/src/Vector2D.h (modified) (11 diffs)

trunk/lib/FlairCore/src/Vector2D.h

@@ -21 +21 @@
 * \brief Class defining a 2D vector
 */
+template <typename T>
 class Vector2D {
 public:
@@ -31 +32 @@
   * \param y
   */
-  Vector2D(float x = 0, float y = 0);
+  Vector2D(T x = 0, T y = 0);
 
   /*!
@@ -73 +74 @@
   * \param max maximum Vector2D value
   */
-  void Saturate(Vector2D min, Vector2D max);
+  void Saturate(Vector2D<T> min, Vector2D<T> max);
 
   /*!
@@ -92 +93 @@
   * \param value saturation Vector2D value
   */
-  void Saturate(const Vector2D &value);
+  void Saturate(const Vector2D<T> &value);
 
   /*!
@@ -106 +107 @@
   * \brief x
   */
-  float x;
+  T x;
 
   /*!
   * \brief y
   */
-  float y;
+  T y;
 
-  Vector2D &operator=(const Vector2D &vector);
-  Vector2D &operator+=(const Vector2D &vector);
-  Vector2D &operator-=(const Vector2D &vector);
+  template<typename S> Vector2D<T> &operator=(const Vector2D<S> &vector) {
+    x = vector.x;
+    y = vector.y;
+    return (*this);
+  }
+  Vector2D<T> &operator+=(const Vector2D<T> &vector);
+  Vector2D<T> &operator-=(const Vector2D<T> &vector);
 };
+
+typedef Vector2D<float> Vector2Df;
 
 /*! Add
@@ -125 +132 @@
 * \param vectorB vector
 */
-Vector2D operator+(const Vector2D &vectorA, const Vector2D &vectorB);
+template<typename T> Vector2D<T> operator+(const Vector2D<T> &vectorA, const Vector2D<T> &vectorB);
 
 /*! Substract
@@ -134 +141 @@
 * \param vectorB vector
 */
-Vector2D operator-(const Vector2D &vectorA, const Vector2D &vectorB);
+template<typename T> Vector2D<T> operator-(const Vector2D<T> &vectorA, const Vector2D<T> &vectorB);
 
 /*! Opposite
@@ -144 +151 @@
 * \return -vectorA
 */
-Vector2D operator-(const Vector2D &vectorA);
+template<typename T> Vector2D<T> operator-(const Vector2D<T> &vectorA);
 
 /*! Divid
@@ -154 +161 @@
 * \return vector/coefficient
 */
-Vector2D operator/(const Vector2D &vector, float coeff);
+template<typename T> Vector2D<T> operator/(const Vector2D<T> &vector, float coeff);
 
 /*! Multiply
@@ -164 +171 @@
 * \return coefficient*vector
 */
-Vector2D operator*(const Vector2D &vector, float coeff);
+template<typename T> Vector2D<T> operator*(const Vector2D<T> &vector, float coeff);
 
 /*! Multiply
@@ -174 +181 @@
 * \return coefficient*vector
 */
-Vector2D operator*(float coeff, const Vector2D &vector);
+template<typename T> Vector2D<T> operator*(float coeff, const Vector2D<T> &vector);
 
 } // end namespace core