summaryrefslogtreecommitdiff
path: root/source/modules/asura-utils/math
diff options
context:
space:
mode:
Diffstat (limited to 'source/modules/asura-utils/math')
-rw-r--r--source/modules/asura-utils/math/rect.hpp3
-rw-r--r--source/modules/asura-utils/math/vector2.hpp2
-rw-r--r--source/modules/asura-utils/math/vector2.inl2
-rw-r--r--source/modules/asura-utils/math/vector4.inl6
4 files changed, 7 insertions, 6 deletions
diff --git a/source/modules/asura-utils/math/rect.hpp b/source/modules/asura-utils/math/rect.hpp
index 1751634..282b606 100644
--- a/source/modules/asura-utils/math/rect.hpp
+++ b/source/modules/asura-utils/math/rect.hpp
@@ -11,7 +11,8 @@ namespace AsuraEngine
{
public:
Rect();
- ~Rect(T x, T y, T w, T h);
+ Rect(T x, T y, T w, T h);
+ ~Rect();
///
/// x,yǷrectڡ
diff --git a/source/modules/asura-utils/math/vector2.hpp b/source/modules/asura-utils/math/vector2.hpp
index df78255..4baf132 100644
--- a/source/modules/asura-utils/math/vector2.hpp
+++ b/source/modules/asura-utils/math/vector2.hpp
@@ -15,7 +15,7 @@ namespace AsuraEngine
template <typename U>
explicit Vector2(const Vector2<U>& vector);
- Set(T X, T Y);
+ void Set(T X, T Y);
T x; ///< X coordinate of the vector
T y; ///< Y coordinate of the vector
diff --git a/source/modules/asura-utils/math/vector2.inl b/source/modules/asura-utils/math/vector2.inl
index 9e131a7..155432a 100644
--- a/source/modules/asura-utils/math/vector2.inl
+++ b/source/modules/asura-utils/math/vector2.inl
@@ -23,7 +23,7 @@ inline Vector2<T>::Vector2(const Vector2<U>& vector) :
}
template <typename T>
-inline Vector2<T>::Set(T X, T Y)
+inline void Vector2<T>::Set(T X, T Y)
{
x = X;
y = Y;
diff --git a/source/modules/asura-utils/math/vector4.inl b/source/modules/asura-utils/math/vector4.inl
index 025bfcc..4b043a1 100644
--- a/source/modules/asura-utils/math/vector4.inl
+++ b/source/modules/asura-utils/math/vector4.inl
@@ -14,11 +14,11 @@ inline Vector4<T>::Vector4() :
////////////////////////////////////////////////////////////
template <typename T>
-inline Vector4<T>::Vector4(T X, T Y, T Z) :
+inline Vector4<T>::Vector4(T X, T Y, T Z, T W) :
x(X),
y(Y),
z(Z),
- w(0)
+ w(W)
{
}
@@ -30,7 +30,7 @@ template <typename U>
inline Vector4<T>::Vector4(const Vector4<U>& vector) :
x(static_cast<T>(vector.x)),
y(static_cast<T>(vector.y)),
- z(static_cast<T>(vector.z))
+ z(static_cast<T>(vector.z)),
w(static_cast<T>(vector.w))
{
}