Changeset 6860 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Jan 30, 2006, 5:24:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: hmm… do not know

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);
+//     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();
@@ -199 +201 @@
     //Shader::deactivateShader();
 
-    //SkyBox::disableCubeMap();
-    glDisable(GL_TEXTURE_GEN_S);
-    glDisable(GL_TEXTURE_GEN_T);
+    SkyBox::disableCubeMap();
+//     glDisable(GL_TEXTURE_GEN_S);
+//     glDisable(GL_TEXTURE_GEN_T);
 
     glPopMatrix();