diff options
| author | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
| commit | 95e1d101c82e43396fd93abfaa522e3651613c4c (patch) | |
| tree | 9d72f27e84a25c7a744b31eb7612698506ac5b68 /src/graphics/opengl/gldevice.h | |
| parent | aa9df8b1f0fbbad4c7be0214a19a90b8495a2067 (diff) | |
| parent | c8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff) | |
| download | colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.gz colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.bz2 colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
| -rw-r--r-- | src/graphics/opengl/gldevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index 1274ee9..78c7433 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -117,6 +117,8 @@ public: virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms); virtual TextureStageParams GetTextureStageParams(int index); + virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT); + virtual void SetTextureFactor(const Color &color); virtual Color GetTextureFactor(); @@ -188,8 +190,6 @@ private: //! Current lights enable status std::vector<bool> m_lightsEnabled; - //! Whether texturing is enabled in general - bool m_texturing; //! Current textures; \c NULL value means unassigned std::vector<Texture> m_currentTextures; //! Current texture stages enable status |