From 40fc27154fe754181934dc7ee31375e6bdfb33fc Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 23 Oct 2018 12:23:58 +0800
Subject: *merge from minimal

---
 src/libjin/Math/Math.h         |  77 ----------------
 src/libjin/Math/Matrix.cpp     | 177 -------------------------------------
 src/libjin/Math/Matrix.h       | 153 --------------------------------
 src/libjin/Math/Quad.h         |  17 ----
 src/libjin/Math/README.md      |   1 +
 src/libjin/Math/Vector.cpp     |   2 -
 src/libjin/Math/Vector.h       |  14 ---
 src/libjin/Math/constant.h     |  10 ---
 src/libjin/Math/je_constant.h  |  10 +++
 src/libjin/Math/je_math.h      |  77 ++++++++++++++++
 src/libjin/Math/je_matrix.cpp  | 194 +++++++++++++++++++++++++++++++++++++++++
 src/libjin/Math/je_matrix.h    | 159 +++++++++++++++++++++++++++++++++
 src/libjin/Math/je_quad.h      |  23 +++++
 src/libjin/Math/je_random.h    |  14 +++
 src/libjin/Math/je_vector2.hpp |  40 +++++++++
 src/libjin/Math/je_vector3.hpp |  41 +++++++++
 src/libjin/Math/je_vector4.hpp |  45 ++++++++++
 17 files changed, 604 insertions(+), 450 deletions(-)
 delete mode 100644 src/libjin/Math/Math.h
 delete mode 100644 src/libjin/Math/Matrix.cpp
 delete mode 100644 src/libjin/Math/Matrix.h
 delete mode 100644 src/libjin/Math/Quad.h
 create mode 100644 src/libjin/Math/README.md
 delete mode 100644 src/libjin/Math/Vector.cpp
 delete mode 100644 src/libjin/Math/Vector.h
 delete mode 100644 src/libjin/Math/constant.h
 create mode 100644 src/libjin/Math/je_constant.h
 create mode 100644 src/libjin/Math/je_math.h
 create mode 100644 src/libjin/Math/je_matrix.cpp
 create mode 100644 src/libjin/Math/je_matrix.h
 create mode 100644 src/libjin/Math/je_quad.h
 create mode 100644 src/libjin/Math/je_random.h
 create mode 100644 src/libjin/Math/je_vector2.hpp
 create mode 100644 src/libjin/Math/je_vector3.hpp
 create mode 100644 src/libjin/Math/je_vector4.hpp

(limited to 'src/libjin/Math')

diff --git a/src/libjin/Math/Math.h b/src/libjin/Math/Math.h
deleted file mode 100644
index 2bc8ed9..0000000
--- a/src/libjin/Math/Math.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __JIN_UTILS_MATH_H
-#define __JIN_UTILS_MATH_H
-
-#include "constant.h"
-#include "matrix.h"
-#include "quad.h"
-
-namespace jin
-{
-namespace math
-{
-
-#ifdef min
-#   undef min 
-#endif // min
-#ifdef max
-#   undef max
-#endif // max
-
-    template<typename T>
-    inline T min(T a, T b)
-    {
-        return a < b ? a : b;
-    }
-
-    template<typename T>
-    inline T max(T a, T b)
-    {
-        return a > b ? a : b;
-    }
-
-    template<typename T>
-    inline T clamp(T a, T mi, T ma)
-    {
-        return min<T>(max<T>(a, mi), ma);
-    }
-
-    template<typename T>
-    inline bool within(T a, T mi, T ma)
-    {
-        return a >= mi && a <= ma;
-    }
-
-    template<typename T>
-    inline bool without(T a, T mi, T ma)
-    {
-        return a < mi || a > ma;
-    }
-
-    template<typename T>
-    inline T abs(T a)
-    {
-        return a > 0 ? a : -a;
-    }
-
-    template<typename T>
-    inline T lowerBound(T a, T lower)
-    {
-        return a < lower ? lower : a;
-    }
-
-    template<typename T>
-    inline T upperBound(T a, T upper)
-    {
-        return a > upper ? upper : a;
-    }
-    
-    template<typename T>
-    inline T lerp(T a, T b, float t)
-    {
-        return a + t * (b - a);
-    }
-
-}
-}
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/Math/Matrix.cpp b/src/libjin/Math/Matrix.cpp
deleted file mode 100644
index 97e9178..0000000
--- a/src/libjin/Math/Matrix.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-#include "Matrix.h"
-
-#include <cstring> // memcpy
-#include <cmath>
-
-namespace jin
-{
-namespace math
-{
-
-    // | e0 e4 e8  e12 |
-    // | e1 e5 e9  e13 |
-    // | e2 e6 e10 e14 |
-    // | e3 e7 e11 e15 |
-
-    Matrix::Matrix()
-    {
-        setIdentity();
-    }
-
-    Matrix::~Matrix()
-    {
-    }
-
-    //                 | e0 e4 e8  e12 |
-    //                 | e1 e5 e9  e13 |
-    //                 | e2 e6 e10 e14 |
-    //                 | e3 e7 e11 e15 |
-    // | e0 e4 e8  e12 |
-    // | e1 e5 e9  e13 |
-    // | e2 e6 e10 e14 |
-    // | e3 e7 e11 e15 |
-
-    Matrix Matrix::operator * (const Matrix & m) const
-    {
-        Matrix t;
-
-        t.e[0] = (e[0] * m.e[0]) + (e[4] * m.e[1]) + (e[8] * m.e[2]) + (e[12] * m.e[3]);
-        t.e[4] = (e[0] * m.e[4]) + (e[4] * m.e[5]) + (e[8] * m.e[6]) + (e[12] * m.e[7]);
-        t.e[8] = (e[0] * m.e[8]) + (e[4] * m.e[9]) + (e[8] * m.e[10]) + (e[12] * m.e[11]);
-        t.e[12] = (e[0] * m.e[12]) + (e[4] * m.e[13]) + (e[8] * m.e[14]) + (e[12] * m.e[15]);
-
-        t.e[1] = (e[1] * m.e[0]) + (e[5] * m.e[1]) + (e[9] * m.e[2]) + (e[13] * m.e[3]);
-        t.e[5] = (e[1] * m.e[4]) + (e[5] * m.e[5]) + (e[9] * m.e[6]) + (e[13] * m.e[7]);
-        t.e[9] = (e[1] * m.e[8]) + (e[5] * m.e[9]) + (e[9] * m.e[10]) + (e[13] * m.e[11]);
-        t.e[13] = (e[1] * m.e[12]) + (e[5] * m.e[13]) + (e[9] * m.e[14]) + (e[13] * m.e[15]);
-
-        t.e[2] = (e[2] * m.e[0]) + (e[6] * m.e[1]) + (e[10] * m.e[2]) + (e[14] * m.e[3]);
-        t.e[6] = (e[2] * m.e[4]) + (e[6] * m.e[5]) + (e[10] * m.e[6]) + (e[14] * m.e[7]);
-        t.e[10] = (e[2] * m.e[8]) + (e[6] * m.e[9]) + (e[10] * m.e[10]) + (e[14] * m.e[11]);
-        t.e[14] = (e[2] * m.e[12]) + (e[6] * m.e[13]) + (e[10] * m.e[14]) + (e[14] * m.e[15]);
-
-        t.e[3] = (e[3] * m.e[0]) + (e[7] * m.e[1]) + (e[11] * m.e[2]) + (e[15] * m.e[3]);
-        t.e[7] = (e[3] * m.e[4]) + (e[7] * m.e[5]) + (e[11] * m.e[6]) + (e[15] * m.e[7]);
-        t.e[11] = (e[3] * m.e[8]) + (e[7] * m.e[9]) + (e[11] * m.e[10]) + (e[15] * m.e[11]);
-        t.e[15] = (e[3] * m.e[12]) + (e[7] * m.e[13]) + (e[11] * m.e[14]) + (e[15] * m.e[15]);
-
-        return t;
-    }
-
-    void Matrix::operator *= (const Matrix & m)
-    {
-        Matrix t = (*this) * m;
-        memcpy((void*)this->e, (void*)t.e, sizeof(float) * 16);
-    }
-
-    const float * Matrix::getElements() const
-    {
-        return e;
-    }
-
-    void Matrix::setIdentity()
-    {
-        memset(e, 0, sizeof(float) * 16);
-        e[0] = e[5] = e[10] = e[15] = 1;
-    }
-
-    void Matrix::setTranslation(float x, float y)
-    {
-        setIdentity();
-        e[12] = x;
-        e[13] = y;
-    }
-
-    void Matrix::setRotation(float rad)
-    {
-        setIdentity();
-        float c = cos(rad), s = sin(rad);
-        e[0] = c; e[4] = -s;
-        e[1] = s; e[5] = c;
-    }
-
-    void Matrix::setScale(float sx, float sy)
-    {
-        setIdentity();
-        e[0] = sx;
-        e[5] = sy;
-    }
-
-    void Matrix::setShear(float kx, float ky)
-    {
-        setIdentity();
-        e[1] = ky;
-        e[4] = kx;
-    }
-
-    void Matrix::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy)
-    {
-        memset(e, 0, sizeof(float) * 16); // zero out matrix
-        float c = cos(angle), s = sin(angle);
-        // matrix multiplication carried out on paper:
-        // |1     x| |c -s    | |sx       | |1     -ox|
-        // |  1   y| |s  c    | |   sy    | |  1   -oy|
-        // |    1  | |     1  | |      1  | |    1    |
-        // |      1| |       1| |        1| |       1 |
-        //   move      rotate      scale      origin
-        e[10] = e[15] = 1.0f;
-        e[0] = c * sx ; // = a
-        e[1] = s * sx ; // = b
-        e[4] = - s * sy; // = c
-        e[5] = c * sy; // = d
-        e[12] = x - ox * e[0] - oy * e[4];
-        e[13] = y - ox * e[1] - oy * e[5];
-    }
-
-    void Matrix::translate(float x, float y)
-    {
-        Matrix t;
-        t.setTranslation(x, y);
-        this->operator *=(t);
-    }
-
-    void Matrix::rotate(float rad)
-    {
-        Matrix t;
-        t.setRotation(rad);
-        this->operator *=(t);
-    }
-
-    void Matrix::scale(float sx, float sy)
-    {
-        Matrix t;
-        t.setScale(sx, sy);
-        this->operator *=(t);
-    }
-
-    void Matrix::shear(float kx, float ky)
-    {
-        Matrix t;
-        t.setShear(kx, ky);
-        this->operator *=(t);
-    }
-
-    //                 | x |
-    //                 | y |
-    //                 | 0 |
-    //                 | 1 |
-    // | e0 e4 e8  e12 |
-    // | e1 e5 e9  e13 |
-    // | e2 e6 e10 e14 |
-    // | e3 e7 e11 e15 |
-
-    void Matrix::transform(vertex * dst, const vertex * src, int size) const
-    {
-        for (int i = 0; i<size; ++i)
-        {
-            // Store in temp variables in case src = dst
-            float x = (e[0] * src[i].x) + (e[4] * src[i].y) + (0) + (e[12]);
-            float y = (e[1] * src[i].x) + (e[5] * src[i].y) + (0) + (e[13]);
-
-            dst[i].x = x;
-            dst[i].y = y;
-        }
-    }
-
-}
-} 
\ No newline at end of file
diff --git a/src/libjin/Math/Matrix.h b/src/libjin/Math/Matrix.h
deleted file mode 100644
index ff4a51a..0000000
--- a/src/libjin/Math/Matrix.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef __JIN_MATRIX_H
-#define __JIN_MATRIX_H
-
-namespace jin
-{
-namespace math
-{
-
-    struct vertex
-    {
-        unsigned char r, g, b, a;
-        float x, y;
-        float s, t;
-    };
-    /**
-    * This class is the basis for all transformations in LOVE. Althought not
-    * really needed for 2D, it contains 4x4 elements to be compatible with
-    * OpenGL without conversions.
-    **/
-    class Matrix
-    {
-    private:
-
-        /**
-        * | e0 e4 e8  e12 |
-        * | e1 e5 e9  e13 |
-        * | e2 e6 e10 e14 |
-        * | e3 e7 e11 e15 |
-        **/
-        float e[16];
-
-    public:
-
-        /**
-        * Creates a new identity matrix.
-        **/
-        Matrix();
-
-        /**
-        * Destructor.
-        **/
-        ~Matrix();
-
-        /**
-        * Multiplies this Matrix with another Matrix, changing neither.
-        * @param m The Matrix to multiply with this Matrix.
-        * @return The combined matrix.
-        **/
-        Matrix operator * (const Matrix & m) const;
-
-        /**
-        * Multiplies a Matrix into this Matrix.
-        * @param m The Matrix to combine into this Matrix.
-        **/
-        void operator *= (const Matrix & m);
-
-        /**
-        * Gets a pointer to the 16 array elements.
-        * @return The array elements.
-        **/
-        const float * getElements() const;
-
-        /**
-        * Resets this Matrix to the identity matrix.
-        **/
-        void setIdentity();
-
-        /**
-        * Resets this Matrix to a translation.
-        * @param x Translation along x-axis.
-        * @param y Translation along y-axis.
-        **/
-        void setTranslation(float x, float y);
-
-        /**
-        * Resets this Matrix to a rotation.
-        * @param r The angle in radians.
-        **/
-        void setRotation(float r);
-
-        /**
-        * Resets this Matrix to a scale transformation.
-        * @param sx Scale factor along the x-axis.
-        * @param sy Scale factor along the y-axis.
-        **/
-        void setScale(float sx, float sy);
-
-        /**
-        * Resets this Matrix to a shear transformation.
-        * @param kx Shear along x-axis.
-        * @param ky Shear along y-axis.
-        **/
-        void setShear(float kx, float ky);
-
-        /**
-        * Creates a transformation with a certain position, orientation, scale
-        * and offset. Perfect for Drawables -- what a coincidence!
-        *
-        * @param x The translation along the x-axis.
-        * @param y The translation along the y-axis.
-        * @param angle The rotation (rad) around the center with offset (ox,oy).
-        * @param sx Scale along x-axis.
-        * @param sy Scale along y-axis.
-        * @param ox The offset for rotation along the x-axis.
-        * @param oy The offset for rotation along the y-axis.
-        * @param kx Shear along x-axis
-        * @param ky Shear along y-axis
-        **/
-        void setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy);
-
-        /**
-        * Multiplies this Matrix with a translation.
-        * @param x Translation along x-axis.
-        * @param y Translation along y-axis.
-        **/
-        void translate(float x, float y);
-
-        /**
-        * Multiplies this Matrix with a rotation.
-        * @param r Angle in radians.
-        **/
-        void rotate(float r);
-
-        /**
-        * Multiplies this Matrix with a scale transformation.
-        * @param sx Scale factor along the x-axis.
-        * @param sy Scale factor along the y-axis.
-        **/
-        void scale(float sx, float sy);
-
-        /**
-        * Multiplies this Matrix with a shear transformation.
-        * @param kx Shear along the x-axis.
-        * @param ky Shear along the y-axis.
-        **/
-        void shear(float kx, float ky);
-
-        /**
-        * Transforms an array of vertices by this Matrix. The sources and
-        * destination arrays may be the same.
-        *
-        * @param dst Storage for the transformed vertices.
-        * @param src The source vertices.
-        * @param size The number of vertices.
-        **/
-        void transform(vertex * dst, const vertex * src, int size) const;
-
-    }; 
-
-}
-} 
-
-#endif
diff --git a/src/libjin/Math/Quad.h b/src/libjin/Math/Quad.h
deleted file mode 100644
index a50cc9e..0000000
--- a/src/libjin/Math/Quad.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __JIN_QUAD_H
-#define __JIN_QUAD_H
-
-namespace jin
-{
-namespace math 
-{
-
-    struct Quad
-    {
-        float x, y, w, h;
-    };
-
-}
-}
-
-#endif
diff --git a/src/libjin/Math/README.md b/src/libjin/Math/README.md
new file mode 100644
index 0000000..a096332
--- /dev/null
+++ b/src/libjin/Math/README.md
@@ -0,0 +1 @@
+此文件夹下命名空间为JinEngine，用于存放模块间共用的内容
\ No newline at end of file
diff --git a/src/libjin/Math/Vector.cpp b/src/libjin/Math/Vector.cpp
deleted file mode 100644
index f26d0c4..0000000
--- a/src/libjin/Math/Vector.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "vector.h"
-
diff --git a/src/libjin/Math/Vector.h b/src/libjin/Math/Vector.h
deleted file mode 100644
index 43e249e..0000000
--- a/src/libjin/Math/Vector.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __JIN_VECTOR_H
-#define __JIN_VECTOR_H
-
-namespace jin
-{
-namespace math
-{
-    
-    
-
-}
-}
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/Math/constant.h b/src/libjin/Math/constant.h
deleted file mode 100644
index f2f740f..0000000
--- a/src/libjin/Math/constant.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __JIN_MATH_CONSTANT_H
-#define __JIN_MATH_CONSTANT_H
-
-#define PI 3.1415926f
-
-// int16 范围
-#define INT16_RANGE_LEFT -32768 
-#define INT16_RANGE_RIGHT 32767
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/Math/je_constant.h b/src/libjin/Math/je_constant.h
new file mode 100644
index 0000000..5ab126c
--- /dev/null
+++ b/src/libjin/Math/je_constant.h
@@ -0,0 +1,10 @@
+#ifndef __JE_MATH_CONSTANT_H
+#define __JE_MATH_CONSTANT_H
+
+#define PI 3.1415926f
+
+// int16 范围
+#define INT16_RANGE_LEFT -32768 
+#define INT16_RANGE_RIGHT 32767
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/Math/je_math.h b/src/libjin/Math/je_math.h
new file mode 100644
index 0000000..1f8e0b3
--- /dev/null
+++ b/src/libjin/Math/je_math.h
@@ -0,0 +1,77 @@
+#ifndef __JE_UTILS_MATH_H
+#define __JE_UTILS_MATH_H
+
+#include "je_constant.h"
+#include "je_matrix.h"
+#include "je_quad.h"
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+	#ifdef min
+	    #undef min 
+	#endif // min
+	#ifdef max
+	    #undef max
+	#endif // max
+
+		template<typename T>
+		inline T min(T a, T b)
+		{
+			return a < b ? a : b;
+		}
+
+		template<typename T>
+		inline T max(T a, T b)
+		{
+			return a > b ? a : b;
+		}
+
+		template<typename T>
+		inline T clamp(T a, T mi, T ma)
+		{
+			return min<T>(max<T>(a, mi), ma);
+		}
+
+		template<typename T>
+		inline bool within(T a, T mi, T ma)
+		{
+			return a >= mi && a <= ma;
+		}
+
+		template<typename T>
+		inline bool without(T a, T mi, T ma)
+		{
+			return a < mi || a > ma;
+		}
+
+		template<typename T>
+		inline T abs(T a)
+		{
+			return a > 0 ? a : -a;
+		}
+
+		template<typename T>
+		inline T lowerBound(T a, T lower)
+		{
+			return a < lower ? lower : a;
+		}
+
+		template<typename T>
+		inline T upperBound(T a, T upper)
+		{
+			return a > upper ? upper : a;
+		}
+    
+		template<typename T>
+		inline T lerp(T a, T b, float t)
+		{
+			return a + t * (b - a);
+		}
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif // __JE_UTILS_MATH_H
\ No newline at end of file
diff --git a/src/libjin/Math/je_matrix.cpp b/src/libjin/Math/je_matrix.cpp
new file mode 100644
index 0000000..bc1fcea
--- /dev/null
+++ b/src/libjin/Math/je_matrix.cpp
@@ -0,0 +1,194 @@
+#include "je_matrix.h"
+
+#include <cstring> // memcpy
+#include <cmath>
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+		const Matrix Matrix::Identity;
+
+		// | e0 e4 e8  e12 |
+		// | e1 e5 e9  e13 |
+		// | e2 e6 e10 e14 |
+		// | e3 e7 e11 e15 |
+
+		Matrix::Matrix()
+		{
+			setIdentity();
+		}
+
+		Matrix::~Matrix()
+		{
+		}
+
+		void Matrix::setOrtho(float l, float r, float b, float t, float n, float f)
+		{
+			setIdentity();
+			float w = r - l;
+			float h = t - b;
+			float z = f - n;
+			e[0] = 2 / w;
+			e[5] = 2 / h;
+			e[10] = -2 / z;
+			e[12] = -(r + l) / w;
+			e[13] = -(t + b) / h;
+			e[14] = -(f + n) / z;
+			e[15] = 1;
+		}
+
+		//                 | e0 e4 e8  e12 |
+		//                 | e1 e5 e9  e13 |
+		//                 | e2 e6 e10 e14 |
+		//                 | e3 e7 e11 e15 |
+		// | e0 e4 e8  e12 |
+		// | e1 e5 e9  e13 |
+		// | e2 e6 e10 e14 |
+		// | e3 e7 e11 e15 |
+
+		Matrix Matrix::operator * (const Matrix & m) const
+		{
+			Matrix t;
+
+			t.e[0] = (e[0] * m.e[0]) + (e[4] * m.e[1]) + (e[8] * m.e[2]) + (e[12] * m.e[3]);
+			t.e[4] = (e[0] * m.e[4]) + (e[4] * m.e[5]) + (e[8] * m.e[6]) + (e[12] * m.e[7]);
+			t.e[8] = (e[0] * m.e[8]) + (e[4] * m.e[9]) + (e[8] * m.e[10]) + (e[12] * m.e[11]);
+			t.e[12] = (e[0] * m.e[12]) + (e[4] * m.e[13]) + (e[8] * m.e[14]) + (e[12] * m.e[15]);
+
+			t.e[1] = (e[1] * m.e[0]) + (e[5] * m.e[1]) + (e[9] * m.e[2]) + (e[13] * m.e[3]);
+			t.e[5] = (e[1] * m.e[4]) + (e[5] * m.e[5]) + (e[9] * m.e[6]) + (e[13] * m.e[7]);
+			t.e[9] = (e[1] * m.e[8]) + (e[5] * m.e[9]) + (e[9] * m.e[10]) + (e[13] * m.e[11]);
+			t.e[13] = (e[1] * m.e[12]) + (e[5] * m.e[13]) + (e[9] * m.e[14]) + (e[13] * m.e[15]);
+
+			t.e[2] = (e[2] * m.e[0]) + (e[6] * m.e[1]) + (e[10] * m.e[2]) + (e[14] * m.e[3]);
+			t.e[6] = (e[2] * m.e[4]) + (e[6] * m.e[5]) + (e[10] * m.e[6]) + (e[14] * m.e[7]);
+			t.e[10] = (e[2] * m.e[8]) + (e[6] * m.e[9]) + (e[10] * m.e[10]) + (e[14] * m.e[11]);
+			t.e[14] = (e[2] * m.e[12]) + (e[6] * m.e[13]) + (e[10] * m.e[14]) + (e[14] * m.e[15]);
+
+			t.e[3] = (e[3] * m.e[0]) + (e[7] * m.e[1]) + (e[11] * m.e[2]) + (e[15] * m.e[3]);
+			t.e[7] = (e[3] * m.e[4]) + (e[7] * m.e[5]) + (e[11] * m.e[6]) + (e[15] * m.e[7]);
+			t.e[11] = (e[3] * m.e[8]) + (e[7] * m.e[9]) + (e[11] * m.e[10]) + (e[15] * m.e[11]);
+			t.e[15] = (e[3] * m.e[12]) + (e[7] * m.e[13]) + (e[11] * m.e[14]) + (e[15] * m.e[15]);
+
+			return t;
+		}
+
+		void Matrix::operator *= (const Matrix & m)
+		{
+			Matrix t = (*this) * m;
+			memcpy((void*)this->e, (void*)t.e, sizeof(float) * 16);
+		}
+
+		const float * Matrix::getElements() const
+		{
+			return e;
+		}
+
+		void Matrix::setIdentity()
+		{
+			memset(e, 0, sizeof(float) * 16);
+			e[0] = e[5] = e[10] = e[15] = 1;
+		}
+
+		void Matrix::setTranslation(float x, float y)
+		{
+			setIdentity();
+			e[12] = x;
+			e[13] = y;
+		}
+
+		void Matrix::setRotation(float rad)
+		{
+			setIdentity();
+			float c = cos(rad), s = sin(rad);
+			e[0] = c; e[4] = -s;
+			e[1] = s; e[5] = c;
+		}
+
+		void Matrix::setScale(float sx, float sy)
+		{
+			setIdentity();
+			e[0] = sx;
+			e[5] = sy;
+		}
+
+		void Matrix::setShear(float kx, float ky)
+		{
+			setIdentity();
+			e[1] = ky;
+			e[4] = kx;
+		}
+
+		void Matrix::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy)
+		{
+			memset(e, 0, sizeof(float) * 16); // zero out matrix
+			float c = cos(angle), s = sin(angle);
+			// matrix multiplication carried out on paper:
+			// |1     x| |c -s    | |sx       | |1     -ox|
+			// |  1   y| |s  c    | |   sy    | |  1   -oy|
+			// |    1  | |     1  | |      1  | |    1    |
+			// |      1| |       1| |        1| |       1 |
+			//   move      rotate      scale      origin
+			e[10] = e[15] = 1.0f;
+			e[0] = c * sx ; // = a
+			e[1] = s * sx ; // = b
+			e[4] = - s * sy; // = c
+			e[5] = c * sy; // = d
+			e[12] = x - ox * e[0] - oy * e[4];
+			e[13] = y - ox * e[1] - oy * e[5];
+		}
+
+		void Matrix::translate(float x, float y)
+		{
+			Matrix t;
+			t.setTranslation(x, y);
+			this->operator *=(t);
+		}
+
+		void Matrix::rotate(float rad)
+		{
+			Matrix t;
+			t.setRotation(rad);
+			this->operator *=(t);
+		}
+
+		void Matrix::scale(float sx, float sy)
+		{
+			Matrix t;
+			t.setScale(sx, sy);
+			this->operator *=(t);
+		}
+
+		void Matrix::shear(float kx, float ky)
+		{
+			Matrix t;
+			t.setShear(kx, ky);
+			this->operator *=(t);
+		}
+
+		//                 | x |
+		//                 | y |
+		//                 | 0 |
+		//                 | 1 |
+		// | e0 e4 e8  e12 |
+		// | e1 e5 e9  e13 |
+		// | e2 e6 e10 e14 |
+		// | e3 e7 e11 e15 |
+
+		void Matrix::transform(vertex * dst, const vertex * src, int size) const
+		{
+			for (int i = 0; i<size; ++i)
+			{
+				// Store in temp variables in case src = dst
+				float x = (e[0] * src[i].x) + (e[4] * src[i].y) + (0) + (e[12]);
+				float y = (e[1] * src[i].x) + (e[5] * src[i].y) + (0) + (e[13]);
+
+				dst[i].x = x;
+				dst[i].y = y;
+			}
+		}
+
+	} // namespace Math
+} // namespace JinEngine
\ No newline at end of file
diff --git a/src/libjin/Math/je_matrix.h b/src/libjin/Math/je_matrix.h
new file mode 100644
index 0000000..3592d18
--- /dev/null
+++ b/src/libjin/Math/je_matrix.h
@@ -0,0 +1,159 @@
+#ifndef __JE_MATRIX_H
+#define __JE_MATRIX_H
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+		struct vertex
+		{
+			unsigned char r, g, b, a;
+			float x, y;
+			float s, t;
+		};
+		/// 
+		/// This class is the basis for all transformations in LOVE. Althought not
+		/// really needed for 2D, it contains 4x4 elements to be compatible with
+		/// OpenGL without conversions.
+		/// 不需要转置的矩阵
+		/// https://blog.csdn.net/candycat1992/article/details/8830894
+		/// 
+		class Matrix
+		{
+		private:
+
+			/// 
+			/// | e0 e4 e8  e12 |
+			/// | e1 e5 e9  e13 |
+			/// | e2 e6 e10 e14 |
+			/// | e3 e7 e11 e15 |
+			///
+			float e[16];
+
+		public:
+
+			static const Matrix Identity;
+
+			/// 
+			/// Creates a new identity matrix.
+			/// 
+			Matrix();
+
+			///
+            /// Destructor.
+		    ///
+			~Matrix();
+
+			void setOrtho(float _left, float _right, float _bottom, float _top, float _near, float _far);
+
+			/// 
+			/// Multiplies this Matrix with another Matrix, changing neither.
+			/// @param m The Matrix to multiply with this Matrix.
+			/// @return The combined matrix.
+			/// 
+			Matrix operator * (const Matrix & m) const;
+
+			/// 
+			/// Multiplies a Matrix into this Matrix.
+			/// @param m The Matrix to combine into this Matrix.
+			/// 
+			void operator *= (const Matrix & m);
+
+			/// 
+			/// Gets a pointer to the 16 array elements.
+			/// @return The array elements.
+			/// 
+			const float* getElements() const;
+
+			/// 
+			/// Resets this Matrix to the identity matrix.
+			/// 
+			void setIdentity();
+
+			/// 
+			/// Resets this Matrix to a translation.
+			/// @param x Translation along x-axis.
+			/// @param y Translation along y-axis.
+			/// 
+			void setTranslation(float x, float y);
+
+			/// 
+			/// Resets this Matrix to a rotation.
+			/// @param r The angle in radians.
+			/// 
+			void setRotation(float r);
+
+			/// 
+			/// Resets this Matrix to a scale transformation.
+			/// @param sx Scale factor along the x-axis.
+			/// @param sy Scale factor along the y-axis.
+			/// 
+			void setScale(float sx, float sy);
+
+			/// 
+			/// Resets this Matrix to a shear transformation.
+			/// @param kx Shear along x-axis.
+			/// @param ky Shear along y-axis.
+			/// 
+			void setShear(float kx, float ky);
+
+			/// 
+			/// Creates a transformation with a certain position, orientation, scale
+			/// and offset. Perfect for Drawables -- what a coincidence!
+			///
+			/// @param x The translation along the x-axis.
+			/// @param y The translation along the y-axis.
+			/// @param angle The rotation (rad) around the center with offset (ox,oy).
+			/// @param sx Scale along x-axis.
+			/// @param sy Scale along y-axis.
+			/// @param ox The offset for rotation along the x-axis.
+			/// @param oy The offset for rotation along the y-axis.
+			/// @param kx Shear along x-axis
+			/// @param ky Shear along y-axis
+			/// 
+			void setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy);
+
+			/// 
+			/// Multiplies this Matrix with a translation.
+			/// @param x Translation along x-axis.
+			/// @param y Translation along y-axis.
+			/// 
+			void translate(float x, float y);
+
+			/// 
+			/// Multiplies this Matrix with a rotation.
+			/// @param r Angle in radians.
+			/// 
+			void rotate(float r);
+
+			/// 
+			/// Multiplies this Matrix with a scale transformation.
+			/// @param sx Scale factor along the x-axis.
+			/// @param sy Scale factor along the y-axis.
+			/// 
+			void scale(float sx, float sy);
+
+			/// 
+			/// Multiplies this Matrix with a shear transformation.
+			/// @param kx Shear along the x-axis.
+			/// @param ky Shear along the y-axis.
+			/// 
+			void shear(float kx, float ky);
+
+			/// 
+			/// Transforms an array of vertices by this Matrix. The sources and
+			/// destination arrays may be the same.
+			///
+			/// @param dst Storage for the transformed vertices.
+			/// @param src The source vertices.
+			/// @param size The number of vertices.
+			/// 
+			void transform(vertex * dst, const vertex * src, int size) const;
+
+		}; 
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif // __JE_MATRIX_H
\ No newline at end of file
diff --git a/src/libjin/Math/je_quad.h b/src/libjin/Math/je_quad.h
new file mode 100644
index 0000000..2a66fa1
--- /dev/null
+++ b/src/libjin/Math/je_quad.h
@@ -0,0 +1,23 @@
+#ifndef __JE_QUAD_H
+#define __JE_QUAD_H
+
+namespace JinEngine
+{
+	namespace Math 
+	{
+
+        ///
+        ///
+        ///
+		struct Quad
+		{
+            ///
+            ///
+            ///
+			float x, y, w, h;
+		};
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif // __JE_QUAD_H
\ No newline at end of file
diff --git a/src/libjin/Math/je_random.h b/src/libjin/Math/je_random.h
new file mode 100644
index 0000000..eb59341
--- /dev/null
+++ b/src/libjin/Math/je_random.h
@@ -0,0 +1,14 @@
+#ifndef __JE_RANDOM_H
+#define __JE_RANDOM_H
+
+namespace JinEngine
+{
+    namespace Math
+    {
+
+
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/Math/je_vector2.hpp b/src/libjin/Math/je_vector2.hpp
new file mode 100644
index 0000000..a2b3371
--- /dev/null
+++ b/src/libjin/Math/je_vector2.hpp
@@ -0,0 +1,40 @@
+#ifndef __JE_VECTOR_H
+#define __JE_VECTOR_H
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+		template<typename T>
+		class Vector2
+		{
+		public:
+			Vector2()
+			{
+				data[0] = data[1] = 0;
+			}
+			Vector2(T _x, T _y)
+			{
+				data[0] = _x;
+				data[1] = _y;
+			}
+			Vector2(const Vector2<T>& v)
+			{
+				data[0] = v.data[0];
+				data[1] = v.data[1];
+			}
+
+			T &x = data[0], &y = data[1]; // xy
+			T &w = data[0], &h = data[1]; // wh
+			T &colum = data[0], &row = data[1]; // colum row
+
+		private: 
+			T data[2];
+
+		};
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/Math/je_vector3.hpp b/src/libjin/Math/je_vector3.hpp
new file mode 100644
index 0000000..0f9448d
--- /dev/null
+++ b/src/libjin/Math/je_vector3.hpp
@@ -0,0 +1,41 @@
+#ifndef __JE_VECTOR3_H
+#define __JE_VECTOR3_H
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+		template<typename T>
+		class Vector3
+		{
+		public:
+			Vector3()
+			{
+				data[0] = data[1] = data[2] = 0;
+			}
+			Vector3(T _x, T _y, T _z)
+			{
+				data[0] = _x;
+				data[1] = _y;
+				data[2] = _z;
+			}
+			Vector3(const Vector3<T>& v)
+			{
+				data[0] = v.data[0];
+				data[1] = v.data[1];
+				data[2] = v.data[2];
+			}
+
+			T &x = data[0], &y = data[1], &z = data[2]; // xyz
+			T &r = data[0], &g = data[1], &b = data[2]; // rgb
+
+		private:
+			T data[3];
+
+		};
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/Math/je_vector4.hpp b/src/libjin/Math/je_vector4.hpp
new file mode 100644
index 0000000..20353eb
--- /dev/null
+++ b/src/libjin/Math/je_vector4.hpp
@@ -0,0 +1,45 @@
+#ifndef __JE_VECTOR4_H
+#define __JE_VECTOR4_H
+
+namespace JinEngine
+{
+	namespace Math
+	{
+
+		template<typename T>
+		class Vector4
+		{
+		public:
+			Vector4()
+			{
+				data[0] = data[1] = data[2] = data[3] = 0;
+			}
+			Vector4(T _x, T _y, T _z, T _t)
+			{
+				data[0] = _x;
+				data[1] = _y;
+				data[2] = _z;
+				data[3] = _t;
+			}
+			Vector4(const Vector4<T>& v)
+			{
+				data[0] = v.data[0];
+				data[1] = v.data[1];
+				data[2] = v.data[2];
+				data[3] = v.data[3];
+			}
+
+			T &x = data[0], &y = data[1], &z = data[2], &t = data[3]; // xyzt
+			T &w = data[2], &h = data[3];                             // xywh
+			T &r = data[0], &g = data[1], &b = data[2], &a = data[3]; // rgb
+			T &left = data[0], &right = data[1], &top = data[2], &bottom = data[3]; // lrtb
+
+		private:
+			T data[4];
+
+		};
+
+	} // namespace Math
+} // namespace JinEngine
+
+#endif
\ No newline at end of file
-- 
cgit v1.1-26-g67d0