Merge branch 'master' of warmcat.org:/home/git-repo/GameLab

# Conflicts:
#	Projects/VisualStudio/Editor/Editor.vcxproj
#	Projects/VisualStudio/Editor/Editor.vcxproj.filters

1 files changed, 11 insertions, 0 deletions

diff --git a/Runtime/Math/Vector2.cpp b/Runtime/Math/Vector2.cpp
index e69de29..e636362 100644
--- a/Runtime/Math/Vector2.cpp
+++ b/Runtime/Math/Vector2.cpp
@@ -0,0 +1,11 @@
+#include "Vector2.h"
+
+using namespace std;
+
+const float		Vector2f::epsilon = 0.00001F;
+const float		Vector2f::infinity = numeric_limits<float>::infinity();
+const Vector2f	Vector2f::infinityVec = Vector2f(numeric_limits<float>::infinity(), numeric_limits<float>::infinity());
+
+const Vector2f	Vector2f::zero = Vector2f(0, 0);
+const Vector2f	Vector2f::xAxis = Vector2f(1, 0);
+const Vector2f	Vector2f::yAxis = Vector2f(0, 1);