diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:31:04 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:31:04 +0200 |
| commit | 45fd8aad33029746424031e12777f2824bda245e (patch) | |
| tree | 7c984ec6bfda42c807ba48440f6d61fcef9056ef /src/graphics/opengl | |
| parent | b06544871ae48871fc302706ecc49b78c6bcb3d2 (diff) | |
| download | colobot-45fd8aad33029746424031e12777f2824bda245e.tar.gz colobot-45fd8aad33029746424031e12777f2824bda245e.tar.bz2 colobot-45fd8aad33029746424031e12777f2824bda245e.zip | |
Fog color fix; refactoring
- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
Diffstat (limited to 'src/graphics/opengl')
| -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) |