diff options
| author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
|---|---|---|
| committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
| commit | 7bce8f073c9212247d104266d417e46e884b72c2 (patch) | |
| tree | 89da914094bf7d0e92c5da1e14e9e4298340c799 /src/graphics/engine/engine.h | |
| parent | 36ae984ac77c5545d3d11dde7e37913a8eff0b0d (diff) | |
| parent | da5d4edeb3a41462ec987cb4994a6897823f3f76 (diff) | |
| download | colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.gz colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.bz2 colobot-7bce8f073c9212247d104266d417e46e884b72c2.zip | |
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
src/ui/slider.cpp
Diffstat (limited to 'src/graphics/engine/engine.h')
| -rw-r--r-- | src/graphics/engine/engine.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 1ce93a3..01a1dee 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -991,10 +991,10 @@ public: //! Management of the background image to use void SetBackground(const std::string& name, Gfx::Color up = Gfx::Color(), Gfx::Color down = Gfx::Color(), Gfx::Color cloudUp = Gfx::Color(), Gfx::Color cloudDown = Gfx::Color(), - bool full = false, bool quarter = false); + bool full = false, Math::Point scale = Math::Point(1.0f, 1.0f)); void GetBackground(std::string& name, Gfx::Color& up, Gfx::Color& down, Gfx::Color& cloudUp, Gfx::Color& cloudDown, - bool& full, bool& quarter); + bool& full, Math::Point& scale); //@} //! Specifies the name of foreground texture @@ -1154,8 +1154,6 @@ protected: void DrawBackground(); //! Draws the gradient background void DrawBackgroundGradient(const Gfx::Color& up, const Gfx::Color& down); - //! Draws a portion of the image background - void DrawBackgroundImageQuarter(Math::Point p1, Math::Point p2, const Gfx::Texture &tex); //! Draws the image background void DrawBackgroundImage(); //! Draws all the planets @@ -1290,11 +1288,9 @@ protected: bool m_firstGroundSpot; int m_secondTexNum; bool m_backgroundFull; - bool m_backgroundQuarter; + Math::Point m_backgroundScale; std::string m_backgroundName; - std::string m_backgroundQuarterNames[4]; - Gfx::Texture m_backgroundFullTex; - Gfx::Texture m_backgroundQuarterTexs[4]; + Gfx::Texture m_backgroundTex; Gfx::Color m_backgroundColorUp; Gfx::Color m_backgroundColorDown; Gfx::Color m_backgroundCloudUp; |