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

Timestamp:

Jan 26, 2006, 1:55:40 AM (19 years ago)

Author:

bensch

Message:

trunk: Burst Particles

File:

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

trunk/src/world_entities/environments/water.cc

@@ -180 +180 @@
            4 * this->grid->height(i, j);
       this->velocities[i][j] += dt * this->viscosity * this->viscosity * u / this->height;
-      this->grid->height(i, j) += dt * this->velocities[i][j];
+      this->grid->height(i, j) += dt * this->velocities[i][j] + dt * this->cohesion * u / this->height;;
     }
   }
@@ -194 +194 @@
     this->grid->height(i,this->grid->columns()-1) = this->grid->height(i, this->grid->columns()-2);
   }
-  /*  // advect
-    for(j = 1; j < this->grid->rows() - 1; j++) {
+  /*
+  for(j = 1; j < this->grid->rows() - 1; j++) {
       for(i = 1; i < this->grid->columns() - 1; i++) {
         this->grid->height(i, j) += dt * this->velocities[i][j];
       }
     }*/
-  // bound
-  //   unsigned int w = this->grid->columns - 1;
-  //   for(i = 0; i < this->grid->columns; i++) {
-  //     _map[i][0].u[1] = _map[i][1  ].u[1];
-  //     _map[i][w].u[1] = _map[i][w-1].u[1];
-  //     _map[0][i].u[1] = _map[1  ][i].u[1];
-  //     _map[w][i].u[1] = _map[w-1][i].u[1];
-  //   }
-
-  // diffusion
-  for(j = 1; j < this->grid->rows() - 1; j++)
-  {
-    for(i = 1; i < this->grid->columns() - 1 ; i++)
-    {
-      u = this->grid->height(i+1, j) + this->grid->height(i-1, j) +
-          this->grid->height(i, j+1) + this->grid->height(i, j-1) -
-          4* this->grid->height(i, j);
-      this->grid->height(i,j) += dt * this->cohesion * u / this->height;
-    }
-  }
 
   // calc normals