created input, graphics and game namespaces

[physics.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index ebf2ba7..26fd83b 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -5,12 +5,14 @@
 using std::vector;
 
 #include "entityCreator.h"
+#include "effectManager.h"
 
 #include "GameStates/GameState.h"
 #include "GameStates/Running.h"
 #include "GameStates/Paused.h"
 #include "GameStates/CreatingPolygon.h"
 
+
 /// ***** Private Variables *****
 
 // The stack of active game states
@@ -24,7 +26,8 @@ CreatingPolygon* creating_Polygon;
 
 
 /// ***** Public Methods *****
-void gameInit()
+
+void game::init()
 {
     running = new Running();
     paused = new Paused();
@@ -35,13 +38,17 @@ void gameInit()
 
     active_States.push_back(running);
 
+    effect::init();
+
 #ifdef DEBUGGING
     cout << "World Created" << endl;
 #endif
 }
 
-void gameClean()
+void game::clean()
 {
+    effect::clean();
+
     creator::clean();
 
     delete creating_Polygon;
@@ -49,7 +56,7 @@ void gameClean()
     delete running;
 }
 
-void gameInput()
+void game::input()
 {
     int last = active_States.size() -1;
     for( int i = 0;
@@ -63,7 +70,7 @@ void gameInput()
     }
 }
 
-void gameUpdate(float time_step)
+void game::update(float time_step)
 {
     int last = active_States.size() -1;
     for( int i = 0;
@@ -77,7 +84,7 @@ void gameUpdate(float time_step)
     }
 }
 
-void gameDraw()
+void game::draw()
 {
     int last = active_States.size() -1;
     for( int i = 0;