diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
commit | 6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c (patch) | |
tree | 0743ec727b22c5f91579d9baafa10a5cbb67bd60 /src/graphics/opengl/gldevice.cpp | |
parent | dad42df4c7878e3da67ab66549fc1a3132893160 (diff) | |
parent | 45fd8aad33029746424031e12777f2824bda245e (diff) | |
download | colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.gz colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.bz2 colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.zip |
Merge master & dev
Diffstat (limited to 'src/graphics/opengl/gldevice.cpp')
-rw-r--r-- | src/graphics/opengl/gldevice.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index 1f9c6b0..bbad0a7 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -101,7 +101,7 @@ bool CGLDevice::Create() return false; } - if ( (! GLEW_ARB_multitexture) || (! GLEW_EXT_texture_env_combine) || (! GLEW_EXT_secondary_color) ) + if ( (! GLEW_ARB_multitexture) || (! GLEW_EXT_texture_env_combine) ) { GetLogger()->Error("GLEW reports required extensions not supported\n"); return false; @@ -887,8 +887,6 @@ void CGLDevice::DrawPrimitive(PrimitiveType type, const VertexCol *vertices, int for (int i = 0; i < vertexCount; ++i) { glColor4fv(const_cast<GLfloat*>(vertices[i].color.Array())); - glSecondaryColor3fv(const_cast<GLfloat*>(vertices[i].specular.Array())); - glMultiTexCoord2fv(GL_TEXTURE0, const_cast<GLfloat*>(vertices[i].texCoord.Array())); glVertex3fv(const_cast<GLfloat*>(vertices[i].coord.Array())); } @@ -1244,6 +1242,7 @@ void CGLDevice::SetFogParams(FogMode mode, const Color &color, float start, floa glFogf(GL_FOG_START, start); glFogf(GL_FOG_END, end); glFogf(GL_FOG_DENSITY, density); + glFogfv(GL_FOG_COLOR, color.Array()); } void CGLDevice::GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density) @@ -1258,6 +1257,9 @@ void CGLDevice::GetFogParams(FogMode &mode, Color &color, float &start, float &e glGetFloatv(GL_FOG_START, static_cast<GLfloat*>(&start)); glGetFloatv(GL_FOG_END, static_cast<GLfloat*>(&end)); glGetFloatv(GL_FOG_DENSITY, static_cast<GLfloat*>(&density)); + GLfloat col[4] = { 0.0f }; + glGetFloatv(GL_FOG_COLOR, col); + color = Color(col[0], col[1], col[2], col[3]); } void CGLDevice::SetCullMode(CullMode mode) |