Changeset 6519 in orxonox.OLD for trunk/src/world_entities/skybox.cc

Timestamp:

Jan 18, 2006, 12:38:19 AM (18 years ago)

Author:

bensch

Message:

trunk: better smoother water

File:

• trunk/src/world_entities/skybox.cc (modified) (4 diffs)

trunk/src/world_entities/skybox.cc

@@ -81 +81 @@
       this->material[i]->setAmbient(2.0, 2.0, 2.0);
 
-      this->texture[i] = NULL;
+      this->cubeTexture[i] = NULL;
     }
   this->setParentMode(PNODE_MOVEMENT);
@@ -166 +166 @@
                                   const char* right, const char* front, const char* back)
 {
-  this->texture[0] = new Texture (top, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB);
-  this->texture[1] = new Texture (bottom, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB);
-  this->texture[2] = new Texture (left, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB);
-  this->texture[3] = new Texture (right, GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB);
-  this->texture[4] = new Texture (front, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB);
-  this->texture[5] = new Texture (back, GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB);
+  this->cubeTexture[0] = new Texture (top, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB);
+  this->cubeTexture[1] = new Texture (bottom, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB);
+  this->cubeTexture[2] = new Texture (left, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB);
+  this->cubeTexture[3] = new Texture (right, GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB);
+  this->cubeTexture[4] = new Texture (front, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB);
+  this->cubeTexture[5] = new Texture (back, GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB);
 }
 
@@ -177 +177 @@
 {
   glEnable(GL_TEXTURE_CUBE_MAP_ARB);
+  glEnable(GL_TEXTURE_2D);
   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
   glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
@@ -188 +189 @@
 {
   glDisable(GL_TEXTURE_CUBE_MAP_ARB);
+  glDisable(GL_TEXTURE_2D);
   glDisable(GL_TEXTURE_GEN_S);
   glDisable(GL_TEXTURE_GEN_T);