Changeset 8867 in orxonox.OLD for branches/mountain_lake/src/world_entities/environments/mapped_water.cc

Timestamp:

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

Author:

stefalie

Message:

mountain_lake: now its possible to set the strength of the reflection in the oxw file

File:

• branches/mountain_lake/src/world_entities/environments/mapped_water.cc (modified) (6 diffs)

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

@@ -63 +63 @@
   delete shineSize_uni;
   delete shineStrength_uni;
+  delete reflStrength_uni;
   delete refr_uni;
 }
@@ -75 +76 @@
   this->setWaterSize(100, 100);
   this->setWaterUV(9);
-  this->setWaterFlow(0.08);
+  this->setWaterFlow(0.08f);
   this->setLightPos(0, 10, 0);
   this->setWaterAngle(0);
@@ -81 +82 @@
   this->setWaterColor(0.1f, 0.2f, 0.4f);
   this->setShineSize(128);
-  this->setShineStrength(0.7);
+  this->setShineStrength(0.7f);
+  this->setReflStrength(1.0f);
   this->setRefraction(0.009f);
 
@@ -160 +162 @@
   shineStrength_uni = new Shader::Uniform(shader, "shineStrength");
   shineStrength_uni->set(this->shineStrength);
+  // Set the variable "reflStrength"
+  reflStrength_uni = new Shader::Uniform(shader, "reflStrength");
+  reflStrength_uni->set(this->reflStrength);
   // Set the variable "refraction"
   refr_uni = new Shader::Uniform(shader, "kRefraction");
@@ -227 +232 @@
   // Set the variable "shine"
   shineStrength_uni->set(this->shineStrength);
+
+  this->shader->deactivateShader();
+}
+
+/**
+ * @brief resets the strength of the reflection in the Shader
+ * @param strength new value for the strength of the reflection
+ */
+void MappedWater::resetReflStrength(float strength)
+{
+  this->shader->activateShader();
+  this->reflStrength = strength;
+
+  // Set the variable "shine"
+  reflStrength_uni->set(this->reflStrength);
 
   this->shader->deactivateShader();
@@ -281 +301 @@
   LoadParam(root, "shinesize", this, MappedWater, setShineSize);
   LoadParam(root, "shinestrength", this, MappedWater, setShineStrength);
+  LoadParam(root, "reflstrength", this, MappedWater, setReflStrength);
   LoadParam(root, "refraction", this, MappedWater, setRefraction);
 }