diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-03 23:23:13 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-03 23:23:13 +0200 |
commit | 61bfb22f27f5216f989c023a5e39fad7e356d2d6 (patch) | |
tree | 9d7a8a760ace272739f651a2f4208326731a6fe7 /src/graphics/opengl/gldevice.h | |
parent | 5e637ca0288ddd631ec33e1d620cd4a73bcdc2be (diff) | |
download | colobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.tar.gz colobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.tar.bz2 colobot-61bfb22f27f5216f989c023a5e39fad7e356d2d6.zip |
Basic font rendering
- added basic font rendering
- minor refactoring & fixes
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
-rw-r--r-- | src/graphics/opengl/gldevice.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index 1864000..a41c41c 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -73,7 +73,6 @@ public: CGLDevice(const Gfx::GLDeviceConfig &config); virtual ~CGLDevice(); - virtual bool GetWasInit(); virtual std::string GetError(); virtual bool Create(); @@ -100,11 +99,13 @@ public: virtual bool GetLightEnabled(int index); virtual Gfx::Texture CreateTexture(CImage *image, const Gfx::TextureCreateParams ¶ms); + virtual Gfx::Texture CreateTexture(ImageData *data, const Gfx::TextureCreateParams ¶ms); virtual void DestroyTexture(const Gfx::Texture &texture); virtual void DestroyAllTextures(); virtual int GetMaxTextureCount(); virtual void SetTexture(int index, const Gfx::Texture &texture); + virtual void SetTexture(int index, unsigned int textureId); virtual Gfx::Texture GetTexture(int index); virtual void SetTextureEnabled(int index, bool enabled); virtual bool GetTextureEnabled(int index); @@ -163,8 +164,6 @@ private: private: //! Current config Gfx::GLDeviceConfig m_config; - //! Was initialized? - bool m_wasInit; //! Last encountered error std::string m_error; |