Changeset 8867 in orxonox.OLD

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

Location:

branches/mountain_lake/src/world_entities/environments

Files:

• mapped_water.cc (modified) (6 diffs)
• mapped_water.h (modified) (5 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);
 }

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

@@ -12 +12 @@
   <waterangle>0</waterangle>
   <normalmapscale>0.25</normalmapscale><!-- you won't see a big differnce if you change that -->
-  <shineSize>128</shineSize><!-- the bigger the value, the smaller the specular reflection point -->
-  <shineStrength>0.7</shineStrength>
+  <shinesize>128</shinesize><!-- the bigger the value, the smaller the specular reflection point -->
+  <shinestrength>0.7</shinestrength>
+  <reflstrength>1</reflstrength>
   <refraction>0.009</refraction>
   <watercolor>0.1, 0.2, 0.4</watercolor>
@@ -55 +56 @@
   void setShineSize(float shine) { this->shineSize = shine; }
   void setShineStrength(float strength) { this->shineStrength = strength; }
+  void setReflStrength(float strength) { this->reflStrength = strength; }
   void setRefraction(float refraction) { this->refraction = refraction; }
   void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); this->newWaterColor = this->waterColor; }
@@ -63 +65 @@
   void resetShineSize(float shine);
   void resetShineStrength(float strength);
+  void resetReflStrength(float strength);
   void resetRefraction(float refraction);
   void resetLightPos(float x, float y, float z);
@@ -96 +99 @@
   float               shineSize;              //!< the bigger the value, the smaller the specular reflection point
   float               shineStrength;
+  float               reflStrength;
   float               refraction;
 
@@ -107 +111 @@
   Shader::Uniform*    shineStrength_uni;      //!< uniform that is used for the strenght of the specular reflection
   Shader::Uniform*    refr_uni;               //!< uniform that is used for the strength of the refraction
+  Shader::Uniform*    reflStrength_uni;       //!< uniform that is used for the strength of the reflection