Changeset 8848 in orxonox.OLD

Timestamp:

Jun 28, 2006, 1:36:56 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: added coords for all 4 verts…

Location:

branches/mountain_lake/src/world_entities/environments

Files:

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

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

@@ -45 +45 @@
   /// initialization of the shaders
   this->initShaders();
-  
+
+  /// calculation of the 4 verts of the water quad
+  this->waterVerts[0] = this->waterPos.x;
+  this->waterVerts[1] = this->waterPos.z;
+  this->waterVerts[2] = this->waterVerts[0] + cos(this->waterAngle) * this->xWidth;
+  this->waterVerts[3] = this->waterVerts[1] + sin(this->waterAngle) * this->xWidth;
+  this->waterVerts[2] = this->waterVerts[0] - sin(this->waterAngle) * this->zWidth;
+  this->waterVerts[3] = this->waterVerts[1] + cos(this->waterAngle) * this->zWidth;
+  this->waterVerts[2] = this->waterVerts[0] + cos(this->waterAngle) * this->xWidth - sin(this->waterAngle) * this->zWidth;
+  this->waterVerts[3] = this->waterVerts[1] + sin(this->waterAngle) * this->xWidth + cos(this->waterAngle) * this->zWidth;
+
   tempcounter = 0;
 }
@@ -300 +310 @@
 //   tempcounter++;
 
-  if(this->tempcounter == 10) {
-    this->fadeWaterColor(1, 0, 0, 10);
-
-    PRINTF(0)("test waterchangecolor ");
-    }
-  tempcounter++;
-
-  if(this->newWaterColor != this->waterColor)
-  {
-    float time = this->colorFadeTime / dt;
-    float x = (this->newWaterColor.x - this->waterColor.x) * time +this->waterColor.x;
-    float y = (this->newWaterColor.y - this->waterColor.y) * time +this->waterColor.y;
-    float z = (this->newWaterColor.z - this->waterColor.z) * time +this->waterColor.z;
-
-    this->colorFadeTime -= dt;
-    this->resetWaterColor(x, y, z);
-  }
-    
+//   if(this->tempcounter == 100) {
+//     this->fadeWaterColor(1, 0, 0, 10);
+// 
+//     PRINTF(0)("test waterchangecolor ");
+//     }
+//   tempcounter++;
+// 
+//   if(this->newWaterColor != this->waterColor)
+//   {
+//     float dtime = this->colorFadeTime / dt;
+//     Vector temp = (this->newWaterColor - this->waterColor) * dtime + this->waterColor;
+// 
+//     temp.debug();
+// 
+//     this->colorFadeTime -= dt;
+//     this->resetWaterColor(temp.x, temp.y, temp.z);
+//   }
 }
 

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

@@ -73 +73 @@
   Vector              waterPos;               //!< position of the water
   float               xWidth, zWidth;         //!< size of the water quad
+  float               waterVerts[8];       //!< coords of the 4 vertexes of the water quad
   Vector              lightPos;               //!< position of the light that is used to render the reflection
   float               waterAngle;             //!< defines how much the water will be turned around the point waterPos