Commit f4adb83d authored by Thomas's avatar Thomas

Merge branch 'master' of cgogn:~kraemer/CGoGN

parents 6c57ca4f 46bdf277
......@@ -132,6 +132,9 @@ public:
// Equal
bool operator==(const Vector<DIM,T>& v) const ;
// Different
bool operator!=(const Vector<DIM,T>& v) const ;
bool hasNan() const ;
/**********************************************/
......
......@@ -277,6 +277,15 @@ inline bool Vector<DIM,T>::operator==(const Vector<DIM,T>& v) const
return true ;
}
template <unsigned int DIM, typename T>
inline bool Vector<DIM,T>::operator!=(const Vector<DIM,T>& v) const
{
for(unsigned int i = 0 ; i < DIM ; ++i)
if(v[i] != m_data[i])
return true ;
return false ;
}
template <unsigned int DIM, typename T>
inline bool Vector<DIM,T>::hasNan() const
{
......@@ -314,7 +323,6 @@ inline Vector<DIM,T> operator*(T a, const Vector<DIM,T>& v)
return v * a ;
}
template <unsigned int DIM, typename T>
inline Vector<DIM,T> operator/(T a, const Vector<DIM,T>& v)
{
......@@ -346,7 +354,6 @@ inline Vector<DIM,T> slerp(const Vector<DIM,T> &v1, const Vector<DIM,T> &v2, con
return res ;
}
} // namespace Geom
} // namespace CGoGN
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment