From 54adf3ec925001f98f439f0ff688e55dc3387d27 Mon Sep 17 00:00:00 2001
From: Peter Schaefer <schaeferpm@gmail.com>
Date: Mon, 27 Apr 2015 12:27:59 +0200
Subject: [PATCH] moved Scene to own directiory

---
 Weave/Game.cpp                           |  4 ++--
 Weave/{Graphix => Scene}/Scene.cpp       |  4 ++--
 Weave/{Graphix => Scene}/Scene.h         |  4 ++--
 Weave/{Graphix => Scene}/SceneObject.cpp | 10 +++++-----
 Weave/{Graphix => Scene}/SceneObject.h   |  2 +-
 Weave/Weave.vcxproj                      |  8 ++++----
 Weave/Weave.vcxproj.filters              | 24 ++++++++++++------------
 7 files changed, 28 insertions(+), 28 deletions(-)
 rename Weave/{Graphix => Scene}/Scene.cpp (98%)
 rename Weave/{Graphix => Scene}/Scene.h (93%)
 rename Weave/{Graphix => Scene}/SceneObject.cpp (96%)
 rename Weave/{Graphix => Scene}/SceneObject.h (97%)

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index b416b24..5a07f67 100644
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -10,8 +10,8 @@
 #include <assimp/postprocess.h>
 
 #include <GL\glew.h>
-#include "Graphix\Scene.h"
-#include "Graphix\SceneObject.h"
+#include "Scene\Scene.h"
+#include "Scene\SceneObject.h"
 #include "Graphix\Shader.h"
 #include "Graphix\Graphix.h"
 #include "Fps.h"
diff --git a/Weave/Graphix/Scene.cpp b/Weave/Scene/Scene.cpp
similarity index 98%
rename from Weave/Graphix/Scene.cpp
rename to Weave/Scene/Scene.cpp
index 18cefb4..19f8ce9 100644
--- a/Weave/Graphix/Scene.cpp
+++ b/Weave/Scene/Scene.cpp
@@ -1,6 +1,6 @@
 #include "Scene.h"
 
-#include "GLM.h"
+#include "../Graphix/GLM.h"
 #include <GL\glew.h>
 
 #include "../Message.h"
@@ -8,7 +8,7 @@
 
 #include "../Events.h"
 
-#include "Shader.h"
+#include "../Graphix/Shader.h"
 
 #define TIME_TILL_MAX_MOVE 2
 #define TIME_TILL_DIRECTION_ROTATE 1
diff --git a/Weave/Graphix/Scene.h b/Weave/Scene/Scene.h
similarity index 93%
rename from Weave/Graphix/Scene.h
rename to Weave/Scene/Scene.h
index bf395f3..4a2f746 100644
--- a/Weave/Graphix/Scene.h
+++ b/Weave/Scene/Scene.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ViewPort.h"
+#include "../Graphix/ViewPort.h"
 #include "SceneObject.h"
-#include "GLM.h"
+#include "../Graphix/GLM.h"
 
 #include <list>
 #include <set>
diff --git a/Weave/Graphix/SceneObject.cpp b/Weave/Scene/SceneObject.cpp
similarity index 96%
rename from Weave/Graphix/SceneObject.cpp
rename to Weave/Scene/SceneObject.cpp
index 1e1948b..839205a 100644
--- a/Weave/Graphix/SceneObject.cpp
+++ b/Weave/Scene/SceneObject.cpp
@@ -1,20 +1,20 @@
 #include "SceneObject.h"
 
 #include <gl/glew.h>
-#include "GLM.h"
+#include "../Graphix/GLM.h"
 
 #include "../Message.h"
 #include <string>
 
 #include <iostream>
 
-#include "Shader.h"
+#include "../Graphix/Shader.h"
 #include "Scene.h"
-#include "Texture.h"
+#include "../Graphix/Texture.h"
 
-#include "Model.h"
+#include "../Graphix/Model.h"
 
-#include "Graphix.h"
+#include "../Graphix/Graphix.h"
 
 #include "../Events.h"
 
diff --git a/Weave/Graphix/SceneObject.h b/Weave/Scene/SceneObject.h
similarity index 97%
rename from Weave/Graphix/SceneObject.h
rename to Weave/Scene/SceneObject.h
index 9d11ad7..acba06d 100644
--- a/Weave/Graphix/SceneObject.h
+++ b/Weave/Scene/SceneObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GLM.h"
+#include "../Graphix/GLM.h"
 
 #include <string>
 
diff --git a/Weave/Weave.vcxproj b/Weave/Weave.vcxproj
index 9e00615..11170a8 100644
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -100,8 +100,8 @@
     <ClCompile Include="Graphix\GLM.cpp" />
     <ClCompile Include="Graphix\Graphix.cpp" />
     <ClCompile Include="Graphix\Model\IMesh.cpp" />
-    <ClCompile Include="Graphix\Scene.cpp" />
-    <ClCompile Include="Graphix\SceneObject.cpp" />
+    <ClCompile Include="Scene\Scene.cpp" />
+    <ClCompile Include="Scene\SceneObject.cpp" />
     <ClCompile Include="Graphix\Shader.cpp" />
     <ClCompile Include="Graphix\Model\SkyBox.cpp" />
     <ClCompile Include="Graphix\Texture.cpp" />
@@ -121,8 +121,8 @@
     <ClInclude Include="Graphix\GLM.h" />
     <ClInclude Include="Graphix\Graphix.h" />
     <ClInclude Include="Graphix\Model\IMesh.h" />
-    <ClInclude Include="Graphix\Scene.h" />
-    <ClInclude Include="Graphix\SceneObject.h" />
+    <ClInclude Include="Scene\Scene.h" />
+    <ClInclude Include="Scene\SceneObject.h" />
     <ClInclude Include="Graphix\Shader.h" />
     <ClInclude Include="Graphix\Model\SkyBox.h" />
     <ClInclude Include="Graphix\Texture.h" />
diff --git a/Weave/Weave.vcxproj.filters b/Weave/Weave.vcxproj.filters
index 1bca2f2..5a064c7 100644
--- a/Weave/Weave.vcxproj.filters
+++ b/Weave/Weave.vcxproj.filters
@@ -45,12 +45,6 @@
     <ClCompile Include="Game.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Graphix\Scene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphix\SceneObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Graphix\Model\IMesh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -66,6 +60,12 @@
     <ClCompile Include="Graphix\Model\SkyBox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Scene\Scene.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Scene\SceneObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Fps.h">
@@ -98,12 +98,6 @@
     <ClInclude Include="Game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Graphix\Scene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphix\SceneObject.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Graphix\Model\IMesh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -122,5 +116,11 @@
     <ClInclude Include="Graphix\Model.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Scene\SceneObject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Scene\Scene.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.47.3