input system setup, debug header started

[physics.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index df9f490..fd14612 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,17 +2,15 @@
 #include <GL/glu.h>
 #include <SDL/SDL.h>
 
-#include <iostream>
-using std::cerr;
-using std::cout;
-using std::endl;
-
 #include <vector>
 using std::vector;
 
+#include "debug.h"
+
 #include "game.h"
 #include "ticks.h"
 #include "graphics.h"
+#include "input/inputManager.h"
 
 
 /// ***** Private Method Headers *****
@@ -74,11 +72,15 @@ void init()
     // TODO
     // add a game state
 
+#ifdef DEBUGGING
     cout << "Initialization Complete" << endl;
+#endif
 
     // create starting entities
 
+#ifdef DEBUGGING
     cout << "World Created" << endl;
+#endif
 }
 
 void run()
@@ -145,12 +147,12 @@ void updateFPSCounters()
 
 void input()
 {
+    inputUpdate();
+
     gameInput();
 
-    /*
-    if(key[KEY_ESC])
+    if(isPressed(SDLK_ESCAPE))
         is_Running = false;
-    */
 }
 
 void update(float time_step)