diff options
| author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-23 18:13:50 +0200 |
|---|---|---|
| committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-23 18:13:50 +0200 |
| commit | c478aeeb9b7b40bfd3415500b4886c0c0542bc26 (patch) | |
| tree | f691b29446413ee164689651fb8b1e2a350c2c50 /engine/application.h | |
| parent | 332bfa22a6319cacee88883ef177ff2b52b509c0 (diff) | |
Added Stage-class.
Diffstat (limited to 'engine/application.h')
| -rw-r--r-- | engine/application.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engine/application.h b/engine/application.h index 4bf9251..3f58f87 100644 --- a/engine/application.h +++ b/engine/application.h @@ -5,10 +5,11 @@ #include <FTGL/ftgl.h> #include <vector> +#include "stage.h" + #include "bulletpattern.h" #include "shader.h" #include "texture.h" -#include "player.h" class Application { private: @@ -17,20 +18,16 @@ class Application { bool paused; unsigned int lasttick; - unsigned int elapsed; unsigned int frames; unsigned int lastframes; float fps; FTFont* font; Texture* background; - Texture* texture; - GLShaderProgram* shader; - Player *player; - std::vector<BulletPattern*> patterns; + public: + Stage* stage; - public: Application(); ~Application(); void run(); @@ -39,7 +36,7 @@ class Application { protected: virtual void event_keypress(SDLKey key); - void main_loop(unsigned int tick, unsigned int step); + void main_loop(unsigned int tick); }; #endif |