diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-20 23:04:37 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-20 23:04:37 +0200 |
commit | 34a11021daca9d6b51e8cc29c1562a75815df7b3 (patch) | |
tree | 7d1427b27337d32224cf66cc114adf4f3665bbee /src/graphics/engine/planet.h | |
parent | 191fdc614ed8022c145d3530f9d412e715ae37db (diff) | |
parent | e25823f98437461826b52521bcf9d70eb11a00b3 (diff) | |
download | colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.gz colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.bz2 colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.zip |
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
Diffstat (limited to 'src/graphics/engine/planet.h')
-rw-r--r-- | src/graphics/engine/planet.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/graphics/engine/planet.h b/src/graphics/engine/planet.h index fd119f6..82c3aea 100644 --- a/src/graphics/engine/planet.h +++ b/src/graphics/engine/planet.h @@ -17,12 +17,14 @@ /** * \file graphics/engine/planet.h - * \brief Planet rendering - Gfx::CPlanet class + * \brief Planet rendering - CPlanet class */ #pragma once + #include "common/event.h" + #include "math/point.h" #include <vector> @@ -31,6 +33,7 @@ class CInstanceManager; +// Graphics module namespace namespace Gfx { class CEngine; @@ -79,7 +82,7 @@ struct Planet class CPlanet { public: - CPlanet(CInstanceManager* iMan, Gfx::CEngine* engine); + CPlanet(CInstanceManager* iMan, CEngine* engine); ~CPlanet(); //! Removes all the planets @@ -107,12 +110,13 @@ protected: protected: CInstanceManager* m_iMan; - Gfx::CEngine* m_engine; + CEngine* m_engine; float m_time; int m_mode; - std::vector<Gfx::Planet> m_planet[2]; + std::vector<Planet> m_planet[2]; bool m_planetExist; }; -}; // namespace Gfx + +} // namespace Gfx |