Changeset 6519 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

trunk: better smoother water

Location:

trunk/src

Files:

• lib/graphics/importer/grid.h (modified) (1 diff)
• lib/graphics/importer/vertex_array_model.cc (modified) (2 diffs)
• world_entities/environments/water.cc (modified) (3 diffs)
• world_entities/skybox.cc (modified) (4 diffs)
• world_entities/skybox.h (modified) (1 diff)

trunk/src/lib/graphics/importer/grid.h

@@ -28 +28 @@
 
   float& height(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column).y;};
+  Vector& vertexG(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column); };
+  Vector& normalG(unsigned int row, unsigned int column) { return this->normal(row*this->_columns + column); };
 
 

trunk/src/lib/graphics/importer/vertex_array_model.cc

@@ -137 +137 @@
   PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
   glEnableClientState(GL_VERTEX_ARRAY );
-  //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   glEnableClientState(GL_NORMAL_ARRAY );
   glEnableClientState(GL_COLOR_ARRAY );
@@ -144 +144 @@
   glVertexPointer(3, GL_FLOAT, 0, &this->vertices[0]);
   glNormalPointer(GL_FLOAT, 0, &this->normals[0]);
-  //glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
+  glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
   glColorPointer(3, GL_FLOAT, 0, &this->colors[0]);
 

trunk/src/world_entities/environments/water.cc

@@ -46 +46 @@
   this->velocities = NULL;
   this->viscosity = 5;
-  this->cohesion = .00002;
+  this->cohesion = .00000001;
 
   if (root != NULL)
@@ -55 +55 @@
   this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, (void*)"shaders/water.frag");
 
-  this->grid->height(this->grid->columns()/2,this->grid->rows()/2) = 1000;
+  this->grid->height(this->grid->columns()/2,this->grid->rows()/2) = 100;
 }
 
@@ -185 +185 @@
 
   // calc normals
-/*  float l[3];
-  float m[3];
-  for(j = 1; j < _width-1; j++) {
-    for(i = 1; i < _width - 1; i++) {
-      l[0] = _map[i][j-1].u[0] - _map[i][j+1].u[0];
-      l[1] = _map[i][j-1].u[1] - _map[i][j+1].u[1];
-      l[2] = _map[i][j-1].u[2] - _map[i][j+1].u[2];
-      m[0] = _map[i-1][j].u[0] - _map[i+1][j].u[0];
-      m[1] = _map[i-1][j].u[1] - _map[i+1][j].u[1];
-      m[2] = _map[i-1][j].u[2] - _map[i+1][j].u[2];
-      _map[i][j].n[0] = l[1]*m[2]-l[2]*m[1];
-      _map[i][j].n[1] = l[2]*m[0]-l[0]*m[2];
-      _map[i][j].n[2] = l[0]*m[1]-l[1]*m[0];
-    }
-  }*/
-}
+//   float l[3];
+//   float m[3];
+//   for(j = 1; j < this->grid->rows() -1; j++) {
+//     for(i = 1; i < this->grid->columns() - 1; i++) {
+//       l[0] = this->grid->vertexG(i, j-1).x - this->grid->vertexG(i, j+1).x;
+//       l[1] = this->grid->vertexG(i, j-1).y - this->grid->vertexG(i, j+1).y;
+//       l[2] = this->grid->vertexG(i, j-1).z - this->grid->vertexG(i, j+1).z;
+//       m[0] = this->grid->vertexG(i-1,j).x - this->grid->vertexG(i+1, j).x;
+//       m[1] = this->grid->vertexG(i-1,j).y - this->grid->vertexG(i+1, j).y;
+//       m[2] = this->grid->vertexG(i-1,j).z - this->grid->vertexG(i+1, j).z;
+//       this->grid->normalG(i, j).x = l[1] * m[2] - l[2] * m[1];
+//       this->grid->normalG(i, j).y = l[2] * m[0] - l[0] * m[2];
+//       this->grid->normalG(i, j).z = l[0] * m[1] - l[1] * m[0];
+//     }
+//   }
+  this->grid->rebuildNormals(this->height);
+}

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);

trunk/src/world_entities/skybox.h

@@ -57 +57 @@
 
   Material*       material[6];     //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
-  Texture*        texture[6];      //!< Textures for the CubeMap.
+  Texture*        cubeTexture[6];  //!< Textures for the CubeMap.
 
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.