Fix for rainbow dust.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5366 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
parent
841c118230
commit
bf1fb6f08e
@ -308,6 +308,8 @@ enum
|
||||
|
||||
OOGL(glDisable(GL_TEXTURE_2D));
|
||||
OOGL(glEnable(GL_BLEND));
|
||||
OOGL(glDisableClientState(GL_TEXTURE_COORD_ARRAY));
|
||||
OOGL(glDepthMask(GL_FALSE));
|
||||
|
||||
if (warp_stars)
|
||||
{
|
||||
@ -360,6 +362,9 @@ enum
|
||||
OOGL(glDisable(GL_FOG));
|
||||
}
|
||||
|
||||
OOGL(glEnableClientState(GL_TEXTURE_COORD_ARRAY));
|
||||
OOGL(glDepthMask(GL_TRUE));
|
||||
|
||||
CheckOpenGLErrors(@"DustEntity after drawing %@", self);
|
||||
}
|
||||
|
||||
|
@ -230,14 +230,6 @@
|
||||
OOGL(glVertexPointer(3, GL_FLOAT, 0, kOOPlanetVertices));
|
||||
OOGL(glTexCoordPointer(2, GL_FLOAT, 0, kOOPlanetTexCoords));
|
||||
|
||||
#ifndef NDEBUG
|
||||
if (gDebugFlags & DEBUG_MISC)
|
||||
{
|
||||
LogOpenGLState();
|
||||
gDebugFlags &= ~DEBUG_MISC;
|
||||
}
|
||||
#endif
|
||||
|
||||
// FIXME: instead of GL_RESCALE_NORMAL, consider copying and transforming the vertex array for each planet.
|
||||
OOGL(glEnable(GL_RESCALE_NORMAL));
|
||||
OOGL(glEnableClientState(GL_NORMAL_ARRAY));
|
||||
|
@ -231,6 +231,7 @@ static OOColor *SaturatedColorInRange(OOColor *color1, OOColor *color2);
|
||||
}
|
||||
|
||||
// Restore state
|
||||
OOGL(glDisableClientState(GL_COLOR_ARRAY));
|
||||
OOGL(glPopAttrib());
|
||||
}
|
||||
|
||||
|
@ -2467,7 +2467,6 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
|
||||
}
|
||||
|
||||
|
||||
|
||||
- (void) selectIntro2Previous
|
||||
{
|
||||
demo_stage = DEMO_SHOW_THING;
|
||||
|
Loading…
x
Reference in New Issue
Block a user