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

Various fixes

Browse Source 
Former-commit-id: 26dfbdb3388c845a6e3039f816f19ffbb462d7b8 [formerly a6437e0b6e48dbd630440f8d2629b32e4756b48e]
Former-commit-id: 8a1855fc1d4d7c343b7e1fdcd3c6a31f3134a59a
This commit is contained in:
Gawaboumga
2016-07-28 19:22:41 +02:00
parent 84c26ee77d
commit 96dc8c001e
26 changed files with 141 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Math/Algorithm.inl
View File

@@ -105,7 +105,7 @@ namespace Nz
*
* \param value Initial value
* \param objective Target value
* \parma increment One step value
* \param increment One step value
*/
template<typename T>
@@ -412,7 +412,7 @@ namespace Nz
* \brief Gets the log in base 2 of integral number, only works for power of two !
* \return Log of the number
*
* \param number To get log in base 2
* \param pot To get log in base 2
*
* \remark Only works for power of two
* \remark If number is 0, 0 is returned
@@ -431,7 +431,7 @@ namespace Nz
* \return base^exponent for integral
*
* \param base Base of the exponentation
* \parma exponent Power for the base
* \param exponent Power for the base
*/
//TODO: Mark as constexpr when supported by all major compilers

1
include/Nazara/Math/BoundingVolume.hpp
View File

@@ -53,6 +53,7 @@ namespace Nz
void Update(const Vector3<T>& translation);
BoundingVolume operator*(T scalar) const;
BoundingVolume& operator=(const BoundingVolume& other) = default;
BoundingVolume& operator*=(T scalar);

1
include/Nazara/Math/Box.hpp
View File

@@ -79,6 +79,7 @@ namespace Nz
Box operator*(T scalar) const;
Box operator*(const Vector3<T>& vec) const;
Box& operator=(const Box& other) = default;
Box& operator*=(T scalar);
Box& operator*=(const Vector3<T>& vec);

2
include/Nazara/Math/Box.inl
View File

@@ -787,7 +787,7 @@ namespace Nz
* \brief Multiplies the lengths with the scalar
* \return A box where the position is the same and width, height and depth are the product of the old width, height and depth and the scalar
*
* \param scale The scalar to multiply width, height and depth with
* \param scalar The scalar to multiply width, height and depth with
*/
template<typename T>

1
include/Nazara/Math/EulerAngles.hpp
View File

@@ -47,6 +47,7 @@ namespace Nz
EulerAngles operator-(const EulerAngles& angles) const;
/*EulerAngles operator*(const EulerAngles& angles) const;
EulerAngles operator/(const EulerAngles& angles) const;*/
EulerAngles& operator=(const EulerAngles& other) = default;
EulerAngles& operator+=(const EulerAngles& angles);
EulerAngles& operator-=(const EulerAngles& angles);

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

@@ -50,6 +50,8 @@ namespace Nz
IntersectionSide Intersect(const Sphere<T>& sphere) const;
IntersectionSide Intersect(const Vector3<T>* points, unsigned int pointCount) const;
Frustum& operator=(const Frustum& other) = default;
Frustum& Set(const Frustum& frustum);
template<typename U> Frustum& Set(const Frustum<U>& frustum);

8
include/Nazara/Math/Matrix4.inl
View File

@@ -750,7 +750,7 @@ namespace Nz
* \brief Inverts this matrix
* \return A reference to this matrix inverted
*
* \param bool Optional argument to know if matrix has been successfully inverted
* \param succeeded Optional argument to know if matrix has been successfully inverted
*
* \see InverseAffine
*/
@@ -769,7 +769,7 @@ namespace Nz
* \brief Inverts this matrix
* \return A reference to this matrix inverted
*
* \param bool Optional argument to know if matrix has been successfully inverted
* \param succeeded Optional argument to know if matrix has been successfully inverted
*
* \see Inverse
*/
@@ -1487,7 +1487,7 @@ namespace Nz
* \brief Compares the matrix to other one
* \return true if the matrices are the same
*
* \param matrix Other matrix to compare with
* \param mat Other matrix to compare with
*/
template<typename T>
@@ -1504,7 +1504,7 @@ namespace Nz
* \brief Compares the matrix to other one
* \return false if the matrices are the same
*
* \param matrix Other matrix to compare with
* \param mat Other matrix to compare with
*/
template<typename T>

1
include/Nazara/Math/OrientedBox.hpp
View File

