Changeset 7689 in orxonox.OLD

Timestamp:

May 18, 2006, 3:28:50 PM (18 years ago)

Author:

amaechler

Message:

branches/atmosphere_engine: fog weirdness…

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (6 diffs)
• fog_effect.h (modified) (1 diff)
• rain_effect.cc (modified) (1 diff)

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

@@ -33 +33 @@
 {
         this->setClassID(CL_FOG_EFFECT, "FogEffect");
-        
-        this->fogMode = GL_LINEAR;
-        this->fogDensity = 0.1f;
-        this->fogStart = 0.0f;
-        this->fogEnd = 5000.0f;
-  this->colorVector = Vector(0.7, 0.7, 0.7);
+
+        this->init();
 
         if (root != NULL)
@@ -45 +41 @@
         this->activate();
 }
-
 
 
@@ -61 +56 @@
         LoadParam(root, "fog-density", this, FogEffect, setFogDensity);
         LoadParam(root, "fog-color", this, FogEffect, setFogColor);
-
-
 }
 
 bool FogEffect::init()
-{}
+{
+        //default values
+        this->fogMode = GL_LINEAR;
+        this->fogDensity = 0.1;
+        this->fogStart = 0;
+        this->fogEnd = 5000;
+  this->colorVector = Vector(0.7, 0.7, 0.7);
+}
 
 
@@ -76 +76 @@
         glEnable(GL_FOG);
         {
-                //GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0};
                 GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
 
@@ -85 +84 @@
                 glFogf(GL_FOG_START, this->fogStart);
                 glFogf(GL_FOG_END, this->fogEnd);
-
-                //glFogi(GL_FOG_COORDINATE_SOURCE, GL_FOG_COORDINATE);
         }
         glClearColor(0.5, 0.5, 0.5, 1.0);
@@ -97 +94 @@
         glDisable(GL_FOG);
 }
-
 
 

branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h

@@ -28 +28 @@
                 inline void setFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
 
-
         private:
                 GLint stringToFogMode(const std::string& mode);
-
 
         private:

branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc

@@ -133 +133 @@
 
         if (this->rainMove) {
-                PRINTF(0)( "Moving Rain" );
                 this->rainCoord = State::getCameraNode()->getAbsCoor();
                 this->emitter->setRelCoor(this->rainCoord.x +150, this->rainCoord.y+700, this->rainCoord.z+150);