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

Timestamp:

Apr 12, 2017, 1:59:38 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

File:

• trunk/lib/FlairCore/src/Vector2D.cpp (modified) (7 diffs)

trunk/lib/FlairCore/src/Vector2D.cpp

@@ -22 +22 @@
 namespace flair {
 namespace core {
+  
+template class Vector2D<double>;
+template Vector2D<double> operator+(const Vector2D<double>&, const Vector2D<double>&);
+template Vector2D<double> operator-(const Vector2D<double>&, const Vector2D<double>&);
+template Vector2D<double> operator-(const Vector2D<double>&);
+template Vector2D<double> operator/(const Vector2D<double>&, float);
+template Vector2D<double> operator*(const Vector2D<double>&, float);
+template Vector2D<double> operator*(float, const Vector2D<double>&);
 
-Vector2D::Vector2D(float inX, float inY) : x(inX), y(inY) {}
+template class Vector2D<float>;
+template Vector2D<float> operator+(const Vector2D<float>&, const Vector2D<float>&);
+template Vector2D<float> operator-(const Vector2D<float>&, const Vector2D<float>&);
+template Vector2D<float> operator-(const Vector2D<float>&);
+template Vector2D<float> operator/(const Vector2D<float>&, float);
+template Vector2D<float> operator*(const Vector2D<float>&, float);
+template Vector2D<float> operator*(float, const Vector2D<float>&);
 
-Vector2D::~Vector2D() {}
+template <typename T> Vector2D<T>::Vector2D(T inX, T inY) : x(inX), y(inY) {}
 
-Vector2D &Vector2D::operator=(const Vector2D &vector) {
-  x = vector.x;
-  y = vector.y;
-  return (*this);
-}
+template <typename T> Vector2D<T>::~Vector2D() {}
 
-Vector2D &Vector2D::operator+=(const Vector2D &vector) {
+template <typename T> Vector2D<T> &Vector2D<T>::operator+=(const Vector2D<T> &vector) {
   x += vector.x;
   y += vector.y;
@@ -39 +49 @@
 }
 
-Vector2D &Vector2D::operator-=(const Vector2D &vector) {
+template <typename T> Vector2D<T> &Vector2D<T>::operator-=(const Vector2D<T> &vector) {
   x -= vector.x;
   y -= vector.y;
@@ -45 +55 @@
 }
 
-Vector2D operator+(const Vector2D &vectorA, const Vector2D &vectorB) {
-  return Vector2D(vectorA.x + vectorB.x, vectorA.y + vectorB.y);
+template <typename T> Vector2D<T> operator+(const Vector2D<T> &vectorA, const Vector2D<T> &vectorB) {
+  return Vector2D<T>(vectorA.x + vectorB.x, vectorA.y + vectorB.y);
 }
 
-Vector2D operator-(const Vector2D &vectorA, const Vector2D &vectorB) {
-  return Vector2D(vectorA.x - vectorB.x, vectorA.y - vectorB.y);
+template <typename T> Vector2D<T> operator-(const Vector2D<T> &vectorA, const Vector2D<T> &vectorB) {
+  return Vector2D<T>(vectorA.x - vectorB.x, vectorA.y - vectorB.y);
 }
 
-Vector2D operator-(const Vector2D &vectorA) {
- return Vector2D(-vectorA.x, -vectorA.y);
+template <typename T> Vector2D<T> operator-(const Vector2D<T> &vectorA) {
+ return Vector2D<T>(-vectorA.x, -vectorA.y);
 }
 
-Vector2D operator/(const Vector2D &vector, float coeff) {
+template <typename T> Vector2D<T> operator/(const Vector2D<T> &vector, float coeff) {
   if (coeff != 0) {
-    return Vector2D(vector.x / coeff, vector.y / coeff);
+    return Vector2D<T>(vector.x / coeff, vector.y / coeff);
   } else {
-    return Vector2D(0, 0);
+    return Vector2D<T>(0, 0);
   }
 }
 
-Vector2D operator*(const Vector2D &vector, float coeff) {
-  return Vector2D(vector.x * coeff, vector.y * coeff);
+template <typename T> Vector2D<T> operator*(const Vector2D<T> &vector, float coeff) {
+  return Vector2D<T>(vector.x * coeff, vector.y * coeff);
 }
 
-Vector2D operator*(float coeff, const Vector2D &vector) {
-  return Vector2D(vector.x * coeff, vector.y * coeff);
+template <typename T> Vector2D<T> operator*(float coeff, const Vector2D<T> &vector) {
+  return Vector2D<T>(vector.x * coeff, vector.y * coeff);
 }
 
-void Vector2D::Rotate(float value) {
+template <typename T> void Vector2D<T>::Rotate(float value) {
   float xTmp;
   xTmp = x * cosf(value) - y * sinf(value);
@@ -80 +90 @@
 }
 
-void Vector2D::RotateDeg(float value) { Rotate(Euler::ToRadian(value)); }
+template <typename T> void Vector2D<T>::RotateDeg(float value) { Rotate(Euler::ToRadian(value)); }
 
-float Vector2D::GetNorm(void) const { return sqrt(x * x + y * y); }
+template <typename T> float Vector2D<T>::GetNorm(void) const { return sqrt(x * x + y * y); }
 
-void Vector2D::Normalize(void) {
+template <typename T> void Vector2D<T>::Normalize(void) {
   float n = GetNorm();
   if (n != 0) {
@@ -92 +102 @@
 }
 
-void Vector2D::Saturate(Vector2D min, Vector2D max) {
+template <typename T> void Vector2D<T>::Saturate(Vector2D min, Vector2D max) {
   if (x < min.x)
     x = min.x;
@@ -104 +114 @@
 }
 
-void Vector2D::Saturate(float min, float max) {
+template <typename T> void Vector2D<T>::Saturate(float min, float max) {
   Saturate(Vector2D(min, min), Vector2D(max, max));
 }
 
-void Vector2D::Saturate(const Vector2D &value) {
+template <typename T> void Vector2D<T>::Saturate(const Vector2D &value) {
   float x = fabs(value.x);
   float y = fabs(value.y);
@@ -114 +124 @@
 }
 
-void Vector2D::Saturate(float value) {
+template <typename T> void Vector2D<T>::Saturate(float value) {
   float sat = fabs(value);
   Saturate(Vector2D(-sat, -sat), Vector2D(sat, sat));