@@ -52,6 +52,7 @@ namespace Nz
Vector3<T> operator()(unsigned int i) const;
OrientedBox operator*(T scalar) const;
OrientedBox& operator=(const OrientedBox& other) = default;
OrientedBox& operator*=(T scalar);

2
include/Nazara/Math/OrientedBox.inl
View File

@@ -340,7 +340,7 @@ namespace Nz
* \brief Multiplies the lengths with the scalar
* \return A OrientedBox where the position is the same and width, height and depth are the product of the old width, height and depth and the scalar
*
* \param scale The scalar to multiply width, height and depth with
* \param scalar The scalar to multiply width, height and depth with
*/
template<typename T>

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

@@ -45,6 +45,8 @@ namespace Nz
String ToString() const;
Plane& operator=(const Plane& other) = default;
bool operator==(const Plane& plane) const;
bool operator!=(const Plane& plane) const;

1
include/Nazara/Math/Ray.hpp
View File

@@ -61,6 +61,7 @@ namespace Nz
String ToString() const;
Vector3<T> operator*(T lambda) const;
Ray& operator=(const Ray& other) = default;
bool operator==(const Ray& ray) const;
bool operator!=(const Ray& ray) const;

1
include/Nazara/Math/Rect.hpp
View File

@@ -71,6 +71,7 @@ namespace Nz
Rect operator*(const Vector2<T>& vec) const;
Rect operator/(T scalar) const;
Rect operator/(const Vector2<T>& vec) const;
Rect& operator=(const Rect& other) = default;
Rect& operator*=(T scalar);
Rect& operator*=(const Vector2<T>& vec);

10
include/Nazara/Math/Rect.inl
View File

@@ -629,7 +629,7 @@ namespace Nz
* \brief Multiplies the lengths with the scalar
* \return A rectangle where the position is the same and width and height are the product of the old width and height and the scalar
*
* \param scale The scalar to multiply width and height with
* \param scalar The scalar to multiply width and height with
*/
template<typename T>
@@ -655,13 +655,13 @@ namespace Nz
* \brief Divides the lengths with the scalar
* \return A rectangle where the position is the same and width and height are the quotient of the old width and height and the scalar
*
* \param scale The scalar to divide width and height with
* \param scalar The scalar to divide width and height with
*/
template<typename T>
Rect<T> Rect<T>::operator/(T scalar) const
{
return Rect(x, y, width/scalar, height/scalar);
return Rect(x, y, width / scalar, height / scalar);
}
/*!
@@ -745,7 +745,7 @@ namespace Nz
* \brief Compares the rectangle to other one
* \return true if the rectangles are the same
*
* \param rec Other rectangle to compare with
* \param rect Other rectangle to compare with
*/
template<typename T>
@@ -759,7 +759,7 @@ namespace Nz
* \brief Compares the rectangle to other one
* \return false if the rectangles are the same
*
* \param rec Other rectangle to compare with
* \param rect Other rectangle to compare with
*/
template<typename T>

1
include/Nazara/Math/Sphere.hpp
View File

@@ -67,6 +67,7 @@ namespace Nz
T operator[](unsigned int i) const;
Sphere operator*(T scalar) const;
Sphere& operator=(const Sphere& other) = default;
Sphere& operator*=(T scalar);

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

@@ -76,6 +76,7 @@ namespace Nz
Vector2 operator*(T scale) const;
Vector2 operator/(const Vector2& vec) const;
Vector2 operator/(T scale) const;
Vector2& operator=(const Vector2& other) = default;
Vector2& operator+=(const Vector2& vec);
Vector2& operator-=(const Vector2& vec);

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

@@ -87,6 +87,7 @@ namespace Nz
Vector3 operator*(T scale) const;
Vector3 operator/(const Vector3& vec) const;
Vector3 operator/(T scale) const;
Vector3& operator=(const Vector3& vec) = default;
Vector3& operator+=(const Vector3& vec);
Vector3& operator-=(const Vector3& vec);

1
include/Nazara/Math/Vector4.hpp
View File

@@ -74,6 +74,7 @@ namespace Nz
Vector4 operator*(T scale) const;
Vector4 operator/(const Vector4& vec) const;
Vector4 operator/(T scale) const;
Vector4& operator=(const Vector4& other) = default;
Vector4& operator+=(const Vector4& vec);
Vector4& operator-=(const Vector4& vec);