Changeset 8455 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc

Timestamp:

Jun 15, 2006, 1:12:24 PM (19 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: fog & changed init & activate fcts from bool to void

File:

• branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc (modified) (4 diffs)

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

@@ -71 +71 @@
 }
 
-bool FogEffect::init()
-{
-        //default values
-        this->fogActivate = false;
+void FogEffect::init()
+{
+        // default values
+        this->fogMode = GL_LINEAR;
+        this->fogDensity = 0.03;
+        this->fogStart = 0;
+        this->fogEnd = 50;
+        this->colorVector = Vector(0.3, 0.3, 0.3);
+
+        // init variables
         this->fogFadeInDuration = 0;
         this->fogFadeOutDuration = 0;
+        this->fogFadeInDensity = 0;
+        this->fogFadeOutDensity = 0;
         this->localTimer = 0;
-        
-        this->fogMode = GL_LINEAR;
-        this->fogDensity = 0.05;
-        this->fogStart = 0;
-        this->fogEnd = 500;
-        this->colorVector = Vector(0.3, 0.3, 0.3);
-
-        return 0;
-}
-
-
-bool FogEffect::activate()
+        this->fogActivate = false;
+        this->fogFadeInActivate = false;
+        this->fogFadeOutActivate = false;
+
+}
+
+
+void FogEffect::activate()
 {
         PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
@@ -102 +106 @@
         glFogf(GL_FOG_END, this->fogEnd);
 
-        // glFogf(GL_FOG_DENSITY, this->fogDensity);
-
+        if ( this->fogFadeInActivate )
+                glFogf(GL_FOG_DENSITY, this->fogFadeInDensity);
+        else if ( this->fogFadeOutActivate )
+                glFogf(GL_FOG_DENSITY, this->fogFadeOutDensity);
+        else
+                glFogf(GL_FOG_DENSITY, this->fogDensity);
+                
         glEnable(GL_FOG);
 
-        return 0;
-}
-
-
-bool FogEffect::deactivate()
+}
+
+
+void FogEffect::deactivate()
 {
         PRINTF(0)("Deactivating FogEffect\n");
@@ -120 +128 @@
         glDisable(GL_FOG);
 
-        return 0;
 }
 
 void FogEffect::draw() const {
 
+        if (!this->fogActivate)
+                return;
+
         // If Fog Fade In
-        if ( this->fogFadeInActivate ) {
+        if ( this->fogFadeInActivate )
                 glFogf(GL_FOG_DENSITY, this->fogFadeInDensity);
-                // PRINTF(0)( "this->fogFadeInDensity: %f\n", this->fogFadeInDensity);
-        }
+
         // If Fog Fade Out
-        else if ( this->fogFadeOutActivate )
+        if ( this->fogFadeOutActivate )
                 glFogf(GL_FOG_DENSITY, this->fogFadeOutDensity);
-
-        // Normal Fog activate
-        else
-                glFogf(GL_FOG_DENSITY, this->fogDensity);
 
 }
@@ -147 +152 @@
         if ( this->fogFadeInActivate ) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->fogFadeInDuration;
-                this->fogFadeInDensity = progress * this->fogDensity;
+                this->fogFadeInDensity = ( this->localTimer / this->fogFadeInDuration ) * this->fogDensity;
 
                 if ( this->localTimer >= this->fogFadeOutDuration )
                         this->fogFadeInActivate = false;
         }
-        else if ( this->fogFadeOutActivate ) {
+
+        if ( this->fogFadeOutActivate ) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->fogFadeInDuration;
-                this->fogFadeOutDensity = 1 - progress * this->fogDensity;
+                this->fogFadeOutDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
 
                 if ( this->localTimer >= this->fogFadeOutDuration )