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

Timestamp:

Jun 15, 2006, 1:01:31 AM (18 years ago)

Author:

amaechler

Message:

atmospheric_engine: fade work

File:

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

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

@@ -123 +123 @@
 void FogEffect::draw() const {
 
+        // If Fog Fade In
         if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration)
-                glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
-        //else
-        //      glFogf(GL_FOG_DENSITY, this->fogDensity);
+                glFogf(GL_FOG_DENSITY, this->fogFadeInDensity);
+
+        // If Fog Fade Out
+        else if (this->fogFadeOutDuration > 0 && this->localTimer < this->fogFadeOutDuration)
+                glFogf(GL_FOG_DENSITY, this->fogFadeOutDensity);
+
+        // Normal Fog activate
+        else
+                glFogf(GL_FOG_DENSITY, this->fogDensity);
 
 }
@@ -134 +141 @@
                 return;
                 
-        if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration) {
+        if ( this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration ) {
                 this->localTimer += dt;
                 float progress = this->localTimer / this->fogFadeInDuration;
-                this->fogFadeDensity = progress * this->fogDensity;
+                this->fogFadeInDensity = progress * this->fogDensity;
         }
-        else if (this->fogFadeOutDuration > 0 && this->localTimer < this->fogFadeOutDuration) {
-                this->localTimer += dt;
-                float progress = this->localTimer / this->fogFadeInDuration;
-                this->fogFadeDensity = 1 - progress * this->fogDensity;
+        else if ( this->fogFadeOutDuration > 0 ) {
+                if ( this->localTimer < this->fogFadeOutDuration ) {
+                        this->localTimer += dt;
+                        float progress = this->localTimer / this->fogFadeInDuration;
+                        this->fogFadeOutDensity = 1 - progress * this->fogDensity;
+                }
+                else
+                        this->deactivate();
         }
 }
@@ -148 +159 @@
 void FogEffect::fadeInFog() {
 
+        // If Fog is already on, turn it off first
         if (this->fogActivate)
                 this->deactivate();
 
+        // If no manual FadeIn value was set, set a default value
         if (!this->fogFadeInDuration > 0)
                 this->fogFadeInDuration = 20;
 
+        // Reset local timer
         this->localTimer = 0;
+
+        // Activate Fog
         this->activate();
 
@@ -162 +178 @@
 void FogEffect::fadeOutFog() {
 
-        if (this->fogActivate)
-                this->deactivate();
-
+        // If Fog is off, turn it on first
+        if (!this->fogActivate)
+                this->activate();
+
+        // If no manual FadeOut value was set, set a default value
         if (!this->fogFadeOutDuration > 0)
                 this->fogFadeOutDuration = 20;
 
+        // Reset local timer
         this->localTimer = 0;
-        this->activate();
+
 }