From fd20b66a77db58daae2fcecc2c4ff2dc5dc7fcd5 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Mon, 3 Mar 2014 20:20:16 +0100
Subject: [PATCH] Fakken filters.

---
 .../Escape-the-Dawn.vcxproj.filters           | 134 ++++++------------
 Escape-the-Dawn/main.cpp                      |  20 ---
 2 files changed, 42 insertions(+), 112 deletions(-)

diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
index b3de42a..ad44b19 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
@@ -1,124 +1,63 @@
 <?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;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>
-    </Filter>
-    <Filter Include="Header Files\Components">
-      <UniqueIdentifier>{9af04489-86da-41b7-aaba-12d5b6653660}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Renderer">
-      <UniqueIdentifier>{7abbf0e9-8bda-475e-bf00-a347f396b892}</UniqueIdentifier>
-    <Filter Include="Header Files\Systems">
-      <UniqueIdentifier>{aca68cba-a16a-4975-8ff3-4d56b88373a1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Renderer">
-      <UniqueIdentifier>{091f6f01-79ab-4a49-9639-c7185e89c84e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Shaders">
-      <UniqueIdentifier>{26dccea6-3d9c-4d5f-9db2-98621e35ffcb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Systems">
-      <UniqueIdentifier>{e7de2e5a-0a73-437a-8d01-5f23770e5cba}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Systems">
-      <UniqueIdentifier>{7673cacc-e435-4028-9354-b2c8b559c7b3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="Renderer\Renderer.cpp" />
+    <ClCompile Include="World.cpp" />
     <ClCompile Include="Systems\CollisionSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
-    </ClCompile>
-    <ClCompile Include="Systems\InputSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClCompile>
     <ClCompile Include="Systems\LevelGenerationSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
+      <Filter>Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="Systems\InputSystem.cpp">
+      <Filter>Systems</Filter>
     </ClCompile>
     <ClCompile Include="Systems\ParticleSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClCompile>
     <ClCompile Include="Systems\PlayerSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClCompile>
     <ClCompile Include="Systems\RenderSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClCompile>
     <ClCompile Include="Systems\SoundsSystem.cpp">
-      <Filter>Source Files\Systems</Filter>
-    </ClCompile>
-    <ClCompile Include="Renderer\Renderer.cpp">
-      <Filter>Source Files\Renderer</Filter>
-    <ClCompile Include="World.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Systems\CollisionSystem.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Systems</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="glerror.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="logging.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="World.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Component.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Entity.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Components\Transform.h">
-      <Filter>Header Files\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="ComponentFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <ClInclude Include="Component.h" />
+    <ClInclude Include="ComponentFactory.h" />
+    <ClInclude Include="Entity.h" />
+    <ClInclude Include="logging.h" />
+    <ClInclude Include="glerror.h" />
+    <ClInclude Include="Renderer\Renderer.h" />
+    <ClInclude Include="System.h" />
+    <ClInclude Include="World.h" />
     <ClInclude Include="Systems\CollisionSystem.h">
-      <Filter>Header Files\Systems</Filter>
-    </ClInclude>
-    <ClInclude Include="Systems\CollisionSystem.h">
-      <Filter>Header Files\Systems</Filter>
-    </ClInclude>
-    <ClInclude Include="Systems\InputSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClInclude>
     <ClInclude Include="Systems\LevelGenerationSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="Systems\InputSystem.h">
+      <Filter>Systems</Filter>
     </ClInclude>
     <ClInclude Include="Systems\ParticleSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClInclude>
     <ClInclude Include="Systems\PlayerSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClInclude>
     <ClInclude Include="Systems\RenderSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClInclude>
     <ClInclude Include="Systems\SoundSystem.h">
-      <Filter>Header Files\Systems</Filter>
+      <Filter>Systems</Filter>
     </ClInclude>
-    <ClInclude Include="Renderer\Renderer.h">
-      <Filter>Header Files\Renderer</Filter>
+    <ClInclude Include="Components\Transform.h">
+      <Filter>Components</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -129,4 +68,15 @@
       <Filter>Shaders</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Systems">
+      <UniqueIdentifier>{657e11f4-52e7-4336-b77f-80f00b85c33f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Components">
+      <UniqueIdentifier>{59929465-a139-43b9-9c75-48121d156e78}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Shaders">
+      <UniqueIdentifier>{54f1eb6f-dc00-4e97-a3ef-ac255d755e2e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Escape-the-Dawn/main.cpp b/Escape-the-Dawn/main.cpp
index c9a4f93..c9bc467 100644
--- a/Escape-the-Dawn/main.cpp
+++ b/Escape-the-Dawn/main.cpp
@@ -17,26 +17,6 @@ GLchar* glVendor;
 
 int main(int argc, char* argv[])
 {
-	World world;
-
-	EntityID ent1 = world.CreateEntity();
-	auto t1 = world.AddComponent<Components::Transform>(ent1, "Transform");
-	t1->Position[0] = 1.0f;
-	t1->Position[1] = 1.0f;
-	t1->Position[2] = 1.0f;
-	EntityID ent2 = world.CreateEntity(ent1);
-	auto t2 = world.AddComponent<Components::Transform>(ent2, "Transform");
-	t2->Position[0] = 1.0f;
-	t2->Position[1] = 1.0f;
-	t2->Position[2] = 1.0f;
-
-	world.Update(0.0);
-
-	LOG_INFO("ent1: %f %f %f", t1->Position[0], t1->Position[1], t1->Position[2]);
-	LOG_INFO("ent2: %f %f %f", t2->Position[0], t2->Position[1], t2->Position[2]);
-
-	return 0;
-
 	// Initialize GLFW
 	if (!glfwInit())
 	{