Changeset 6456 in orxonox.OLD

Timestamp:

Jan 10, 2006, 12:09:58 AM (18 years ago)

Author:

bensch

Message:

Water draws itself

Location:

trunk/src

Files:

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

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

@@ -264 +264 @@
       for (j = 0; j < resolutionX; j++)
         {
-          this->addVertex((float)i - (float)sizeY/2.0, 0.0, (float)j - (float)sizeX/2.0);
+          this->addVertex(((float)i - (float)resolutionY/2.0)*sizeY, 0.0, ((float)j - (float)resolutionX/2.0)*sizeX);
           this->addNormal(0.0, 1, 0.0);
           this->addTexCoor((float)i/(float)resolutionY, (float)j/(float)resolutionY);

trunk/src/world_entities/environments/water.cc

@@ -29 +29 @@
 Water::Water(const TiXmlElement* root)
 {
+  this->setClassID(CL_WATER, "Water");
+  this->toList(OM_ENVIRON_NOTICK);
+
   this->resX = this->resY = 10;
   this->sizeX = this->sizeY = 1.0;
@@ -35 +38 @@
   if (root != NULL)
     this->loadParams(root);
+
+  this->rebuildGrid();
 }
 
 Water::~Water()
 {
+  delete this->grid;
 
 }
@@ -61 +67 @@
   this->grid = new Grid(this->sizeX, this->sizeY, this->resX, this->resY);
 
+  this->setModel(this->grid, 0);
 }
 
@@ -71 +78 @@
 void Water::setSize(float sizeX, float sizeY)
 {
+  printf("%f %f\n", sizeX, sizeY);
+
   this->sizeX = sizeX;
   this->sizeY = sizeY;
 }
 
+
+void Water::tick(float dt)
+{
+
+}

trunk/src/world_entities/environments/water.h

@@ -30 +30 @@
    void rebuildGrid();
 
+   void tick(float dt);
+
   private:
     Grid*           grid;            //!< The water-surface-model to render with