Changeset 8788 in orxonox.OLD

Timestamp:

Jun 26, 2006, 2:33:26 PM (18 years ago)

Author:

stefalie

Message:

water: param reset functions work, the fade functions are next

Location:

branches/water/src/world_entities/environments

Files:

• mapped_water.cc (modified) (3 diffs)
• mapped_water.h (modified) (2 diffs)

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

@@ -45 +45 @@
   /// initialization of the shaders
   this->initShaders();
+  
+  tempcounter = 0;
 }
 
@@ -155 +157 @@
 
 /**
+ * @brief resets the waterColor in the Shader
+ * @param r new value for red
+ * @param g new value for green
+ * @param b new value for blue
+ */
+void MappedWater::resetWaterColor(float r, float g, float b)
+{
+  this->shader->activateShader();
+  this->waterColor = Vector(r, g, b);
+
+  // Give the variable "waterColor" a color
+  color_uni->set(waterColor.x, waterColor.y, waterColor.z, 1.0f);
+
+  this->shader->deactivateShader();
+};
+
+/**
+ * @brief resets the shininess in the Shader
+ * @param shine new value for the shininess
+ */
+void MappedWater::resetShininess(float shine)
+{
+  this->shader->activateShader();
+  this->shininess = shine;
+
+  // Set the variable "shine"
+  shine_uni->set(this->shininess);
+
+  this->shader->deactivateShader();
+};
+
+/**
+ * @brief resets the lightPos in the Shader
+ * @param x new x value
+ * @param y new y value
+ * @param z new z value
+ */
+void MappedWater::resetLightPos(float x, float y, float z)
+{
+  this->shader->activateShader();
+  this->lightPos = Vector(x, y, z);
+
+  // Give the variable "lightPos" our hard coded light position
+  light_uni->set(lightPos.x, lightPos.y, lightPos.z, 1.0f);
+
+  this->shader->deactivateShader();
+};
+
+/**
  * @brief ends the refraction and saves the graphic buffer into a texture
  * @param root xml data
@@ -239 +290 @@
   this->move += this->waterFlow * dt;
   this->move2 = this->move * this->kNormalMapScale;
+  
+
+  if(this->tempcounter == 200) {
+    this->resetWaterColor(1, 0, 0);
+    resetShininess(1);
+    resetLightPos(0, 100, 0);
+    PRINTF(0)("test waterchangecolor ");
+    }
+  tempcounter++;
+    
 }
 

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

@@ -54 +54 @@
   void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); };
 
+  // functions to change water parameters during runtime
+  // to reset waterUV and waterFlow just use the normal set functions
+  void resetWaterColor(float r, float g, float b);
+  void resetShininess(float shine);
+  void resetLightPos(float x, float y, float z);
+
 private:
   void initParams();
@@ -80 +86 @@
   Shader::Uniform*    color_uni;              //!< uniform that is used for the watercolor
   Shader::Uniform*    shine_uni;              //!< uniform that is used for the specular shininessd of the water
+  
+  
+  int tempcounter;
 };