sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed toDegree arg from VectorI::AngleBetween 

Former-commit-id: 6b5e141e7c291dadedbfd237f5f22615ce5dcfee
This commit is contained in:
Lynix 2014-07-10 10:03:35 +02:00
parent 0e791ebb19
commit 2479588811
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Vector2.hpp
View File

@ -23,7 +23,7 @@ class NzVector2
T AbsDotProduct(const NzVector2& vec) const; T AbsDotProduct(const NzVector2& vec) const;
T AngleBetween(const NzVector2& vec, bool toDegree = true) const; T AngleBetween(const NzVector2& vec) const;
T Distance(const NzVector2& vec) const; T Distance(const NzVector2& vec) const;
float Distancef(const NzVector2& vec) const; float Distancef(const NzVector2& vec) const;

7
include/Nazara/Math/Vector2.inl
View File

@ -55,12 +55,9 @@ inline unsigned int NzVector2<unsigned int>::AbsDotProduct(const NzVector2<unsig
} }
template<typename T> template<typename T>
T NzVector2<T>::AngleBetween(const NzVector2& vec, bool toDegree) const T NzVector2<T>::AngleBetween(const NzVector2& vec) const
{ {
if (toDegree) return NzRadians(std::atan2(vec.y, vec.x) - std::atan2(y, x));
return NzRadianToDegree(std::atan2(vec.y, vec.x) - std::atan2(y, x));
else
return std::atan2(vec.y, vec.x) - std::atan2(y, x);
} }
template<typename T> template<typename T>

2
include/Nazara/Math/Vector3.hpp
View File

@ -24,7 +24,7 @@ template<typename T> class NzVector3
T AbsDotProduct(const NzVector3& vec) const; T AbsDotProduct(const NzVector3& vec) const;
T AngleBetween(const NzVector3& vec, bool toDegree = true) const; T AngleBetween(const NzVector3& vec) const;
NzVector3 CrossProduct(const NzVector3& vec) const; NzVector3 CrossProduct(const NzVector3& vec) const;

18
include/Nazara/Math/Vector3.inl
View File

@ -61,10 +61,10 @@ inline unsigned int NzVector3<unsigned int>::AbsDotProduct(const NzVector3<unsig
} }
template<typename T> template<typename T>
T NzVector3<T>::AngleBetween(const NzVector3& vec, bool toDegree) const T NzVector3<T>::AngleBetween(const NzVector3& vec) const
{ {
T alpha = DotProduct(vec); // sqrt(a) * sqrt(b) = sqrt(a*b)
T divisor = (GetLength() * vec.GetLength()); T divisor = std::sqrt(GetSquaredLength() * vec.GetSquaredLength());
#if NAZARA_MATH_SAFE #if NAZARA_MATH_SAFE
if (NzNumberEquals(divisor, F(0.0))) if (NzNumberEquals(divisor, F(0.0)))
@ -76,12 +76,8 @@ T NzVector3<T>::AngleBetween(const NzVector3& vec, bool toDegree) const
} }
#endif #endif
alpha /= divisor; T alpha = DotProduct(vec)/divisor;
return NzRadians(std::acos(NzClamp(alpha, F(-1.0), F(1.0))));
if (toDegree)
return NzRadianToDegree(std::acos(NzClamp(alpha, F(-1.0), F(1.0))));
else
return std::acos(NzClamp(alpha, F(-1.0), F(1.0)));
} }
template<typename T> template<typename T>
@ -478,8 +474,8 @@ template<typename T>
bool NzVector3<T>::operator==(const NzVector3& vec) const bool NzVector3<T>::operator==(const NzVector3& vec) const
{ {
return NzNumberEquals(x, vec.x) && return NzNumberEquals(x, vec.x) &&
NzNumberEquals(y, vec.y) && NzNumberEquals(y, vec.y) &&
NzNumberEquals(z, vec.z); NzNumberEquals(z, vec.z);
} }
template<typename T> template<typename T>