scene so that g_scene can be deprecated later.master
| @@ -39,9 +39,9 @@ void Neercs::TickGame(float seconds) | |||||
| WorldEntity::TickGame(seconds); | WorldEntity::TickGame(seconds); | ||||
| } | } | ||||
| void Neercs::TickDraw(float seconds) | |||||
| void Neercs::TickDraw(float seconds, Scene &scene) | |||||
| { | { | ||||
| WorldEntity::TickDraw(seconds); | |||||
| WorldEntity::TickDraw(seconds, scene); | |||||
| } | } | ||||
| Neercs::~Neercs() | Neercs::~Neercs() | ||||
| @@ -27,7 +27,7 @@ public: | |||||
| protected: | protected: | ||||
| virtual void TickGame(float seconds); | virtual void TickGame(float seconds); | ||||
| virtual void TickDraw(float seconds); | |||||
| virtual void TickDraw(float seconds, Scene &scene); | |||||
| private: | private: | ||||
| Term *m_term; | Term *m_term; | ||||
| @@ -165,9 +165,9 @@ void Term::TickGame(float seconds) | |||||
| #endif | #endif | ||||
| } | } | ||||
| void Term::TickDraw(float seconds) | |||||
| void Term::TickDraw(float seconds, Scene &scene) | |||||
| { | { | ||||
| Entity::TickDraw(seconds); | |||||
| Entity::TickDraw(seconds, scene); | |||||
| } | } | ||||
| Term::~Term() | Term::~Term() | ||||
| @@ -92,7 +92,7 @@ public: | |||||
| protected: | protected: | ||||
| virtual void TickGame(float seconds); | virtual void TickGame(float seconds); | ||||
| virtual void TickDraw(float seconds); | |||||
| virtual void TickDraw(float seconds, Scene &scene); | |||||
| private: | private: | ||||
| /* Terminal emulation main entry point */ | /* Terminal emulation main entry point */ | ||||
| @@ -1078,7 +1078,7 @@ void Render::Pause() | |||||
| m_pause=!m_pause; | m_pause=!m_pause; | ||||
| } | } | ||||
| void Render::TickDraw(float seconds) | |||||
| void Render::TickDraw(float seconds, Scene &scene) | |||||
| { | { | ||||
| /* keyboard manager */ | /* keyboard manager */ | ||||
| #if 0 | #if 0 | ||||
| @@ -1379,7 +1379,7 @@ void Render::TickDraw(float seconds) | |||||
| } | } | ||||
| #endif | #endif | ||||
| Entity::TickDraw(seconds); | |||||
| Entity::TickDraw(seconds, scene); | |||||
| if (!m_ready) | if (!m_ready) | ||||
| { | { | ||||
| @@ -15,7 +15,7 @@ public: | |||||
| protected: | protected: | ||||
| virtual void TickGame(float seconds); | virtual void TickGame(float seconds); | ||||
| virtual void TickDraw(float seconds); | |||||
| virtual void TickDraw(float seconds, Scene &scene); | |||||
| void Draw2D(); | void Draw2D(); | ||||
| void Draw3D(); | void Draw3D(); | ||||