diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-25 20:27:13 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-25 20:27:13 +0200 |
| commit | bc1c9b5284c10d8aafc04bcd6c3597b3626a782f (patch) | |
| tree | 88f432699953fba513dc78155252ce20f83d5b05 /src/graphics/opengl/gldevice.cpp | |
| parent | 9cd28e26e90ecbce239991e054293f748895fb98 (diff) | |
| download | colobot-bc1c9b5284c10d8aafc04bcd6c3597b3626a782f.tar.gz colobot-bc1c9b5284c10d8aafc04bcd6c3597b3626a782f.tar.bz2 colobot-bc1c9b5284c10d8aafc04bcd6c3597b3626a782f.zip | |
Fixed bug in texturing
Diffstat (limited to 'src/graphics/opengl/gldevice.cpp')
| -rw-r--r-- | src/graphics/opengl/gldevice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index a3668da..fc6e9b6 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -516,19 +516,19 @@ void Gfx::CGLDevice::SetTextureStageParams(int index, const Gfx::TextureStagePar if (params.colorOperation == Gfx::TEX_MIX_OPER_DEFAULT) { + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE); - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_RGB, GL_MODULATE); goto after_tex_color; } else if (params.colorOperation == Gfx::TEX_MIX_OPER_REPLACE) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_RGB, GL_REPLACE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); else if (params.colorOperation == Gfx::TEX_MIX_OPER_MODULATE) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_RGB, GL_MODULATE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE); else if (params.colorOperation == Gfx::TEX_MIX_OPER_ADD) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_RGB, GL_ADD); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_ADD); else if (params.colorOperation == Gfx::TEX_MIX_OPER_SUBTRACT) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_RGB, GL_SUBTRACT); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_SUBTRACT); else assert(false); // Color arg1 @@ -559,19 +559,19 @@ after_tex_color: // Alpha operation if (params.alphaOperation == Gfx::TEX_MIX_OPER_DEFAULT) { - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_ALPHA, GL_MODULATE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_TEXTURE); goto after_tex_operations; } else if (params.colorOperation == Gfx::TEX_MIX_OPER_REPLACE) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_ALPHA, GL_REPLACE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE); else if (params.alphaOperation == Gfx::TEX_MIX_OPER_MODULATE) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_ALPHA, GL_MODULATE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE); else if (params.alphaOperation == Gfx::TEX_MIX_OPER_ADD) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_ALPHA, GL_ADD); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_ADD); else if (params.alphaOperation == Gfx::TEX_MIX_OPER_SUBTRACT) - glTexEnvi(GL_TEXTURE_2D, GL_COMBINE_ALPHA, GL_SUBTRACT); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_SUBTRACT); else assert(false); // Alpha arg1 |