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

Timestamp:

Jun 14, 2006, 2:15:03 AM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: fadeins generalized

File:

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

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

@@ -24 +24 @@
 SHELL_COMMAND(activate, FogEffect, activateFog);
 SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
-SHELL_COMMAND(startfogging, FogEffect, startFogging);
+SHELL_COMMAND(fadein, FogEffect, fadeInFog);
+SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
+
 
 using namespace std;
@@ -137 +139 @@
                 this->fogFadeDensity = 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;
+        }
 }
 
-void FogEffect::startFogging() {
+void FogEffect::fadeInFog() {
 
         if (this->fogActivate)
@@ -150 +157 @@
         this->activate();
 
+}
+
+
+void FogEffect::fadeOutFog() {
+
+        if (this->fogActivate)
+                this->deactivate();
+
+        if (!this->fogFadeOutDuration > 0)
+                this->fogFadeOutDuration = 20;
+
+        this->localTimer = 0;
+        this->activate();
 }