From 250e30d73f09e9da2b5a81d0fbae63744ae12a73 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 2 Apr 2019 08:47:15 +0800 Subject: *misc --- source/modules/asura-utils/math/rect.hpp | 3 ++- source/modules/asura-utils/math/vector2.hpp | 2 +- source/modules/asura-utils/math/vector2.inl | 2 +- source/modules/asura-utils/math/vector4.inl | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source/modules/asura-utils/math') 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 explicit Vector2(const Vector2& 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::Vector2(const Vector2& vector) : } template -inline Vector2::Set(T X, T Y) +inline void Vector2::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::Vector4() : //////////////////////////////////////////////////////////// template -inline Vector4::Vector4(T X, T Y, T Z) : +inline Vector4::Vector4(T X, T Y, T Z, T W) : x(X), y(Y), z(Z), - w(0) + w(W) { } @@ -30,7 +30,7 @@ template inline Vector4::Vector4(const Vector4& vector) : x(static_cast(vector.x)), y(static_cast(vector.y)), - z(static_cast(vector.z)) + z(static_cast(vector.z)), w(static_cast(vector.w)) { } -- cgit v1.1-26-g67d0