From 77be863f4f15d2481a64e4e8dadb4060a6e4e590 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 11 Feb 2018 12:34:52 -0500
Subject: Implemented map rendering and basic collision

Only wall and platform collision currently works, and map edges are not currently implemented.
---
 src/game.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/game.h')

diff --git a/src/game.h b/src/game.h
index 7bd038e..346d67e 100644
--- a/src/game.h
+++ b/src/game.h
@@ -4,6 +4,7 @@
 #include "renderer.h"
 #include "entity_manager.h"
 #include "system_manager.h"
+#include "world.h"
 
 class Game {
 public:
@@ -22,6 +23,11 @@ public:
     return systemManager_;
   }
 
+  inline const World& getWorld()
+  {
+    return world_;
+  }
+
   friend void key_callback(
     GLFWwindow* window,
     int key,
@@ -31,9 +37,10 @@ public:
 
 private:
 
+  GLFWwindow* const window_;
   EntityManager entityManager_;
   SystemManager systemManager_;
-  GLFWwindow* const window_;
+  World world_;
   bool shouldQuit_ = false;
 };
 
-- 
cgit 1.4.1