Changeset 8477 in orxonox.OLD

Timestamp:

Jun 15, 2006, 4:08:15 PM (18 years ago)

Author:

stefalie

Message:

water: widths of the water quad are saved in the xml file

Location:

branches/water/src/world_entities/environments

Files:

• mapped_water.cc (modified) (5 diffs)
• mapped_water.h (modified) (1 diff)

branches/water/src/world_entities/environments/mapped_water.cc

@@ -151 +151 @@
   WorldEntity::loadParams(root);
 
-  LoadParam(root, "waterPos", this, MappedWater, setWaterPos);
-  LoadParam(root, "lightPos", this, MappedWater, setLightPosition);
+  LoadParam(root, "waterpos", this, MappedWater, setWaterPos);
+  LoadParam(root, "watersize", this, MappedWater, setWaterSize);
+  LoadParam(root, "lightpos", this, MappedWater, setLightPosition);
 }
 
@@ -183 +184 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                       // DUDV map texture
   //glMultiTexCoord2f(GL_TEXTURE4, 0, 0);                       // Depth texture
-  glVertex3f(0.0f, waterPos.y, 0.0f);
+  glVertex3f(0.0f, this->waterPos.y, 0.0f);
 
   // The front left vertice for the water
@@ -193 +194 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
   //glMultiTexCoord2f(GL_TEXTURE4, 0, 0);                        // Depth texture
-  glVertex3f(0.0f, waterPos.y, 1000.0f);
+  glVertex3f(0.0f, this->waterPos.y, this->zWidth);
 
   // The front right vertice for the water
@@ -203 +204 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
   //glMultiTexCoord2f(GL_TEXTURE4, 0, 0);                        // Depth texture
-  glVertex3f(1000.0f, waterPos.y, 1000.0f);
+  glVertex3f(this->xWidth, this->waterPos.y, this->zWidth);
 
   // The back right vertice for the water
@@ -213 +214 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
   //glMultiTexCoord2f(GL_TEXTURE4, 0, 0);                        // Depth texture
-  glVertex3f(1000.0f, waterPos.y, 0.0f);
+  glVertex3f(this->xWidth, this->waterPos.y, 0.0f);
   glEnd();
 

branches/water/src/world_entities/environments/mapped_water.h

@@ -34 +34 @@
     void setLightPosition(float x, float y, float z) { this->lightPos = Vector(x,y,z); };
     void setWaterPos(float x, float y, float z) { this->waterPos = Vector(x,y,z); };
+    void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; };
 
   private:
     Vector              waterPos;                   //!< position of the water
+    float               xWidth, zWidth;             //!< size of the water quad
     Vector              lightPos;                   //!< position of the light that is used to render the reflection