From 2077be15cb7fefa7c54d93613fcb3228a6ab4b47 Mon Sep 17 00:00:00 2001
From: RicardoEPRodrigues <ricardo.e.p.rodrigues@gmail.com>
Date: Tue, 31 Oct 2017 15:40:19 +0000
Subject: [PATCH] Windows Support

---
 3Engine/3Engine.vcxproj                   | 118 ++++-----
 3Engine/3Engine.vcxproj.filters           | 288 ++++++++++++----------
 3EngineTests/3EngineTests.vcxproj         |  70 +++---
 3EngineTests/3EngineTests.vcxproj.filters | 110 ++++++---
 4 files changed, 333 insertions(+), 253 deletions(-)

diff --git a/3Engine/3Engine.vcxproj b/3Engine/3Engine.vcxproj
index 2ef3fb2..ffc2fb8 100644
--- a/3Engine/3Engine.vcxproj
+++ b/3Engine/3Engine.vcxproj
@@ -18,33 +18,6 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\Camera\Camera.cpp" />
-    <ClCompile Include="..\src\Camera\LookAt.cpp" />
-    <ClCompile Include="..\src\Camera\Ortho.cpp" />
-    <ClCompile Include="..\src\Camera\Perspective.cpp" />
-    <ClCompile Include="..\src\Engine.cpp" />
-    <ClCompile Include="..\src\Input.cpp" />
-    <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\Math\Maths.cpp" />
-    <ClCompile Include="..\src\Math\Matrix.cpp" />
-    <ClCompile Include="..\src\Math\Matrix2.cpp" />
-    <ClCompile Include="..\src\Math\Matrix3.cpp" />
-    <ClCompile Include="..\src\Math\Vector.cpp" />
-    <ClCompile Include="..\src\Math\Vector2.cpp" />
-    <ClCompile Include="..\src\Math\Vector4.cpp" />
-    <ClCompile Include="..\src\Shader\Shader.cpp" />
-    <ClCompile Include="..\src\Shader\ShaderProgram.cpp" />
-    <ClCompile Include="..\src\Tangram3D\CameraController.cpp" />
-    <ClCompile Include="..\src\Tangram3D\Cube.cpp" />
-    <ClCompile Include="..\src\Tangram3D\Parallelogram3D.cpp" />
-    <ClCompile Include="..\src\Tangram3D\Tangram3D.cpp" />
-    <ClCompile Include="..\src\Tangram3D\Triangle3D.cpp" />
-    <ClCompile Include="..\src\Tangram\Parallelogram.cpp" />
-    <ClCompile Include="..\src\Tangram\Square.cpp" />
-    <ClCompile Include="..\src\Tangram\Tangram.cpp" />
-    <ClCompile Include="..\src\Tangram\Triangle.cpp" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\config\RuntimeConfig.json" />
     <None Include="..\config\SetupConfig.json" />
@@ -54,35 +27,68 @@
     <None Include="..\shaders\Wireframe.json" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\Camera\Camera.h" />
