From a077eb38b01292611f4f6031b75e3e2c1c20f06e Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 16 Aug 2019 08:54:08 +0800 Subject: *misc --- Source/modules/asura-base/Math/Matrix44.h | 8 ++------ Source/modules/asura-base/Math/Quaternion.h | 4 ++-- Source/modules/asura-base/Math/Random.h | 4 ++-- Source/modules/asura-base/Math/Rect.hpp | 8 +++----- Source/modules/asura-base/Math/Transform.h | 6 +++--- Source/modules/asura-base/Math/Vector2.hpp | 6 ++---- Source/modules/asura-base/Math/Vector3.hpp | 8 +++----- Source/modules/asura-base/Math/Vector4.h | 8 +++++--- 8 files changed, 22 insertions(+), 30 deletions(-) (limited to 'Source/modules/asura-base/Math') 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) /// 不需要转置的OpenGL矩阵,类似glm::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 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 struct Rect @@ -42,9 +42,7 @@ typedef Rect Rectu; typedef Rect Rectf; typedef Rect 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 namespace_begin(AsuraEngine) -namespace_begin(Math) +//namespace_begin(Math) template class Vector2 @@ -64,9 +64,7 @@ typedef Vector2 Vector2i; typedef Vector2 Vector2u; typedef Vector2 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 class Vector3 { @@ -227,9 +227,7 @@ namespace AsuraEngine typedef Vector3 Vector3i; typedef Vector3 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 class Vector4 { @@ -228,7 +228,9 @@ namespace AsuraEngine typedef Vector4 Vector4i; typedef Vector4 Vector4f; - } +// } } + + #endif \ No newline at end of file -- cgit v1.1-26-g67d0