Changeset 6766 in orxonox.OLD for trunk

Timestamp:

Jan 26, 2006, 12:54:16 PM (19 years ago)

Author:

bensch

Message:

trunk: splash splash

Location:

trunk/src

Files:

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

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

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

trunk/src/world_entities/environments/water.cc

@@ -27 +27 @@
 
 #include "skybox.h"
+#include "state.h"
+
 
 #include "network_game_manager.h"
@@ -56 +58 @@
   this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
 
-  this->grid->height(this->grid->columns()/2,this->grid->rows()/2) = 100;
+  // To test the Wave equation
+  //this->wave(5.0,4.0, 1, 10);
 }
 
@@ -107 +110 @@
 }
 
+void Water::wave(float x, float y, float z, float force)
+{
+  unsigned int row = 0, column = 0;
+  if (!this->posToGridPoint( x, z, row, column))
+    return;
+  this->grid->height(row, column) -= force / ((y - this->getAbsCoor().y) +.1);
+}
+
 void Water::setResolution(unsigned int resX, unsigned int resY)
 {
@@ -122 +133 @@
 {
   this->height = height;
+}
+
+
+bool Water::posToGridPoint(float x, float z, unsigned int& row, unsigned int& column)
+{
+  float lower = this->getAbsCoor().y - this->sizeY *.5;
+  float left = this->getAbsCoor().x - this->sizeX *.5;
+  if (x > left && x < left + this->sizeX)
+    row = (unsigned int) ((x- left) / this->grid->gridSpacing());
+  else return false;
+  if (z > lower && z < lower + this->sizeY)
+    column = (unsigned int)((z-lower) / this->grid->gridSpacing());
+  else return false;
+  return true;
 }
 
@@ -151 +176 @@
 void Water::tick(float dt)
 {
+  std::list<WorldEntity*> entityList = State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ);
+  std::list<WorldEntity*>::iterator entity = entityList.begin();
+  while (entity != entityList.end())
+  {
+    this->wave((*entity)->getAbsCoor(), 10.0*dt);
+    entity++;
+  }
+
+
   if (unlikely(this->velocities == NULL))
     return;
@@ -180 +214 @@
            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] + dt * this->cohesion * u / this->height;;
+      this->grid->height(i, j) += dt * this->velocities[i][j]  /* + dt * this->cohesion * u / this->height;*/;
+      this->grid->height(i, j) *= .99;
     }
   }

trunk/src/world_entities/environments/water.h

@@ -32 +32 @@
    void rebuildGrid();
 
+   void wave(float x, float y, float z, float force);
+   inline void wave(Vector pos, float force) { this->wave(pos.x, pos.y, pos.z, force); };
+
    void draw() const;
    void tick(float dt);
@@ -41 +44 @@
    int readState( byte * data, int maxLength );
 
+  private:
+    bool posToGridPoint(float x, float z, unsigned int& row, unsigned int& column);
 
   private: