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

Timestamp:

Jun 15, 2006, 3:18:34 PM (18 years ago)

Author:

amaechler

Message:

atmospheric: fog - weird fade problems, not solved

File:

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

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

@@ -79 +79 @@
     this->fogFadeInDuration = 0;
     this->fogFadeOutDuration = 0;
-    this->fogFadeInDensity = 0;
-    this->fogFadeOutDensity = 0;
+    this->fogFadeDensity = 0;
     this->localTimer = 0;
     this->fogActivate = false;
@@ -98 +97 @@
     glFogfv(GL_FOG_COLOR, fogColor);
     glHint(GL_FOG_HINT, GL_DONT_CARE);
+    glFogf(GL_FOG_DENSITY, this->fogDensity);
     glFogf(GL_FOG_START, this->fogStart);
     glFogf(GL_FOG_END, this->fogEnd);
-
-    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);
@@ -129 +122 @@
         return;
 
-    // If Fog Fade In
-    if ( this->fogFadeInActivate )
-        glFogf(GL_FOG_DENSITY, this->fogFadeInDensity);
-
-    // If Fog Fade Out
-    if ( this->fogFadeOutActivate )
-        glFogf(GL_FOG_DENSITY, this->fogFadeOutDensity);
+    // If Fog Fade
+    if ( this->fogFadeInActivate || this->fogFadeOutActivate )
+        glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
 
 }
@@ -145 +134 @@
     if ( this->fogFadeInActivate ) {
         this->localTimer += dt;
-        this->fogFadeInDensity = ( this->localTimer / this->fogFadeInDuration ) * this->fogDensity;
+        this->fogFadeDensity = ( this->localTimer / this->fogFadeInDuration ) * this->fogDensity;
 
         if ( this->localTimer >= this->fogFadeOutDuration )
@@ -153 +142 @@
     if ( this->fogFadeOutActivate ) {
         this->localTimer += dt;
-        this->fogFadeOutDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
+        this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
 
         if ( this->localTimer >= this->fogFadeOutDuration )