Added windows support.

RicardoEPRodrigues · Nov 16, 2017 · 8440755 · 8440755
1 parent 1e54c31
commit 8440755
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 87 deletions.
diff --git a/3Engine/3Engine.vcxproj b/3Engine/3Engine.vcxproj
@@ -44,6 +44,7 @@
     <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\SceneManagement\SceneGraph.cpp" />
     <ClCompile Include="..\src\Engine\Shader\Shader.cpp" />
     <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp" />
     <ClCompile Include="..\src\Engine\Shapes\Cube.cpp" />
@@ -56,7 +57,7 @@
     <ClCompile Include="..\src\Engine\Shapes\Triangle3D.cpp" />
     <ClCompile Include="..\src\Engine\Time\GlutTimeCalculator.cpp" />
     <ClCompile Include="..\src\Engine\Time\Time.cpp" />
-    <ClCompile Include="..\src\Engine\SceneManagement\SceneGraph.cpp" />
+    <ClCompile Include="..\src\Engine\Utilities\Simulation.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\Engine\Actor.h" />
@@ -80,6 +81,7 @@
     <ClInclude Include="..\src\Engine\Math\Vector2.h" />
     <ClInclude Include="..\src\Engine\Math\Vector4.h" />
     <ClInclude Include="..\src\Engine\OpenGLUtils.h" />
+    <ClInclude Include="..\src\Engine\SceneManagement\SceneGraph.h" />
     <ClInclude Include="..\src\Engine\Shader\Shader.h" />
     <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h" />
     <ClInclude Include="..\src\Engine\Shapes\Cube.h" />
@@ -93,10 +95,10 @@
     <ClInclude Include="..\src\Engine\Time\GlutTimeCalculator.h" />
     <ClInclude Include="..\src\Engine\Time\Time.h" />
     <ClInclude Include="..\src\Engine\Utilities\json.hpp" />
-    <ClInclude Include="..\src\Engine\Utilities\singleton.h" />
-    <ClInclude Include="..\src\Engine\SceneManagement\SceneGraph.h" />
     <ClInclude Include="..\src\Engine\Utilities\Manager.h" />
     <ClInclude Include="..\src\Engine\Utilities\Managers.h" />
+    <ClInclude Include="..\src\Engine\Utilities\Simulation.h" />
+    <ClInclude Include="..\src\Engine\Utilities\singleton.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>

