diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-05 23:47:29 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-05 23:47:29 +0200 |
commit | e8c9945e13fca88a6f8232838682df0654437f3e (patch) | |
tree | 2a0974afe8cdb30d7862e189d4d9adc5d6d59849 /src/graphics/common/device.cpp | |
parent | af3057df7eb41973349b407539846f17d9094c21 (diff) | |
download | colobot-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/common/device.cpp')
-rw-r--r-- | src/graphics/common/device.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/graphics/common/device.cpp b/src/graphics/common/device.cpp index bb51699..79102b2 100644 --- a/src/graphics/common/device.cpp +++ b/src/graphics/common/device.cpp @@ -32,14 +32,20 @@ void Gfx::DeviceConfig::LoadDefault() noFrame = false; } -void Gfx::TextureParams::LoadDefault() +void Gfx::TextureCreateParams::LoadDefault() { + alpha = false; + mipmap = false; + minFilter = Gfx::TEX_MIN_FILTER_NEAREST; magFilter = Gfx::TEX_MAG_FILTER_NEAREST; wrapS = Gfx::TEX_WRAP_REPEAT; wrapT = Gfx::TEX_WRAP_REPEAT; +} +void Gfx::TextureParams::LoadDefault() +{ colorOperation = Gfx::TEX_MIX_OPER_MODULATE; colorArg1 = Gfx::TEX_MIX_ARG_CURRENT; colorArg2 = Gfx::TEX_MIX_ARG_TEXTURE; |