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

Math/Vector[2|3]: Removed Distancef and made Distance templated

Browse Source
This commit is contained in:
Jérôme Leclercq
2018-07-02 18:13:14 +02:00
parent 7da0fffe07
commit e4b67019cb
6 changed files with 39 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,21 +162,10 @@ namespace Nz
* \see SquaredDistance
*/
template<typename T>
T Vector3<T>::Distance(const Vector3& vec) const
template<typename U>
U Vector3<T>::Distance(const Vector3& vec) const
{
return std::sqrt(SquaredDistance(vec));
}
/*!
* \brief Calculates the distance between two vectors
* \return The metric distance in float between two vectors with euclidean norm
*
* \param vec The other vector to measure the distance with
*/
template<typename T>
float Vector3<T>::Distancef(const Vector3& vec) const
{
return std::sqrt(static_cast<float>(SquaredDistance(vec)));
return static_cast<U>(std::sqrt(SquaredDistance(vec)));
}
/*!
@@ -1014,26 +1003,10 @@ namespace Nz
* \see SquaredDistance
*/
template<typename T>
T Vector3<T>::Distance(const Vector3& vec1, const Vector3& vec2)
template<typename U>
U Vector3<T>::Distance(const Vector3& vec1, const Vector3& vec2)
{
return vec1.Distance(vec2);
}
/*!
* \brief Measure the distance between two points as a float
* Shorthand for vec1.Distancef(vec2)
*
* param vec1 the first point
* param vec2 the second point
*
* \return The distance between the two vectors as a float
*
* \see SquaredDistancef
*/
template<typename T>
float Vector3<T>::Distancef(const Vector3& vec1, const Vector3& vec2)
{
return vec1.Distancef(vec2);
return vec1.Distance<U>(vec2);
}
/*!