Changeset 7042 in orxonox.OLD for trunk

Timestamp:

Feb 6, 2006, 1:55:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: water renders again

File:

• trunk/src/world_entities/environments/water.cc (modified) (2 diffs)

trunk/src/world_entities/environments/water.cc

@@ -183 +183 @@
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-//     if (State::getSkyBox())
-//     {
-//       glBindTexture(GL_TEXTURE_2D, State::getSkyBox()->getTexture(SKY_RIGHT));
-//       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-//
-//       glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-//       glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-//       glEnable(GL_TEXTURE_GEN_S);
-//       glEnable(GL_TEXTURE_GEN_T);
-//     }
-//     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    SkyBox::enableCubeMap();
+     if (State::getSkyBox())
+     {
+       glBindTexture(GL_TEXTURE_2D, State::getSkyBox()->getTexture(SKY_RIGHT));
+       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+       glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+       glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+       glEnable(GL_TEXTURE_GEN_S);
+       glEnable(GL_TEXTURE_GEN_T);
+     }
+     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+//    SkyBox::enableCubeMap();
     this->grid->draw();
     // this->waterShader->activateShader();
@@ -202 +202 @@
 
     SkyBox::disableCubeMap();
-//     glDisable(GL_TEXTURE_GEN_S);
-//     glDisable(GL_TEXTURE_GEN_T);
+     glDisable(GL_TEXTURE_GEN_S);
+     glDisable(GL_TEXTURE_GEN_T);
 
     glPopMatrix();