summaryrefslogtreecommitdiffstats
path: root/src/graphics/opengl/gldevice.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-07-05 23:47:29 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-07-05 23:47:29 +0200
commite8c9945e13fca88a6f8232838682df0654437f3e (patch)
tree2a0974afe8cdb30d7862e189d4d9adc5d6d59849 /src/graphics/opengl/gldevice.h
parentaf3057df7eb41973349b407539846f17d9094c21 (diff)
downloadcolobot-e8c9945e13fca88a6f8232838682df0654437f3e.tar.gz
colobot-e8c9945e13fca88a6f8232838682df0654437f3e.tar.bz2
colobot-e8c9945e13fca88a6f8232838682df0654437f3e.zip
Fixed bug with texturing
- moved creation-time tex params to Gfx::TextureCreateParams - fixed bug with texture creation - added simple test for multitexturing
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
-rw-r--r--src/graphics/opengl/gldevice.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h
index aa5dd04..2b1b05d 100644
--- a/src/graphics/opengl/gldevice.h
+++ b/src/graphics/opengl/gldevice.h
@@ -97,7 +97,7 @@ public:
virtual void SetLightEnabled(int index, bool enabled);
virtual bool GetLightEnabled(int index);
- virtual Gfx::Texture* CreateTexture(CImage *image, bool alpha, bool mipMap);
+ virtual Gfx::Texture* CreateTexture(CImage *image, const Gfx::TextureCreateParams &params);
virtual void DestroyTexture(Gfx::Texture *texture);
virtual void DestroyAllTextures();
@@ -187,9 +187,6 @@ private:
//! Set of all created textures
std::set<Gfx::Texture*> m_allTextures;
-
- //! Restores the state of given texture stage to the previously saved settings
- void RestoreTextureStage(int index);
};
}; // namespace Gfx