Changeset 6457 in orxonox.OLD for trunk/src

Timestamp:

Jan 10, 2006, 12:39:08 AM (19 years ago)

Author:

bensch

Message:

water works

Location:

trunk/src

Files:

• lib/graphics/importer/grid.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/environments/water.cc (modified) (6 diffs)
• world_entities/environments/water.h (modified) (1 diff)

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

@@ -26 +26 @@
   unsigned int columns() const { return this->_columns; };
 
-  float& height(unsigned int row, unsigned int column) { return this->vertex(row*_columns + row).y;};
+  float& height(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column).y;};
+
+
+  void rebuidNormals();
 
 private:

trunk/src/story_entities/game_world.cc

@@ -328 +328 @@
 
     this->tick(this->dataTank->objectManager->getObjectList(OM_DEAD_TICK), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_ENVIRON), this->dtS);
     this->tick(this->dataTank->objectManager->getObjectList(OM_COMMON), this->dtS);
     this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00), this->dtS);

trunk/src/world_entities/environments/water.cc

@@ -21 +21 @@
 
 #include "grid.h"
+#include "material.h"
 
 using namespace std;
@@ -30 +31 @@
 {
   this->setClassID(CL_WATER, "Water");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
 
   this->resX = this->resY = 10;
@@ -40 +41 @@
 
   this->rebuildGrid();
+  this->waterMaterial = new Material();
 }
 
@@ -45 +47 @@
 {
   delete this->grid;
-
+  delete this->waterMaterial;
 }
 
@@ -67 +69 @@
   this->grid = new Grid(this->sizeX, this->sizeY, this->resX, this->resY);
 
+  this->grid->debug();
   this->setModel(this->grid, 0);
 }
@@ -78 +81 @@
 void Water::setSize(float sizeX, float sizeY)
 {
-  printf("%f %f\n", sizeX, sizeY);
-
   this->sizeX = sizeX;
   this->sizeY = sizeY;
 }
 
+void Water::draw() const
+{
+  this->waterMaterial->select();
+  WorldEntity::draw();
+}
 
 void Water::tick(float dt)
 {
-
+  phase += dt *.1;
+  for (unsigned int i = 0; i < this->grid->rows(); i++)
+  {
+    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);
+    }
+  }
 }

trunk/src/world_entities/environments/water.h

@@ -30 +30 @@
    void rebuildGrid();
 
+   void draw() const;
    void tick(float dt);
 
   private:
     Grid*           grid;            //!< The water-surface-model to render with
+    Material*       waterMaterial;
 
     unsigned int    resX, resY;
     float           sizeX, sizeY;
+
+    float phase;
 };