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

Math/Vector[I]: Set method: Replace array by pointer

This commit is contained in:
Lynix 2020-05-26 15:58:15 +02:00
parent 460222e71e
commit 3b440254da
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ namespace Nz
Vector2& Set(T X, T Y); Vector2& Set(T X, T Y);
Vector2& Set(T scale); Vector2& Set(T scale);
Vector2& Set(const T vec[2]); Vector2& Set(const T* vec);
Vector2& Set(const Vector3<T>& vec); Vector2& Set(const Vector3<T>& vec);
Vector2& Set(const Vector4<T>& vec); Vector2& Set(const Vector4<T>& vec);
template<typename U> Vector2& Set(const Vector2<U>& vec); template<typename U> Vector2& Set(const Vector2<U>& vec);

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

@ -363,9 +363,8 @@ namespace Nz
* *
* \param vec[2] vec[0] is X component and vec[1] is Y component * \param vec[2] vec[0] is X component and vec[1] is Y component
*/ */
template<typename T> template<typename T>
Vector2<T>& Vector2<T>::Set(const T vec[2]) Vector2<T>& Vector2<T>::Set(const T* vec)
{ {
x = vec[0]; x = vec[0];
y = vec[1]; y = vec[1];

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

@ -65,7 +65,7 @@ namespace Nz
Vector3& Set(T X, T Y, T Z); Vector3& Set(T X, T Y, T Z);
Vector3& Set(T X, const Vector2<T>& vec); Vector3& Set(T X, const Vector2<T>& vec);
Vector3& Set(T scale); Vector3& Set(T scale);
Vector3& Set(const T vec[3]); Vector3& Set(const T* vec);
Vector3& Set(const Vector2<T>& vec, T Z = 0.0); Vector3& Set(const Vector2<T>& vec, T Z = 0.0);
template<typename U> Vector3& Set(const Vector3<U>& vec); template<typename U> Vector3& Set(const Vector3<U>& vec);
Vector3& Set(const Vector4<T>& vec); Vector3& Set(const Vector4<T>& vec);

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

@ -498,7 +498,7 @@ namespace Nz
* \param vec[3] vec[0] is X component, vec[1] is Y component and vec[2] is Z component * \param vec[3] vec[0] is X component, vec[1] is Y component and vec[2] is Z component
*/ */
template<typename T> template<typename T>
Vector3<T>& Vector3<T>::Set(const T vec[3]) Vector3<T>& Vector3<T>::Set(const T* vec)
{ {
x = vec[0]; x = vec[0];
y = vec[1]; y = vec[1];

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

@ -54,7 +54,7 @@ namespace Nz
Vector4& Set(T X, const Vector2<T>& vec, T W); Vector4& Set(T X, const Vector2<T>& vec, T W);
Vector4& Set(T X, const Vector3<T>& vec); Vector4& Set(T X, const Vector3<T>& vec);
Vector4& Set(T scale); Vector4& Set(T scale);
Vector4& Set(const T vec[4]); Vector4& Set(const T* vec);
Vector4& Set(const Vector2<T>& vec, T Z = 0.0, T W = 1.0); Vector4& Set(const Vector2<T>& vec, T Z = 0.0, T W = 1.0);
Vector4& Set(const Vector3<T>& vec, T W = 1.0); Vector4& Set(const Vector3<T>& vec, T W = 1.0);
template<typename U> Vector4& Set(const Vector4<U>& vec); template<typename U> Vector4& Set(const Vector4<U>& vec);

3
include/Nazara/Math/Vector4.inl
View File

@ -413,9 +413,8 @@ namespace Nz
* *
* \param vec[4] vec[0] is X component, vec[1] is Y component, vec[2] is Z component and vec[3] is W component * \param vec[4] vec[0] is X component, vec[1] is Y component, vec[2] is Z component and vec[3] is W component
*/ */
template<typename T> template<typename T>
Vector4<T>& Vector4<T>::Set(const T vec[4]) Vector4<T>& Vector4<T>::Set(const T* vec)
{ {
x = vec[0]; x = vec[0];
y = vec[1]; y = vec[1];