diff --git a/3Engine/3Engine.vcxproj.filters b/3Engine/3Engine.vcxproj.filters
@@ -36,210 +36,216 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Engine\Actor.cpp">
+    <ClCompile Include="..\src\Engine\SceneManagement\SceneGraph.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Camera\Camera.cpp">
+    <ClCompile Include="..\src\Engine\Shader\Shader.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp">
+    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Cube.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Mesh.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Controllers\FreeCameraController.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\MeshLoader.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Controllers\SphereCameraController.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Parallelogram.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Engine.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Parallelogram3D.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Input.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Square.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Maths.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Triangle.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Matrix.cpp">
+    <ClCompile Include="..\src\Engine\Shapes\Triangle3D.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp">
+    <ClCompile Include="..\src\Engine\Time\GlutTimeCalculator.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp">
+    <ClCompile Include="..\src\Engine\Time\Time.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Quat.cpp">
+    <ClCompile Include="..\src\Engine\Utilities\Simulation.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Vector.cpp">
+    <ClCompile Include="..\src\Engine\Actor.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Vector2.cpp">
+    <ClCompile Include="..\src\Engine\Engine.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Math\Vector4.cpp">
+    <ClCompile Include="..\src\Engine\Input.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shader\Shader.cpp">
+    <ClCompile Include="..\src\Engine\Camera\Camera.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shader\ShaderProgram.cpp">
+    <ClCompile Include="..\src\Engine\Camera\LookAt.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Cube.cpp">
+    <ClCompile Include="..\src\Engine\Camera\Ortho.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Mesh.cpp">
+    <ClCompile Include="..\src\Engine\Camera\Perspective.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\MeshLoader.cpp">
+    <ClCompile Include="..\src\Engine\Controllers\FreeCameraController.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Parallelogram.cpp">
+    <ClCompile Include="..\src\Engine\Controllers\SphereCameraController.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Parallelogram3D.cpp">
+    <ClCompile Include="..\src\Engine\Math\Maths.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Square.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Triangle.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix2.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Shapes\Triangle3D.cpp">
+    <ClCompile Include="..\src\Engine\Math\Matrix3.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Time\GlutTimeCalculator.cpp">
+    <ClCompile Include="..\src\Engine\Math\Quat.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\Time\Time.cpp">
+    <ClCompile Include="..\src\Engine\Math\Vector.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Engine\SceneManagement\SceneGraph.cpp">
+    <ClCompile Include="..\src\Engine\Math\Vector2.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Engine\Math\Vector4.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\Engine\Actor.h">
+    <ClInclude Include="..\src\Engine\SceneManagement\SceneGraph.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Camera\Camera.h">
+    <ClInclude Include="..\src\Engine\Shader\Shader.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Camera\LookAt.h">
+    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Camera\Ortho.h">
+    <ClInclude Include="..\src\Engine\Shapes\Cube.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Camera\Perspective.h">
+    <ClInclude Include="..\src\Engine\Shapes\Mesh.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Controllers\FreeCameraController.h">
+    <ClInclude Include="..\src\Engine\Shapes\MeshLoader.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Controllers\SphereCameraController.h">
+    <ClInclude Include="..\src\Engine\Shapes\Parallelogram.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Debug.h">
+    <ClInclude Include="..\src\Engine\Shapes\Parallelogram3D.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Engine.h">
+    <ClInclude Include="..\src\Engine\Shapes\Square.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\IDrawable.h">
+    <ClInclude Include="..\src\Engine\Shapes\Triangle.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Input.h">
+    <ClInclude Include="..\src\Engine\Shapes\Triangle3D.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Maths.h">
+    <ClInclude Include="..\src\Engine\Time\GlutTimeCalculator.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Matrix.h">
+    <ClInclude Include="..\src\Engine\Time\Time.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Matrix2.h">
+    <ClInclude Include="..\src\Engine\Utilities\json.hpp">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Matrix3.h">
+    <ClInclude Include="..\src\Engine\Utilities\Manager.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Quat.h">
+    <ClInclude Include="..\src\Engine\Utilities\Managers.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\TMatrix.h">
+    <ClInclude Include="..\src\Engine\Utilities\Simulation.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Vector.h">
+    <ClInclude Include="..\src\Engine\Utilities\singleton.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Vector2.h">
+    <ClInclude Include="..\src\Engine\Actor.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Math\Vector4.h">
+    <ClInclude Include="..\src\Engine\Debug.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\OpenGLUtils.h">
+    <ClInclude Include="..\src\Engine\Engine.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shader\Shader.h">
+    <ClInclude Include="..\src\Engine\IDrawable.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shader\ShaderProgram.h">
+    <ClInclude Include="..\src\Engine\Input.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Cube.h">
+    <ClInclude Include="..\src\Engine\OpenGLUtils.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Mesh.h">
+    <ClInclude Include="..\src\Engine\Camera\Camera.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\MeshLoader.h">
+    <ClInclude Include="..\src\Engine\Camera\LookAt.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Parallelogram.h">
+    <ClInclude Include="..\src\Engine\Camera\Ortho.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Parallelogram3D.h">
+    <ClInclude Include="..\src\Engine\Camera\Perspective.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Square.h">
+    <ClInclude Include="..\src\Engine\Controllers\FreeCameraController.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Triangle.h">
+    <ClInclude Include="..\src\Engine\Controllers\SphereCameraController.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Shapes\Triangle3D.h">
+    <ClInclude Include="..\src\Engine\Math\Maths.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Time\GlutTimeCalculator.h">
+    <ClInclude Include="..\src\Engine\Math\Matrix.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Time\Time.h">
+    <ClInclude Include="..\src\Engine\Math\Matrix2.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Utilities\json.hpp">
+    <ClInclude Include="..\src\Engine\Math\Matrix3.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Utilities\singleton.h">
+    <ClInclude Include="..\src\Engine\Math\Quat.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Utilities\Managers.h">
+    <ClInclude Include="..\src\Engine\Math\TMatrix.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\Utilities\Manager.h">
+    <ClInclude Include="..\src\Engine\Math\Vector.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Engine\SceneManagement\SceneGraph.h">
+    <ClInclude Include="..\src\Engine\Math\Vector2.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Engine\Math\Vector4.h">
       <Filter>Engine</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/3EngineExecutable/3EngineExecutable.vcxproj b/3EngineExecutable/3EngineExecutable.vcxproj
