created input, graphics and game namespaces

[physics.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 6f5ed03..ca17fdf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@ void clean();
 void blockUpdate();
 void updateFPSCounters();
 
-void input();
+void handleInput();
 void update(float);
 void draw();
 
@@ -67,11 +67,11 @@ void init()
 {
     installSignal();
 
-    graphicsInit();
+    graphics::init();
 
-    gameInit();
+    game::init();
 
-    inputInit();
+    input::init();
 
 #ifdef DEBUGGING
     cout << "Initialization Complete" << endl;
@@ -84,11 +84,11 @@ void clean()
     cout << "Cleaning up" << endl;
 #endif
 
-    inputClean();
+    input::clean();
 
-    gameClean();
+    game::clean();
 
-    graphicsClean();
+    graphics::clean();
 }
 
 /// ***** Private Methods *****
@@ -127,7 +127,7 @@ void blockUpdate()
         // run the updates
         for (int i = 1; i <= iupdate_sum; i++)
         {
-            input();
+            handleInput();
             update(time_step*i / 1000);
         }
         // remove the updates that where run from the sum
@@ -155,13 +155,13 @@ void updateFPSCounters()
     }
 }
 
-void input()
+void handleInput()
 {
-    inputUpdate();
+    input::update();
 
-    gameInput();
+    game::input();
 
-    if(wasReleased(SDLK_ESCAPE))
+    if(input::wasReleased(SDLK_ESCAPE))
         is_Running = false;
 }
 
@@ -169,14 +169,14 @@ void update(float time_step)
 {
     update_Count++;
 
-    gameUpdate(time_step);
+    game::update(time_step);
 }
 
 void draw()
 {
     draw_Count++;
 
-    gameDraw();
+    game::draw();
 
     SDL_GL_SwapBuffers();