Changeset 8792 in orxonox.OLD for trunk/src/world_entities/environments/mapped_water.cc

Timestamp:

Jun 26, 2006, 3:18:08 PM (19 years ago)

Author:

patrick

Message:

merged water branche back to trunk

File:

• trunk/src/world_entities/environments/mapped_water.cc (modified) (9 diffs)

trunk/src/world_entities/environments/mapped_water.cc

@@ -19 +19 @@
 #include "util/loading/resource_manager.h"
 #include "state.h"
+#include "math.h"
 
 
@@ -44 +45 @@
   /// initialization of the shaders
   this->initShaders();
+  
+  tempcounter = 0;
 }
 
@@ -53 +56 @@
   delete shader;
   delete cam_uni;
+  delete color_uni;
+  delete light_uni;
+  delete shine_uni;
 }
 
@@ -68 +74 @@
   this->setWaterAngle(0);
   this->setNormalMapScale(0.25f);
+  this->setWaterColor(0.1f, 0.2f, 0.4f);
+  this->setShininess(128);
 
   // initialization of the texture coords, speeds etc...
@@ -75 +83 @@
   this->move = 0;
   this->move2 = this->move * this->kNormalMapScale;
+
+
 }
 
@@ -132 +142 @@
   Shader::Uniform(shader, "depthMap").set(2);
   // Give the variable "waterColor" a blue color
-  Shader::Uniform(shader, "waterColor").set(0.1f, 0.2f, 0.4f, 1.0f);
+  color_uni = new Shader::Uniform(shader, "waterColor");
+  color_uni->set(waterColor.x, waterColor.y, waterColor.z, 1.0f);
   // Give the variable "lightPos" our hard coded light position
-  Shader::Uniform(shader, "lightPos").set(lightPos.x, lightPos.y, lightPos.z, 1.0f);
+  light_uni = new Shader::Uniform(shader, "lightPos");
+  light_uni->set(lightPos.x, lightPos.y, lightPos.z, 1.0f);
+  // Set the variable "shine"
+  shine_uni = new Shader::Uniform(shader, "kShine");
+  shine_uni->set(this->shininess);
   // uniform for the camera position
   cam_uni = new Shader::Uniform(shader, "cameraPos");
@@ -140 +155 @@
   this->shader->deactivateShader();
 }
+
+/**
+ * @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();
+};
 
 /**
@@ -156 +220 @@
   LoadParam(root, "normalmapscale", this, MappedWater, setNormalMapScale);
   LoadParam(root, "waterangle", this, MappedWater, setWaterAngle);
+  LoadParam(root, "watercolor", this, MappedWater, setWaterColor);
+  LoadParam(root, "shininess", this, MappedWater, setShininess);
 }
 
@@ -224 +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, 50, 0);
+//     PRINTF(0)("test waterchangecolor ");
+//     }
+//   tempcounter++;
+    
 }