diff options
Diffstat (limited to 'source/modules/asura-utils')
| -rw-r--r-- | source/modules/asura-utils/io/renewable.h | 4 | ||||
| -rw-r--r-- | source/modules/asura-utils/math/rect.hpp | 3 | ||||
| -rw-r--r-- | source/modules/asura-utils/math/vector2.hpp | 2 | ||||
| -rw-r--r-- | source/modules/asura-utils/math/vector2.inl | 2 | ||||
| -rw-r--r-- | source/modules/asura-utils/math/vector4.inl | 6 | ||||
| -rw-r--r-- | source/modules/asura-utils/stringmap.hpp | 4 | ||||
| -rw-r--r-- | source/modules/asura-utils/threading/thread_task.cpp | 0 | ||||
| -rw-r--r-- | source/modules/asura-utils/threading/thread_task.h | 44 |
8 files changed, 11 insertions, 54 deletions
diff --git a/source/modules/asura-utils/io/renewable.h b/source/modules/asura-utils/io/renewable.h index 769bdf6..282106d 100644 --- a/source/modules/asura-utils/io/renewable.h +++ b/source/modules/asura-utils/io/renewable.h @@ -17,8 +17,8 @@ namespace AsuraEngine ASURA_ABSTRACT class Renewable { public: - Renewable(); - virtual ~ Renewable(); + Renewable() {}; + virtual ~Renewable() {}; /// /// ̳RenewableҪṩһRefresh 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)) { } diff --git a/source/modules/asura-utils/stringmap.hpp b/source/modules/asura-utils/stringmap.hpp index ddba128..8d8f231 100644 --- a/source/modules/asura-utils/stringmap.hpp +++ b/source/modules/asura-utils/stringmap.hpp @@ -16,11 +16,11 @@ namespace AsuraEngine bool ContainsKey(const key_type& key); - bool ContainsString(const String& str); + bool ContainsString(const std::string& str); std::string GetStringByKey(const key_type& key); - key_type GetKeyByString(const String& str); + key_type GetKeyByString(const std::string& str); }; diff --git a/source/modules/asura-utils/threading/thread_task.cpp b/source/modules/asura-utils/threading/thread_task.cpp deleted file mode 100644 index e69de29..0000000 --- a/source/modules/asura-utils/threading/thread_task.cpp +++ /dev/null diff --git a/source/modules/asura-utils/threading/thread_task.h b/source/modules/asura-utils/threading/thread_task.h deleted file mode 100644 index 6592191..0000000 --- a/source/modules/asura-utils/threading/thread_task.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef __ASURA_THRAD_TASK_H__ -#define __ASURA_THRAD_TASK_H__ - -#include <asura-utils/type.h> -#include <asura-utils/scripting/portable.hpp> - -namespace AsuraEngine -{ - namespace Threading - { - - /// - /// ϣһ̴̳߳TaskдExecute - /// - ASURA_ABSTRACT class ThreadTask - : virtual public AEScripting::NativeAccessor - { - public: - - ThreadTask(); - virtual ~ThreadTask(); - - /// - /// ִɺtrueûص - /// - virtual bool Execute() = 0; - - /// - /// ûص - /// - virtual void Invoke() = 0; - - protected: - - Luax::LuaxMemberRef mCallback; - - }; - - } -} - -namespace AEThreading = AsuraEngine::Threading; - -#endif
\ No newline at end of file |