-    <ClInclude Include="..\src\Camera\LookAt.h" />
-    <ClInclude Include="..\src\Camera\Ortho.h" />
-    <ClInclude Include="..\src\Camera\Perspective.h" />
-    <ClInclude Include="..\src\Debug.h" />
-    <ClInclude Include="..\src\Engine.h" />
-    <ClInclude Include="..\src\IActor.h" />
-    <ClInclude Include="..\src\Input.h" />
-    <ClInclude Include="..\src\json.hpp" />
-    <ClInclude Include="..\src\Math\Maths.h" />
-    <ClInclude Include="..\src\Math\Matrix.h" />
-    <ClInclude Include="..\src\Math\Matrix2.h" />
-    <ClInclude Include="..\src\Math\Matrix3.h" />
-    <ClInclude Include="..\src\Math\TMatrix.h" />
-    <ClInclude Include="..\src\Math\Vector.h" />
-    <ClInclude Include="..\src\Math\Vector2.h" />
-    <ClInclude Include="..\src\Math\Vector4.h" />
-    <ClInclude Include="..\src\OpenGLUtils.h" />
-    <ClInclude Include="..\src\Shader\Shader.h" />
-    <ClInclude Include="..\src\Shader\ShaderProgram.h" />
-    <ClInclude Include="..\src\Tangram3D\CameraController.h" />
-    <ClInclude Include="..\src\Tangram3D\Cube.h" />
-    <ClInclude Include="..\src\Tangram3D\Parallelogram3D.h" />
-    <ClInclude Include="..\src\Tangram3D\Tangram3D.h" />
-    <ClInclude Include="..\src\Tangram3D\Triangle3D.h" />
-    <ClInclude Include="..\src\Tangram\Parallelogram.h" />
-    <ClInclude Include="..\src\Tangram\Square.h" />
-    <ClInclude Include="..\src\Tangram\Tangram.h" />
-    <ClInclude Include="..\src\Tangram\Triangle.h" />
+    <ClCompile Include="..\src\Engine\Camera\Camera.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp" />
+    <ClCompile Include="..\src\Engine\Engine.cpp" />
+    <ClCompile Include="..\src\Engine\Input.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Maths.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Quat.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector2.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector4.cpp" />
+    <ClCompile Include="..\src\Engine\Shader\Shader.cpp" />
+    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp" />
+    <ClCompile Include="..\src\Examples\Quaternion\CameraControllerRot.cpp" />
+    <ClCompile Include="..\src\Examples\Quaternion\Quaternion.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram3D\CameraController.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram3D\Cube.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram3D\Parallelogram3D.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram3D\Tangram3D.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram3D\Triangle3D.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram\Parallelogram.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram\Square.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram\Tangram.cpp" />
+    <ClCompile Include="..\src\Examples\Tangram\Triangle.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\Engine\Camera\Camera.h" />
+    <ClInclude Include="..\src\Engine\Camera\LookAt.h" />
+    <ClInclude Include="..\src\Engine\Camera\Ortho.h" />
+    <ClInclude Include="..\src\Engine\Camera\Perspective.h" />
+    <ClInclude Include="..\src\Engine\Debug.h" />
+    <ClInclude Include="..\src\Engine\Engine.h" />
+    <ClInclude Include="..\src\Engine\IActor.h" />
+    <ClInclude Include="..\src\Engine\Input.h" />
+    <ClInclude Include="..\src\Engine\json.hpp" />
+    <ClInclude Include="..\src\Engine\Math\Maths.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix2.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix3.h" />
+    <ClInclude Include="..\src\Engine\Math\Quat.h" />
+    <ClInclude Include="..\src\Engine\Math\TMatrix.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector2.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector4.h" />
+    <ClInclude Include="..\src\Engine\OpenGLUtils.h" />
+    <ClInclude Include="..\src\Engine\Shader\Shader.h" />
+    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h" />
+    <ClInclude Include="..\src\Examples\Quaternion\CameraControllerRot.h" />
+    <ClInclude Include="..\src\Examples\Quaternion\Quaternion.h" />
+    <ClInclude Include="..\src\Examples\Tangram3D\CameraController.h" />
+    <ClInclude Include="..\src\Examples\Tangram3D\Cube.h" />
+    <ClInclude Include="..\src\Examples\Tangram3D\Parallelogram3D.h" />
+    <ClInclude Include="..\src\Examples\Tangram3D\Tangram3D.h" />
+    <ClInclude Include="..\src\Examples\Tangram3D\Triangle3D.h" />
+    <ClInclude Include="..\src\Examples\Tangram\Parallelogram.h" />
+    <ClInclude Include="..\src\Examples\Tangram\Square.h" />
+    <ClInclude Include="..\src\Examples\Tangram\Tangram.h" />
+    <ClInclude Include="..\src\Examples\Tangram\Triangle.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
diff --git a/3Engine/3Engine.vcxproj.filters b/3Engine/3Engine.vcxproj.filters
index 8a3ad22..3f9632e 100644
--- a/3Engine/3Engine.vcxproj.filters
+++ b/3Engine/3Engine.vcxproj.filters
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
@@ -19,191 +11,215 @@
     <Filter Include="Shaders\SimpleColor">
       <UniqueIdentifier>{ff81e1aa-6659-4321-a1b3-9f04a393d0e1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Engine">
+      <UniqueIdentifier>{be732140-19c3-4645-890e-9f0a7e4b418d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Executable">
+      <UniqueIdentifier>{f0e75ec0-c3fc-44e6-b74b-11d6c04a0ea0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\config\RuntimeConfig.json">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\config\SetupConfig.json">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\shaders\SimpleColor\fragment.glsl">
+      <Filter>Shaders\SimpleColor</Filter>
+    </None>
+    <None Include="..\shaders\SimpleColor\vertex.glsl">
+      <Filter>Shaders\SimpleColor</Filter>
+    </None>
+    <None Include="..\shaders\Tangram.json">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="..\shaders\Wireframe.json">
+      <Filter>Shaders</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Math\Maths.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Camera\Camera.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix2.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix3.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Vector.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Engine.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Vector2.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Input.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Vector4.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Maths.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Matrix.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\main.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Shader\Shader.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Shader\ShaderProgram.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Quat.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Tangram.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Vector.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Triangle.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Vector2.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Parallelogram.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Math\Vector4.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Square.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Shader\Shader.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Camera\Camera.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp">
+      <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Camera\LookAt.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Quaternion\CameraControllerRot.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Camera\Ortho.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Quaternion\Quaternion.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Camera\Perspective.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram\Parallelogram.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Input.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram\Square.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram3D\Tangram3D.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram\Tangram.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram3D\Triangle3D.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram\Triangle.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram3D\CameraController.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram3D\CameraController.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram3D\Cube.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram3D\Cube.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram3D\Parallelogram3D.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\Examples\Tangram3D\Parallelogram3D.cpp">
+      <Filter>Executable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Examples\Tangram3D\Tangram3D.cpp">
+      <Filter>Executable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Examples\Tangram3D\Triangle3D.cpp">
+      <Filter>Executable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Executable</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\config\RuntimeConfig.json">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\config\SetupConfig.json">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\shaders\SimpleColor\fragment.glsl">
-      <Filter>Shaders\SimpleColor</Filter>
-    </None>
-    <None Include="..\shaders\SimpleColor\vertex.glsl">
-      <Filter>Shaders\SimpleColor</Filter>
-    </None>
-    <None Include="..\shaders\Tangram.json">
-      <Filter>Shaders</Filter>
-    </None>
-    <None Include="..\shaders\Wireframe.json">
-      <Filter>Shaders</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\Debug.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Camera\Camera.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Camera\LookAt.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Camera\Ortho.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Camera\Perspective.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Debug.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\json.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Engine.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Maths.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\IActor.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Input.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix2.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\json.hpp">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix3.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Maths.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\TMatrix.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Matrix.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Matrix2.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector2.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Matrix3.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector4.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Quat.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\OpenGLUtils.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\TMatrix.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Shader\Shader.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Vector.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Shader\ShaderProgram.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Vector2.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\IActor.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Math\Vector4.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Tangram.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\OpenGLUtils.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Triangle.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Shader\Shader.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Square.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h">
+      <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Parallelogram.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Quaternion\CameraControllerRot.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Camera\Perspective.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Quaternion\Quaternion.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Camera\Ortho.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram\Parallelogram.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Camera\LookAt.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram\Square.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Camera\Camera.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram\Tangram.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Input.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram\Triangle.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram3D\Parallelogram3D.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram3D\CameraController.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram3D\Tangram3D.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram3D\Cube.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram3D\Triangle3D.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram3D\Parallelogram3D.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram3D\Cube.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram3D\Tangram3D.h">
+      <Filter>Executable</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram3D\CameraController.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\src\Examples\Tangram3D\Triangle3D.h">
+      <Filter>Executable</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/3EngineTests/3EngineTests.vcxproj b/3EngineTests/3EngineTests.vcxproj
index 6f2182b..68556cd 100644
--- a/3EngineTests/3EngineTests.vcxproj
+++ b/3EngineTests/3EngineTests.vcxproj
@@ -19,44 +19,48 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\Debug.h" />
-    <ClInclude Include="..\src\Engine.h" />
-    <ClInclude Include="..\src\IActor.h" />
-    <ClInclude Include="..\src\json.hpp" />
-    <ClInclude Include="..\src\Math\Maths.h" />
-    <ClInclude Include="..\src\Math\Matrix.h" />
-    <ClInclude Include="..\src\Math\Matrix2.h" />
-    <ClInclude Include="..\src\Math\Matrix3.h" />
-    <ClInclude Include="..\src\Math\TMatrix.h" />
-    <ClInclude Include="..\src\Math\Vector.h" />
-    <ClInclude Include="..\src\Math\Vector2.h" />
-    <ClInclude Include="..\src\Math\Vector4.h" />
-    <ClInclude Include="..\src\OpenGLUtils.h" />
-    <ClInclude Include="..\src\Shader\Shader.h" />
-    <ClInclude Include="..\src\Shader\ShaderProgram.h" />
-    <ClInclude Include="..\src\Tangram\Parallelogram.h" />
-    <ClInclude Include="..\src\Tangram\Square.h" />
-    <ClInclude Include="..\src\Tangram\Tangram.h" />
-    <ClInclude Include="..\src\Tangram\Triangle.h" />
+    <ClInclude Include="..\src\Engine\Camera\Camera.h" />
+    <ClInclude Include="..\src\Engine\Camera\LookAt.h" />
+    <ClInclude Include="..\src\Engine\Camera\Ortho.h" />
+    <ClInclude Include="..\src\Engine\Camera\Perspective.h" />
+    <ClInclude Include="..\src\Engine\Debug.h" />
+    <ClInclude Include="..\src\Engine\Engine.h" />
+    <ClInclude Include="..\src\Engine\IActor.h" />
+    <ClInclude Include="..\src\Engine\Input.h" />
+    <ClInclude Include="..\src\Engine\json.hpp" />
+    <ClInclude Include="..\src\Engine\Math\Maths.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix2.h" />
+    <ClInclude Include="..\src\Engine\Math\Matrix3.h" />
+    <ClInclude Include="..\src\Engine\Math\Quat.h" />
+    <ClInclude Include="..\src\Engine\Math\TMatrix.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector2.h" />
+    <ClInclude Include="..\src\Engine\Math\Vector4.h" />
+    <ClInclude Include="..\src\Engine\OpenGLUtils.h" />
+    <ClInclude Include="..\src\Engine\Shader\Shader.h" />
+    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h" />
     <ClInclude Include="..\src\Tests\catch.hpp" />
     <ClInclude Include="..\src\Tests\MatrixTests.h" />
     <ClInclude Include="..\src\Tests\VectorTests.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Engine.cpp" />
-    <ClCompile Include="..\src\Math\Maths.cpp" />
-    <ClCompile Include="..\src\Math\Matrix.cpp" />
-    <ClCompile Include="..\src\Math\Matrix2.cpp" />
-    <ClCompile Include="..\src\Math\Matrix3.cpp" />
-    <ClCompile Include="..\src\Math\Vector.cpp" />
-    <ClCompile Include="..\src\Math\Vector2.cpp" />
-    <ClCompile Include="..\src\Math\Vector4.cpp" />
-    <ClCompile Include="..\src\Shader\Shader.cpp" />
-    <ClCompile Include="..\src\Shader\ShaderProgram.cpp" />
-    <ClCompile Include="..\src\Tangram\Parallelogram.cpp" />
-    <ClCompile Include="..\src\Tangram\Square.cpp" />
-    <ClCompile Include="..\src\Tangram\Tangram.cpp" />
-    <ClCompile Include="..\src\Tangram\Triangle.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\Camera.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp" />
+    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp" />
+    <ClCompile Include="..\src\Engine\Engine.cpp" />
+    <ClCompile Include="..\src\Engine\Input.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Maths.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Quat.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector2.cpp" />
+    <ClCompile Include="..\src\Engine\Math\Vector4.cpp" />
+    <ClCompile Include="..\src\Engine\Shader\Shader.cpp" />
+    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp" />
     <ClCompile Include="..\src\Tests\tests.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
diff --git a/3EngineTests/3EngineTests.vcxproj.filters b/3EngineTests/3EngineTests.vcxproj.filters
index 5968eec..65b037d 100644
--- a/3EngineTests/3EngineTests.vcxproj.filters
+++ b/3EngineTests/3EngineTests.vcxproj.filters
@@ -213,9 +213,6 @@
     <ClCompile Include="..\src\Math\Vector4.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Maths.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\Math\Matrix.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
@@ -234,25 +231,52 @@
     <ClCompile Include="..\src\Math\Vector4.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Shader\Shader.cpp">
+    <ClCompile Include="..\src\Engine\Camera\Camera.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Engine.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Input.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Math\Maths.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Shader\ShaderProgram.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Tangram.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Triangle.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine.cpp">
+    <ClCompile Include="..\src\Engine\Math\Quat.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Parallelogram.cpp">
+    <ClCompile Include="..\src\Engine\Math\Vector.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tangram\Square.cpp">
+    <ClCompile Include="..\src\Engine\Math\Vector2.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Math\Vector4.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Shader\Shader.cpp">
+      <Filter>3Engine Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -575,58 +599,88 @@
     <ClInclude Include="..\src\Engine.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\IActor.h">
+    <ClInclude Include="..\src\Math\Matrix.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\json.hpp">
+    <ClInclude Include="..\src\Math\Matrix2.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\OpenGLUtils.h">
+    <ClInclude Include="..\src\Math\Matrix3.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Maths.h">
+    <ClInclude Include="..\src\Math\TMatrix.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix.h">
+    <ClInclude Include="..\src\Math\Vector.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix2.h">
+    <ClInclude Include="..\src\Math\Vector2.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix3.h">
+    <ClInclude Include="..\src\Math\Vector4.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\TMatrix.h">
+    <ClInclude Include="..\src\Engine\Camera\Camera.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector.h">
+    <ClInclude Include="..\src\Engine\Camera\LookAt.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector2.h">
+    <ClInclude Include="..\src\Engine\Camera\Ortho.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector4.h">
+    <ClInclude Include="..\src\Engine\Camera\Perspective.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Debug.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Engine.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\IActor.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Input.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\json.hpp">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Maths.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Matrix.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Matrix2.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Matrix3.h">
+      <Filter>3Engine Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Quat.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Shader\Shader.h">
+    <ClInclude Include="..\src\Engine\Math\TMatrix.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Shader\ShaderProgram.h">
+    <ClInclude Include="..\src\Engine\Math\Vector.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Tangram.h">
+    <ClInclude Include="..\src\Engine\Math\Vector2.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Triangle.h">
+    <ClInclude Include="..\src\Engine\Math\Vector4.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Debug.h">
+    <ClInclude Include="..\src\Engine\OpenGLUtils.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Parallelogram.h">
+    <ClInclude Include="..\src\Engine\Shader\Shader.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Tangram\Square.h">
+    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
   </ItemGroup>