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

Timestamp:

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

Author:

bensch

Message:

trunk: better smoother water

File:

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

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