From 428c401f9c1053f7e13ffe641758dfb72791d8dc Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 26 Jun 2015 19:59:28 -0400
Subject: Player now moves

---
 src/main.cpp | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index dcf8d87..35749f5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,10 +3,7 @@
 #include <cstdlib>
 #include "renderer.h"
 #include "muxer.h"
-#include "entity_manager.h"
-#include "components/sprite_renderable.h"
-#include "components/transformable.h"
-#include "systems/rendering.h"
+#include "game.h"
 
 int main()
 {
@@ -19,24 +16,8 @@ int main()
   
   // Put this in a block so game goes out of scope before we destroy the renderer
   {
-    EntityManager manager;
-    
-    int player = manager.emplaceEntity();
-    manager.emplaceComponent<SpriteRenderableComponent>(player, "res/Starla.png", 10, 12, 6);
-    manager.emplaceComponent<TransformableComponent>(player, 203, 44, 10, 12);
-    
-    std::list<std::unique_ptr<System>> loop;
-    loop.push_back(std::unique_ptr<System>(new RenderingSystem()));
-    
-    while (!glfwWindowShouldClose(window))
-    {
-      for (auto& sys : loop)
-      {
-        sys->tick(manager, 1.0);
-      }
-      
-      glfwPollEvents();
-    }
+    Game game {window};
+    game.execute();
   }
   
   destroyMuxer();
-- 
cgit 1.4.1