diff options
Diffstat (limited to 'Source/modules/asura-base/Math')
-rw-r--r-- | Source/modules/asura-base/Math/Matrix44.h | 8 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Quaternion.h | 4 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Random.h | 4 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Rect.hpp | 8 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Transform.h | 6 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Vector2.hpp | 6 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Vector3.hpp | 8 | ||||
-rw-r--r-- | Source/modules/asura-base/Math/Vector4.h | 8 |
8 files changed, 22 insertions, 30 deletions
diff --git a/Source/modules/asura-base/Math/Matrix44.h b/Source/modules/asura-base/Math/Matrix44.h index e987dd4..6babde1 100644 --- a/Source/modules/asura-base/Math/Matrix44.h +++ b/Source/modules/asura-base/Math/Matrix44.h @@ -6,7 +6,7 @@ #include "../Scripting/Scripting.h" namespace_begin(AsuraEngine) -namespace_begin(Math) +//namespace_begin(Math) /// ҪתõOpenGLglm::mat4 /// https://blog.csdn.net/candycat1992/article/details/8830894 @@ -71,9 +71,7 @@ public: ///// //void transform(Graphics::Vertex* dst, const Graphics::Vertex * src, int size) const; - /// /// ʽ - /// float Calculate(); private: @@ -88,9 +86,7 @@ private: }; +//namespace_end namespace_end -namespace_end - -namespace AEMath = AsuraEngine::Math; #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Quaternion.h b/Source/modules/asura-base/Math/Quaternion.h index c1e19be..53b63c9 100644 --- a/Source/modules/asura-base/Math/Quaternion.h +++ b/Source/modules/asura-base/Math/Quaternion.h @@ -4,7 +4,7 @@ #include <asura-base/Classes.h> namespace_begin(AsruaEngine) -namespace_begin(Math) +//namespace_begin(Math) class Quaternion { @@ -12,7 +12,7 @@ class Quaternion }; -namespace_end +//namespace_end namespace_end #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Random.h b/Source/modules/asura-base/Math/Random.h index 7d3b976..914a607 100644 --- a/Source/modules/asura-base/Math/Random.h +++ b/Source/modules/asura-base/Math/Random.h @@ -5,7 +5,7 @@ #include "../Classes.h" namespace_begin(AsuraEngine) -namespace_begin(Math) +//namespace_begin(Math) /* Some random generator timings: @@ -82,7 +82,7 @@ private: uint32 x, y, z, w; }; -namespace_end +//namespace_end namespace_end #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Rect.hpp b/Source/modules/asura-base/Math/Rect.hpp index af4fa78..3b9039b 100644 --- a/Source/modules/asura-base/Math/Rect.hpp +++ b/Source/modules/asura-base/Math/Rect.hpp @@ -3,8 +3,8 @@ namespace AsuraEngine { -namespace Math -{ +//namespace Math +//{ template<typename T> struct Rect @@ -42,9 +42,7 @@ typedef Rect<unsigned int> Rectu; typedef Rect<float> Rectf; typedef Rect<long> Reftl; +//} } -} - -namespace AEMath = AsuraEngine::Math; #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Transform.h b/Source/modules/asura-base/Math/Transform.h index 5dcfdcf..02f3c1c 100644 --- a/Source/modules/asura-base/Math/Transform.h +++ b/Source/modules/asura-base/Math/Transform.h @@ -5,8 +5,8 @@ namespace AsuraEngine { - namespace Math - { + //namespace Math + //{ class Transform { @@ -24,7 +24,7 @@ namespace AsuraEngine }; - } +// } } #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Vector2.hpp b/Source/modules/asura-base/Math/Vector2.hpp index e141017..09fd299 100644 --- a/Source/modules/asura-base/Math/Vector2.hpp +++ b/Source/modules/asura-base/Math/Vector2.hpp @@ -4,7 +4,7 @@ #include <asura-base/Classes.h> namespace_begin(AsuraEngine) -namespace_begin(Math) +//namespace_begin(Math) template <typename T> class Vector2 @@ -64,9 +64,7 @@ typedef Vector2<int> Vector2i; typedef Vector2<unsigned int> Vector2u; typedef Vector2<float> Vector2f; +//namespace_end namespace_end -namespace_end - -namespace AEMath = AsuraEngine::Math; #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Vector3.hpp b/Source/modules/asura-base/Math/Vector3.hpp index c526ace..b50c363 100644 --- a/Source/modules/asura-base/Math/Vector3.hpp +++ b/Source/modules/asura-base/Math/Vector3.hpp @@ -3,8 +3,8 @@ namespace AsuraEngine { - namespace Math - { + //namespace Math + //{ template <typename T> class Vector3 { @@ -227,9 +227,7 @@ namespace AsuraEngine typedef Vector3<int> Vector3i; typedef Vector3<float> Vector3f; - } +// } } -namespace AEMath = AsuraEngine::Math; - #endif
\ No newline at end of file diff --git a/Source/modules/asura-base/Math/Vector4.h b/Source/modules/asura-base/Math/Vector4.h index a5bf549..c39d9a6 100644 --- a/Source/modules/asura-base/Math/Vector4.h +++ b/Source/modules/asura-base/Math/Vector4.h @@ -3,8 +3,8 @@ namespace AsuraEngine { - namespace Math - { + //namespace Math + //{ template <typename T> class Vector4 { @@ -228,7 +228,9 @@ namespace AsuraEngine typedef Vector4<int> Vector4i; typedef Vector4<float> Vector4f; - } +// } } + + #endif
\ No newline at end of file |