created input, graphics and game namespaces

[physics.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index 32a9e0b..26fd83b 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,16 +1,18 @@
+#include "game.h"
+#include "debug.h"
+
 #include <vector>
 using std::vector;
 
-#include "game.h"
-
-#include "debug.h"
 #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,23 +26,29 @@ CreatingPolygon* creating_Polygon;
 
 
 /// ***** Public Methods *****
-void gameInit()
+
+void game::init()
 {
     running = new Running();
     paused = new Paused();
     creating_Polygon = new CreatingPolygon();
 
     // create starting entities
-
     creator::init();
 
+    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;
@@ -48,43 +56,42 @@ void gameClean()
     delete running;
 }
 
-void gameInput()
+void game::input()
 {
-    int size = active_States.size();
+    int last = active_States.size() -1;
     for( int i = 0;
-         i < size;
+         i <= last;
          i++ )
     {
-        if( i-1 == size )
+        if( i == last )
             active_States[i]->handleInput(true);
         else
             active_States[i]->handleInput(false);
     }
-
 }
 
-void gameUpdate(float time_step)
+void game::update(float time_step)
 {
-    int size = active_States.size();
+    int last = active_States.size() -1;
     for( int i = 0;
-         i < size;
+         i <= last;
          i++ )
     {
-        if( i-1 == size )
+        if( i == last )
             active_States[i]->update(time_step, true);
         else
             active_States[i]->update(time_step, false);
     }
 }
 
-void gameDraw()
+void game::draw()
 {
-    int size = active_States.size();
+    int last = active_States.size() -1;
     for( int i = 0;
-         i < size;
+         i <= last;
          i++ )
     {
-        if( i-1 == size )
+        if( i == last )
             active_States[i]->draw(true);
         else
             active_States[i]->draw(false);