Changeset 6771 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Jan 26, 2006, 2:39:31 PM (19 years ago)

Author:

bensch

Message:

Water is better now (but still quite Bad)

File:

• trunk/src/world_entities/environments/water.cc (modified) (5 diffs)

trunk/src/world_entities/environments/water.cc

@@ -85 +85 @@
 }
 
+/**
+ * @brief rebuilds the Grid below the WaterSurface, killing all hight information
+ *
+ * This should be called on all subGrid changes except wave and tick.
+ */
 void Water::rebuildGrid()
 {
@@ -118 +123 @@
 }
 
+/**
+ * after this a rebuild() must be called
+ */
 void Water::setResolution(unsigned int resX, unsigned int resY)
 {
@@ -124 +132 @@
 }
 
+/**
+ * after this a rebuild() must be called
+ */
 void Water::setSize(float sizeX, float sizeY)
 {
@@ -136 +147 @@
 
 
+/**
+ * @brief calculated the Position in the Grid, this Point is nearest to
+ * @param x, the x-position over the Grid
+ * @param z: the z-Position(or y) over the Grid
+ * @param row returns the row if not out of range
+ * @param column returns the column if not out of range
+ * @returns true if a valid point is found, false if any x or y are out of range
+ */
 bool Water::posToGridPoint(float x, float z, unsigned int& row, unsigned int& column)
 {
@@ -152 +171 @@
 void Water::draw() const
 {
-  if (this->grid != NULL)
-  {
-    //SkyBox::enableCubeMap();
-    WorldEntity::draw();
-    glBindTexture(GL_TEXTURE_2D, 15);
-    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-    glEnable(GL_TEXTURE_GEN_S);
-    glEnable(GL_TEXTURE_GEN_T);
-
-    glEnable(GL_BLEND);
+  assert (this->grid != NULL);
+  {
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    /* translate */
+    glTranslatef (this->getAbsCoor ().x,
+                  this->getAbsCoor ().y,
+                  this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+    if (State::getSkyBox())
+    {
+      glBindTexture(GL_TEXTURE_2D, State::getSkyBox()->getTexture(SKY_TOP));
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+      glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+      glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+      glEnable(GL_TEXTURE_GEN_S);
+      glEnable(GL_TEXTURE_GEN_T);
+    }
     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    this->grid->draw();
     // this->waterShader->activateShader();
     //  this->waterMaterial->select();