@@ -24,17 +24,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\Executable\LoaderAndScene\ColoredActor.cpp" />
     <ClCompile Include="..\src\Executable\LoaderAndScene\LoaderAndScene.cpp" />
+    <ClCompile Include="..\src\Executable\LoaderAndScene\MoveController.cpp" />
+    <ClCompile Include="..\src\Executable\LoaderAndScene\TangramAnimation.cpp" />
     <ClCompile Include="..\src\Executable\main.cpp" />
-    <ClCompile Include="..\src\Executable\Quaternion\Quaternion.cpp" />
-    <ClCompile Include="..\src\Executable\Tangram3D\Tangram3D.cpp" />
-    <ClCompile Include="..\src\Executable\Tangram\Tangram.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\src\Executable\LoaderAndScene\ColoredActor.h" />
     <ClInclude Include="..\src\Executable\LoaderAndScene\LoaderAndScene.h" />
-    <ClInclude Include="..\src\Executable\Quaternion\Quaternion.h" />
-    <ClInclude Include="..\src\Executable\Tangram3D\Tangram3D.h" />
-    <ClInclude Include="..\src\Executable\Tangram\Tangram.h" />
+    <ClInclude Include="..\src\Executable\LoaderAndScene\MoveController.h" />
+    <ClInclude Include="..\src\Executable\LoaderAndScene\TangramAnimation.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>

diff --git a/3EngineExecutable/3EngineExecutable.vcxproj.filters b/3EngineExecutable/3EngineExecutable.vcxproj.filters
@@ -10,33 +10,33 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Executable\LoaderAndScene\LoaderAndScene.cpp">
+    <ClCompile Include="..\src\Executable\LoaderAndScene\ColoredActor.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Executable\main.cpp">
+    <ClCompile Include="..\src\Executable\LoaderAndScene\LoaderAndScene.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Executable\Quaternion\Quaternion.cpp">
+    <ClCompile Include="..\src\Executable\LoaderAndScene\MoveController.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Executable\Tangram\Tangram.cpp">
+    <ClCompile Include="..\src\Executable\LoaderAndScene\TangramAnimation.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Executable\Tangram3D\Tangram3D.cpp">
+    <ClCompile Include="..\src\Executable\main.cpp">
       <Filter>Source</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\Executable\LoaderAndScene\LoaderAndScene.h">
+    <ClInclude Include="..\src\Executable\LoaderAndScene\ColoredActor.h">
       <Filter>Source</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Executable\Quaternion\Quaternion.h">
+    <ClInclude Include="..\src\Executable\LoaderAndScene\LoaderAndScene.h">
       <Filter>Source</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Executable\Tangram\Tangram.h">
+    <ClInclude Include="..\src\Executable\LoaderAndScene\MoveController.h">
       <Filter>Source</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Executable\Tangram3D\Tangram3D.h">
+    <ClInclude Include="..\src\Executable\LoaderAndScene\TangramAnimation.h">
       <Filter>Source</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/Engine/Utilities/Simulation.h b/src/Engine/Utilities/Simulation.h
@@ -6,7 +6,7 @@
 #ifndef THREEENGINE_SIMULATION_H
 #define THREEENGINE_SIMULATION_H
 
-#include <Engine/Time/Time.h>
+#include "../Time/Time.h"
 #include <vector>
 #include <memory>
 #include "singleton.h"