Changeset 8473 in orxonox.OLD for branches/water

Timestamp:

Jun 15, 2006, 3:59:09 PM (19 years ago)

Author:

stefalie

Message:

water: fog

Location:

branches/water/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (7 diffs)
• world_entities/environments/mapped_water.h (modified) (2 diffs)

branches/water/src/lib/graphics/effects/fog_effect.cc

@@ -71 +71 @@
         this->localTimer = 0;
 
-        this->fogMode = GL_EXP2;
+        this->fogMode = GL_LINEAR;
         this->fogDensity = 0.001;
         this->fogStart = 0;
-        this->fogEnd = 5000;
-        this->colorVector = Vector(0.7, 0.7, 0.7);
+        this->fogEnd = 1000;
+        this->colorVector = Vector(0.0f, 0.0f, 0.7f);
 
         return true;

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

@@ -20 +20 @@
 #include "state.h"
 
-//#include "fog_effect.h"
-
 
 CREATE_FACTORY(MappedWater, CL_MAPPED_WATER);
@@ -34 +32 @@
     this->loadParams(root);
 
-  PRINTF(0)("MaxTextureUnits: %i\n", Material::getMaxTextureUnits());
+  //PRINTF(0)("MaxTextureUnits: %i\n", Material::getMaxTextureUnits());
 
   // TODO rename texture to reflection texture
@@ -134 +132 @@
 
   this->shader->deactivateShader();
+  
+  
+  this->fog = new FogEffect();
+  fog->setFogColor(0.1f, 0.2f, 0.4f);
+  fog->setFogRange(0.0f, 500.0f);
+  fog->setFogDensity(0.03f);
 }
 
@@ -140 +144 @@
   delete shader;
   delete cam_uni;
+  delete fog;
 }
 
@@ -158 +163 @@
   glTranslatef(this->waterPos.x,this->waterPos.y,this->waterPos.z);
 
-  mat.unselect();
+  /////????//mat.unselect();
   mat.select();
 
@@ -215 +220 @@
   mat.unselect();
 
-  if(this->waterPos.y)
+  if(pos.y < this->waterPos.y)
   {
     // draw some fog
-    //FogEffect::activate();
+    this->fog->activate();
+  }
+  else
+  {
+    this->fog->deactivate();
   }
 
@@ -230 +239 @@
   this->move2 = this->move * this->kNormalMapScale;
   this->refrUV = this->g_WaterUV;
-  this->normalUV = this->g_WaterUV * this->kNormalMapScale;
+  this->normalUV = this->g_WaterUV * this->kNormalMapScale; 
 }
 

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

@@ -7 +7 @@
 #define _MAPPED_WATER_H
 
-/* INCLUDES */
 #include "world_entity.h"
 #include "material.h"
 #include "shader.h"
+#include "effects/fog_effect.h"
+
 
 class MappedWater : public WorldEntity
@@ -51 +52 @@
     Shader::Uniform*    cam_uni;                    //!< uniform that is used for the camera position
 
+    FogEffect*          fog;
+
 };