atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove init of basic vector

Browse Source
This commit is contained in:
Edouard DUPIN 2013-01-28 21:07:53 +01:00
parent 73efdadd16
commit c79652bba2
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etk/math/Vector2D.h
View File

@ -24,11 +24,7 @@ namespace etk
/***************************************************** /*****************************************************
* Constructor * Constructor
*****************************************************/ *****************************************************/
Vector2D(void) Vector2D(void) { }; // do nothing ==> better for optimisation
{
m_floats[0]=0;
m_floats[1]=0;
}; // do nothing ==> better for optimisation
Vector2D(T _x, T _y) Vector2D(T _x, T _y)
{ {
m_floats[0] = _x; m_floats[0] = _x;

41
etk/math/Vector3D.h
View File

@ -29,10 +29,6 @@ namespace etk
*/ */
Vector3D(void) Vector3D(void)
{ {
m_floats[0]=0;
m_floats[1]=0;
m_floats[2]=0;
m_floats[3]=0;
} }
/** /**
* @brief Constructor from scalars * @brief Constructor from scalars
@ -59,6 +55,12 @@ namespace etk
m_floats[2] += v.m_floats[2]; m_floats[2] += v.m_floats[2];
return *this; return *this;
} }
Vector3D<T> operator+(const Vector3D<T>& v)
{
return Vector3D<T>(m_floats[0] + v.m_floats[0],
m_floats[1] + v.m_floats[1],
m_floats[2] + v.m_floats[2]);
}
/** /**
@ -72,6 +74,12 @@ namespace etk
m_floats[2] -= v.m_floats[2]; m_floats[2] -= v.m_floats[2];
return *this; return *this;
} }
Vector3D<T> operator-(const Vector3D<T>& v)
{
return Vector3D<T>(m_floats[0] - v.m_floats[0],
m_floats[1] - v.m_floats[1],
m_floats[2] - v.m_floats[2]);
}
/** /**
* @brief Scale the vector * @brief Scale the vector
@ -84,6 +92,12 @@ namespace etk
m_floats[2] *= s; m_floats[2] *= s;
return *this; return *this;
} }
Vector3D<T> operator*(const T& s)
{
return Vector3D<T>(m_floats[0] * s,
m_floats[1] * s,
m_floats[2] * s);
}
/** /**
* @brief Inversely scale the vector * @brief Inversely scale the vector
@ -94,7 +108,17 @@ namespace etk
if (0!=s) { if (0!=s) {
return *this *= btScalar(1.0) / s; return *this *= btScalar(1.0) / s;
} }
return 0; return *this;
}
Vector3D<T>& operator/=(const T& s)
{
if (0!=s) {
m_floats[0]/=s;
m_floats[1]/=s;
m_floats[2]/=s;
return *this;
}
return *this;
} }
/** /**
@ -288,6 +312,12 @@ namespace etk
m_floats[2] *= v.m_floats[2]; m_floats[2] *= v.m_floats[2];
return *this; return *this;
} }
Vector3D<T> operator*(const Vector3D<T>& v)
{
return Vector3D<T>(m_floats[0] * v.m_floats[0],
m_floats[1] * v.m_floats[1],
m_floats[2] * v.m_floats[2]);
}
/** /**
* @brief Return the x value * @brief Return the x value
@ -409,6 +439,7 @@ namespace etk
etk::CCout& operator <<(etk::CCout &os, const btVector3 obj); etk::CCout& operator <<(etk::CCout &os, const btVector3 obj);
etk::CCout& operator <<(etk::CCout &os, const etk::Vector3D<uint32_t> obj); etk::CCout& operator <<(etk::CCout &os, const etk::Vector3D<uint32_t> obj);
etk::CCout& operator <<(etk::CCout &os, const etk::Vector3D<bool> obj); etk::CCout& operator <<(etk::CCout &os, const etk::Vector3D<bool> obj);
}; };
// To siplify the writing of the code ==> this permit to have the same name with the glsl language... // To siplify the writing of the code ==> this permit to have the same name with the glsl language...