Changeset 6458 in orxonox.OLD for trunk

Timestamp:

Jan 10, 2006, 1:20:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: wave now also rebuilds the Normals (do not know if this is really necesarry, but i sure hope so for all the work

Location:

trunk/src

Files:

• lib/graphics/importer/grid.cc (modified) (2 diffs)
• lib/graphics/importer/grid.h (modified) (1 diff)
• world_entities/environments/water.cc (modified) (5 diffs)
• world_entities/environments/water.h (modified) (2 diffs)

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

@@ -33 +33 @@
   this->_sizeX = sizeX;
   this->_sizeY = sizeY;
+  this->_gridSpacingX = sizeX / rows;
+  this->_gridSpacingY = sizeY / columns;
 }
 
@@ -43 +45 @@
   // delete what has to be deleted here
 }
+
+
+void Grid::rebuildNormals(float maxHeight)
+{
+  for (unsigned int i = 1; i < this->_rows-1; i++)
+  {
+    for (unsigned int j = 1; j < this->_columns-1; j++)
+    {
+     Vector test(
+          (this->vertex(i*_columns+j).y + this->vertex((i-1)*_columns+j).y - this->vertex((i+1)*_columns+j).y ) /maxHeight,
+          1.0,
+          (this->vertex(i*_columns+j).y - this->vertex(i*_columns+j-1).y + this->vertex(i*_columns+j+1).y)/maxHeight
+                );
+      this->normal( i*_columns+j) = test.getNormalized();
+    }
+
+  }
+
+}

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

@@ -29 +29 @@
 
 
-  void rebuidNormals();
+  void rebuildNormals(float maxHeight);
 
 private:
   float             _sizeX;
   float             _sizeY;
+
+  float             _gridSpacingX;
+  float             _gridSpacingY;
 
   unsigned int      _rows;

trunk/src/world_entities/environments/water.cc

@@ -34 +34 @@
 
   this->resX = this->resY = 10;
-  this->sizeX = this->sizeY = 1.0;
+  this->sizeX = this->sizeY = 1.0f;
+  this->height = 0.5f;
   this->grid = NULL;
 
@@ -61 +62 @@
       .describe("sets the resolution of the water surface")
       .defaultValues(2, 10, 10);
+
+  LoadParam(root, "height", this, Water, setHeight)
+      .describe("the height of the Waves")
+      .defaultValues(1, 0.5f);
 }
 
@@ -69 +74 @@
   this->grid = new Grid(this->sizeX, this->sizeY, this->resX, this->resY);
 
-  this->grid->debug();
   this->setModel(this->grid, 0);
 }
@@ -85 +89 @@
 }
 
+void Water::setHeight(float height)
+{
+  this->height = height;
+}
+
+
 void Water::draw() const
 {
@@ -98 +108 @@
     for (unsigned int j = 0; j < this->grid->columns(); j++)
     {
-      this->grid->height(i,j) = 15.0*sin(((float)i/(float)this->grid->rows() *phase)+
-          15*cos((float)j/(float)this->grid->columns()) * phase);
+      this->grid->height(i,j) = this->height*sin(((float)i/(float)this->grid->rows() *phase)+
+          this->height*cos((float)j/(float)this->grid->columns()) * phase);
     }
   }
+  this->grid->rebuildNormals(this->height);
 }

trunk/src/world_entities/environments/water.h

@@ -28 +28 @@
    void setResolution(unsigned int resX, unsigned int resY);
    void setSize(float sizeX, float sizeY);
+   void setHeight(float height);
    void rebuildGrid();
 
@@ -36 +37 @@
     Grid*           grid;            //!< The water-surface-model to render with
     Material*       waterMaterial;
+    float           height;          //!< The hight of the Water
 
     unsigned int    resX, resY;