16 files changed, 1013 insertions, 52 deletions

diff --git a/Source/Asura.Engine/Math/Rect.h b/Source/Asura.Engine/Math/Rect.h
deleted file mode 100644
index 5dd8631..0000000
--- a/Source/Asura.Engine/Math/Rect.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASURA_ENGINE_RECT_H__
-#define __ASURA_ENGINE_RECT_H__
-
-namespace AsuraEngine
-{
-	namespace Math
-	{
-
-		struct Rect
-		{
-			int x, y, w, h;
-		};
-
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Rect.hpp b/Source/Asura.Engine/Math/Rect.hpp
new file mode 100644
index 0000000..f635007
--- /dev/null
+++ b/Source/Asura.Engine/Math/Rect.hpp
@@ -0,0 +1,32 @@
+#ifndef __ASURA_ENGINE_RECT_H__
+#define __ASURA_ENGINE_RECT_H__
+
+namespace AsuraEngine
+{
+	namespace Math
+	{
+		
+		template<typename T> 
+		struct Rect
+		{
+		public:
+			Rect();
+			~Rect(T x, T y, T w, T h);
+
+			template <typename U>
+			explicit Rect(const Rect<U>& rect);
+
+			T x, y, w, h;
+		};
+		
+#include "Rect.inl"
+
+		// Define the most common types
+		typedef Rect<int>          Recti;
+		typedef Rect<unsigned int> Rectu;
+		typedef Rect<float>        Rectf;
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Rect.inl b/Source/Asura.Engine/Math/Rect.inl
new file mode 100644
index 0000000..891a3f8
--- /dev/null
+++ b/Source/Asura.Engine/Math/Rect.inl
@@ -0,0 +1,19 @@
+template <typename T>
+inline Rect<T>::Rect() 
+	: x(0)
+	, y(0)
+	, w(0)
+	, h(0)
+{
+
+}
+
+template <typename T>
+inline Rect<T>::Rect(T X, T Y, T W, T H)
+	: x(X)
+	, y(Y)
+	, w(W)
+	, h(H)
+{
+
+}
diff --git a/Source/Asura.Engine/Math/Rect.cpp b/Source/Asura.Engine/Math/Transform.cpp
index e69de29..e69de29 100644
--- a/Source/Asura.Engine/Math/Rect.cpp
+++ b/Source/Asura.Engine/Math/Transform.cpp
diff --git a/Source/Asura.Engine/Math/Transform.h b/Source/Asura.Engine/Math/Transform.h
new file mode 100644
index 0000000..aafb66c
--- /dev/null
+++ b/Source/Asura.Engine/Math/Transform.h
@@ -0,0 +1,30 @@
+#ifndef __ASURA_ENGINE_TRANSFORM_H__
+#define __ASURA_ENGINE_TRANSFORM_H__
+
+#include "Object.h"
+
+namespace AsuraEngine
+{
+	namespace Math
+	{
+
+		class Transform : virtual public Object
+		{
+		public:
+
+			void Set(float x, float y, float sx, float sy, float ox, float oy, float r);
+
+			void LoadIdentity();
+
+			void Move(float dx = 0, float dy = 0);
+			void Rotate(float r);
+			void Scale(float sx, float sy);
+
+			float m[16]; //4x4 matrix
+
+		};
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Vector2.cpp b/Source/Asura.Engine/Math/Vector2.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Engine/Math/Vector2.cpp
+++ /dev/null
diff --git a/Source/Asura.Engine/Math/Vector2.h b/Source/Asura.Engine/Math/Vector2.h
deleted file mode 100644
index 875cef3..0000000
--- a/Source/Asura.Engine/Math/Vector2.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASURA_ENGINE_VECTOR2_H__
-#define __ASURA_ENGINE_VECTOR2_H__
-
-namespace AsuraEngine
-{
-	namespace Math
-	{
-
-		class Vector2
-		{
-
-		};
-
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Vector2.hpp b/Source/Asura.Engine/Math/Vector2.hpp
new file mode 100644
index 0000000..df78255
--- /dev/null
+++ b/Source/Asura.Engine/Math/Vector2.hpp
@@ -0,0 +1,70 @@
+#ifndef __ASURA_ENGINE_VECTOR2_H__
+#define __ASURA_ENGINE_VECTOR2_H__
+
+namespace AsuraEngine
+{
+	namespace Math
+	{
+		template <typename T>
+		class Vector2
+		{
+		public:
+			Vector2();
+			Vector2(T X, T Y);
+
+			template <typename U>
+			explicit Vector2(const Vector2<U>& vector);
+
+			Set(T X, T Y);
+
+			T x; ///< X coordinate of the vector
+			T y; ///< Y coordinate of the vector
+		};
+
+		template <typename T>
+		Vector2<T> operator -(const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T>& operator +=(Vector2<T>& left, const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T>& operator -=(Vector2<T>& left, const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T> operator +(const Vector2<T>& left, const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T> operator -(const Vector2<T>& left, const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T> operator *(const Vector2<T>& left, T right);
+
+		template <typename T>
+		Vector2<T> operator *(T left, const Vector2<T>& right);
+
+		template <typename T>
+		Vector2<T>& operator *=(Vector2<T>& left, T right);
+
+		template <typename T>
+		Vector2<T> operator /(const Vector2<T>& left, T right);
+
+		template <typename T>
+		Vector2<T>& operator /=(Vector2<T>& left, T right);
+
+		template <typename T>
+		bool operator ==(const Vector2<T>& left, const Vector2<T>& right);
+
+		template <typename T>
+		bool operator !=(const Vector2<T>& left, const Vector2<T>& right);
+
+#include "Vector2.inl"
+
+		// Define the most common types
+		typedef Vector2<int>          Vector2i;
+		typedef Vector2<unsigned int> Vector2u;
+		typedef Vector2<float>        Vector2f;
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Vector2.inl b/Source/Asura.Engine/Math/Vector2.inl
new file mode 100644
index 0000000..9e131a7
--- /dev/null
+++ b/Source/Asura.Engine/Math/Vector2.inl
@@ -0,0 +1,114 @@
+template <typename T>
+inline Vector2<T>::Vector2() :
+	x(0),
+	y(0)
+{
+
+}
+
+template <typename T>
+inline Vector2<T>::Vector2(T X, T Y) :
+	x(X),
+	y(Y)
+{
+
+}
+
+template <typename T>
+template <typename U>
+inline Vector2<T>::Vector2(const Vector2<U>& vector) :
+	x(static_cast<T>(vector.x)),
+	y(static_cast<T>(vector.y))
+{
+}
+
+template <typename T>
+inline Vector2<T>::Set(T X, T Y)
+{
+	x = X;
+	y = Y;
+}
+
+template <typename T>
+inline Vector2<T> operator -(const Vector2<T>& right)
+{
+	return Vector2<T>(-right.x, -right.y);
+}
+
+template <typename T>
+inline Vector2<T>& operator +=(Vector2<T>& left, const Vector2<T>& right)
+{
+	left.x += right.x;
+	left.y += right.y;
+
+	return left;
+}
+
+template <typename T>
+inline Vector2<T>& operator -=(Vector2<T>& left, const Vector2<T>& right)
+{
+	left.x -= right.x;
+	left.y -= right.y;
+
+	return left;
+}
+
+template <typename T>
+inline Vector2<T> operator +(const Vector2<T>& left, const Vector2<T>& right)
+{
+	return Vector2<T>(left.x + right.x, left.y + right.y);
+}
+
+template <typename T>
+inline Vector2<T> operator -(const Vector2<T>& left, const Vector2<T>& right)
+{
+	return Vector2<T>(left.x - right.x, left.y - right.y);
+}
+
+template <typename T>
+inline Vector2<T> operator *(const Vector2<T>& left, T right)
+{
+	return Vector2<T>(left.x * right, left.y * right);
+}
+
+template <typename T>
+inline Vector2<T> operator *(T left, const Vector2<T>& right)
+{
+	return Vector2<T>(right.x * left, right.y * left);
+}
+
+template <typename T>
+inline Vector2<T>& operator *=(Vector2<T>& left, T right)
+{
+	left.x *= right;
+	left.y *= right;
+
+	return left;
+}
+
+template <typename T>
+inline Vector2<T> operator /(const Vector2<T>& left, T right)
+{
+	return Vector2<T>(left.x / right, left.y / right);
+}
+
+template <typename T>
+inline Vector2<T>& operator /=(Vector2<T>& left, T right)
+{
+	left.x /= right;
+	left.y /= right;
+
+	return left;
+}
+
+template <typename T>
+inline bool operator ==(const Vector2<T>& left, const Vector2<T>& right)
+{
+	return (left.x == right.x) && (left.y == right.y);
+}
+
+template <typename T>
+inline bool operator !=(const Vector2<T>& left, const Vector2<T>& right)
+{
+	return (left.x != right.x) || (left.y != right.y);
+}
diff --git a/Source/Asura.Engine/Math/Vector3.cpp b/Source/Asura.Engine/Math/Vector3.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Engine/Math/Vector3.cpp
+++ /dev/null
diff --git a/Source/Asura.Engine/Math/Vector3.h b/Source/Asura.Engine/Math/Vector3.h
deleted file mode 100644
index f0e48e4..0000000
--- a/Source/Asura.Engine/Math/Vector3.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASURA_ENGINE_VECTOR3_H__
-#define __ASURA_ENGINE_VECTOR3_H__
-
-namespace AsuraEngine
-{
-	namespace Math
-	{
-
-		class Vector3
-		{
-
-		};
-
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Vector3.hpp b/Source/Asura.Engine/Math/Vector3.hpp
new file mode 100644
index 0000000..2b23406
--- /dev/null
+++ b/Source/Asura.Engine/Math/Vector3.hpp
@@ -0,0 +1,233 @@
+#ifndef __ASURA_ENGINE_VECTOR3_H__
+#define __ASURA_ENGINE_VECTOR3_H__
+
+namespace AsuraEngine
+{
+	namespace Math
+	{
+		template <typename T>
+		class Vector3
+		{
+		public:
+
+			////////////////////////////////////////////////////////////
+			/// \brief Default constructor
+			///
+			/// Creates a Vector3(0, 0, 0).
+			///
+			////////////////////////////////////////////////////////////
+			Vector3();
+
+			////////////////////////////////////////////////////////////
+			/// \brief Construct the vector from its coordinates
+			///
+			/// \param X X coordinate
+			/// \param Y Y coordinate
+			/// \param Z Z coordinate
+			///
+			////////////////////////////////////////////////////////////
+			Vector3(T X, T Y, T Z);
+
+			////////////////////////////////////////////////////////////
+			/// \brief Construct the vector from another type of vector
+			///
+			/// This constructor doesn't replace the copy constructor,
+			/// it's called only when U != T.
+			/// A call to this constructor will fail to compile if U
+			/// is not convertible to T.
+			///
+			/// \param vector Vector to convert
+			///
+			////////////////////////////////////////////////////////////
+			template <typename U>
+			explicit Vector3(const Vector3<U>& vector);
+
+			////////////////////////////////////////////////////////////
+			// Member data
+			////////////////////////////////////////////////////////////
+			T x; ///< X coordinate of the vector
+			T y; ///< Y coordinate of the vector
+			T z; ///< Z coordinate of the vector
+		};
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of unary operator -
+		///
+		/// \param left Vector to negate
+		///
+		/// \return Memberwise opposite of the vector
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator -(const Vector3<T>& left);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator +=
+		///
+		/// This operator performs a memberwise addition of both vectors,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T>& operator +=(Vector3<T>& left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator -=
+		///
+		/// This operator performs a memberwise subtraction of both vectors,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T>& operator -=(Vector3<T>& left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator +
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise addition of both vectors
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator +(const Vector3<T>& left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator -
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise subtraction of both vectors
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator -(const Vector3<T>& left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator *
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Memberwise multiplication by \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator *(const Vector3<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator *
+		///
+		/// \param left  Left operand (a scalar value)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise multiplication by \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator *(T left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator *=
+		///
+		/// This operator performs a memberwise multiplication by \a right,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T>& operator *=(Vector3<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator /
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Memberwise division by \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T> operator /(const Vector3<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator /=
+		///
+		/// This operator performs a memberwise division by \a right,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector3<T>& operator /=(Vector3<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator ==
+		///
+		/// This operator compares strict equality between two vectors.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return True if \a left is equal to \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		bool operator ==(const Vector3<T>& left, const Vector3<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector3
+		/// \brief Overload of binary operator !=
+		///
+		/// This operator compares strict difference between two vectors.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return True if \a left is not equal to \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		bool operator !=(const Vector3<T>& left, const Vector3<T>& right);
+
+#include "Vector3.inl"
+
+		// Define the most common types
+		typedef Vector3<int>   Vector3i;
+		typedef Vector3<float> Vector3f;
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Math/Vector3.inl b/Source/Asura.Engine/Math/Vector3.inl
new file mode 100644
index 0000000..3a2aa93
--- /dev/null
+++ b/Source/Asura.Engine/Math/Vector3.inl
@@ -0,0 +1,145 @@
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>::Vector3() :
+	x(0),
+	y(0),
+	z(0)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>::Vector3(T X, T Y, T Z) :
+	x(X),
+	y(Y),
+	z(Z)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+template <typename U>
+inline Vector3<T>::Vector3(const Vector3<U>& vector) :
+	x(static_cast<T>(vector.x)),
+	y(static_cast<T>(vector.y)),
+	z(static_cast<T>(vector.z))
+{
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator -(const Vector3<T>& left)
+{
+	return Vector3<T>(-left.x, -left.y, -left.z);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>& operator +=(Vector3<T>& left, const Vector3<T>& right)
+{
+	left.x += right.x;
+	left.y += right.y;
+	left.z += right.z;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>& operator -=(Vector3<T>& left, const Vector3<T>& right)
+{
+	left.x -= right.x;
+	left.y -= right.y;
+	left.z -= right.z;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator +(const Vector3<T>& left, const Vector3<T>& right)
+{
+	return Vector3<T>(left.x + right.x, left.y + right.y, left.z + right.z);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator -(const Vector3<T>& left, const Vector3<T>& right)
+{
+	return Vector3<T>(left.x - right.x, left.y - right.y, left.z - right.z);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator *(const Vector3<T>& left, T right)
+{
+	return Vector3<T>(left.x * right, left.y * right, left.z * right);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator *(T left, const Vector3<T>& right)
+{
+	return Vector3<T>(right.x * left, right.y * left, right.z * left);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>& operator *=(Vector3<T>& left, T right)
+{
+	left.x *= right;
+	left.y *= right;
+	left.z *= right;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T> operator /(const Vector3<T>& left, T right)
+{
+	return Vector3<T>(left.x / right, left.y / right, left.z / right);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector3<T>& operator /=(Vector3<T>& left, T right)
+{
+	left.x /= right;
+	left.y /= right;
+	left.z /= right;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline bool operator ==(const Vector3<T>& left, const Vector3<T>& right)
+{
+	return (left.x == right.x) && (left.y == right.y) && (left.z == right.z);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline bool operator !=(const Vector3<T>& left, const Vector3<T>& right)
+{
+	return (left.x != right.x) || (left.y != right.y) || (left.z != right.z);
+}
diff --git a/Source/Asura.Engine/Math/Vector4.cpp b/Source/Asura.Engine/Math/Vector4.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Engine/Math/Vector4.cpp
+++ /dev/null
diff --git a/Source/Asura.Engine/Math/Vector4.h b/Source/Asura.Engine/Math/Vector4.h
index 3739f83..13a9d8a 100644
--- a/Source/Asura.Engine/Math/Vector4.h
+++ b/Source/Asura.Engine/Math/Vector4.h
@@ -5,12 +5,229 @@ namespace AsuraEngine
 {
 	namespace Math
 	{
-
+		template <typename T>
 		class Vector4
 		{
+		public:
+
+			////////////////////////////////////////////////////////////
+			/// \brief Default constructor
+			///
+			/// Creates a Vector4(0, 0, 0).
+			///
+			////////////////////////////////////////////////////////////
+			Vector4();
+
+			////////////////////////////////////////////////////////////
+			/// \brief Construct the vector from its coordinates
+			///
+			/// \param X X coordinate
+			/// \param Y Y coordinate
+			/// \param Z Z coordinate
+			///
+			////////////////////////////////////////////////////////////
+			Vector4(T X, T Y, T Z, T W);
 
+			////////////////////////////////////////////////////////////
+			/// \brief Construct the vector from another type of vector
+			///
+			/// This constructor doesn't replace the copy constructor,
+			/// it's called only when U != T.
+			/// A call to this constructor will fail to compile if U
+			/// is not convertible to T.
+			///
+			/// \param vector Vector to convert
+			///
+			////////////////////////////////////////////////////////////
+			template <typename U>
+			explicit Vector4(const Vector4<U>& vector);
+
+			////////////////////////////////////////////////////////////
+			// Member data
+			////////////////////////////////////////////////////////////
+			T x; ///< X coordinate of the vector
+			T y; ///< Y coordinate of the vector
+			T z; ///< Z coordinate of the vector
+			T w; ///< W coordinate of the vector
 		};
 
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of unary operator -
+		///
+		/// \param left Vector to negate
+		///
+		/// \return Memberwise opposite of the vector
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator -(const Vector4<T>& left);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator +=
+		///
+		/// This operator performs a memberwise addition of both vectors,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T>& operator +=(Vector4<T>& left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator -=
+		///
+		/// This operator performs a memberwise subtraction of both vectors,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T>& operator -=(Vector4<T>& left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator +
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise addition of both vectors
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator +(const Vector4<T>& left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator -
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise subtraction of both vectors
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator -(const Vector4<T>& left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator *
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Memberwise multiplication by \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator *(const Vector4<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator *
+		///
+		/// \param left  Left operand (a scalar value)
+		/// \param right Right operand (a vector)
+		///
+		/// \return Memberwise multiplication by \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator *(T left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator *=
+		///
+		/// This operator performs a memberwise multiplication by \a right,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T>& operator *=(Vector4<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator /
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Memberwise division by \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T> operator /(const Vector4<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator /=
+		///
+		/// This operator performs a memberwise division by \a right,
+		/// and assigns the result to \a left.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a scalar value)
+		///
+		/// \return Reference to \a left
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		Vector4<T>& operator /=(Vector4<T>& left, T right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator ==
+		///
+		/// This operator compares strict equality between two vectors.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return True if \a left is equal to \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		bool operator ==(const Vector4<T>& left, const Vector4<T>& right);
+
+		////////////////////////////////////////////////////////////
+		/// \relates Vector4
+		/// \brief Overload of binary operator !=
+		///
+		/// This operator compares strict difference between two vectors.
+		///
+		/// \param left  Left operand (a vector)
+		/// \param right Right operand (a vector)
+		///
+		/// \return True if \a left is not equal to \a right
+		///
+		////////////////////////////////////////////////////////////
+		template <typename T>
+		bool operator !=(const Vector4<T>& left, const Vector4<T>& right);
+
+#include "Vector4.inl"
+
+		// Define the most common types
+		typedef Vector4<int>   Vector4i;
+		typedef Vector4<float> Vector4f;
+
 	}
 }
 
diff --git a/Source/Asura.Engine/Math/Vector4.inl b/Source/Asura.Engine/Math/Vector4.inl
new file mode 100644
index 0000000..025bfcc
--- /dev/null
+++ b/Source/Asura.Engine/Math/Vector4.inl
@@ -0,0 +1,152 @@
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>::Vector4() :
+	x(0),
+	y(0),
+	z(0),
+	w(0)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>::Vector4(T X, T Y, T Z) :
+	x(X),
+	y(Y),
+	z(Z),
+	w(0)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+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))
+	w(static_cast<T>(vector.w))
+{
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator -(const Vector4<T>& left)
+{
+	return Vector4<T>(-left.x, -left.y, -left.z, -left.w);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>& operator +=(Vector4<T>& left, const Vector4<T>& right)
+{
+	left.x += right.x;
+	left.y += right.y;
+	left.z += right.z;
+	left.w += right.w;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>& operator -=(Vector4<T>& left, const Vector4<T>& right)
+{
+	left.x -= right.x;
+	left.y -= right.y;
+	left.z -= right.z;
+	left.w -= right.w;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator +(const Vector4<T>& left, const Vector4<T>& right)
+{
+	return Vector4<T>(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator -(const Vector4<T>& left, const Vector4<T>& right)
+{
+	return Vector4<T>(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator *(const Vector4<T>& left, T right)
+{
+	return Vector4<T>(left.x * right, left.y * right, left.z * right, left.w * right);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator *(T left, const Vector4<T>& right)
+{
+	return Vector4<T>(right.x * left, right.y * left, right.z * left, right.w * left);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>& operator *=(Vector4<T>& left, T right)
+{
+	left.x *= right;
+	left.y *= right;
+	left.z *= right;
+	left.w *= right;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T> operator /(const Vector4<T>& left, T right)
+{
+	return Vector4<T>(left.x / right, left.y / right, left.z / right, left.w / right);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline Vector4<T>& operator /=(Vector4<T>& left, T right)
+{
+	left.x /= right;
+	left.y /= right;
+	left.z /= right;
+	left.w /= right;
+
+	return left;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline bool operator ==(const Vector4<T>& left, const Vector4<T>& right)
+{
+	return (left.x == right.x) && (left.y == right.y) && (left.z == right.z) && (left.w == right.w);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename T>
+inline bool operator !=(const Vector4<T>& left, const Vector4<T>& right)
+{
+	return (left.x != right.x) || (left.y != right.y) || (left.z != right.z) || (left.w != right.w);
+}