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

Timestamp:

Jun 8, 2006, 4:28:24 PM (18 years ago)

Author:

amaechler

Message:

raise the number:)

File:

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

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

@@ -58 +58 @@
         LoadParam(root, "range", this, FogEffect, setFogRange);
         LoadParam(root, "color", this, FogEffect, setFogColor);
+        LoadParam(root, "fadeinduration", this, FogEffect, setFogFadeIn);
+        LoadParam(root, "fadeoutduration", this, FogEffect, setFogFadeOut);
 
         LOAD_PARAM_START_CYCLE(root, element);
@@ -70 +72 @@
         //default values
         this->fogActivate = false;
-        this->fogFadeDuration = 0;
+        this->fogFadeInDuration = 0;
+        this->fogFadeOutDuration = 0;
         this->localTimer = 0;
         
@@ -79 +82 @@
         this->colorVector = Vector(0.7, 0.7, 0.7);
 
+        return 0;
 }
 
@@ -98 +102 @@
         glEnable(GL_FOG);
         // glClearColor(0.5, 0.5, 0.5, 1.0);
+
+        return 0;
 }
 
@@ -108 +114 @@
         
         glDisable(GL_FOG);
+
+        return 0;
 }
 
 void FogEffect::draw() const {
 
-        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration)
+        if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration)
                 glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
         //else
@@ -124 +132 @@
                 
 
-        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {
+        if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->fogFadeDuration;
+                float progress = this->localTimer / this->fogFadeInDuration;
                 this->fogFadeDensity = progress * this->fogDensity;
         }
@@ -136 +144 @@
                 this->deactivate();
 
-        this->fogFadeDuration = 10;
+        if (!this->fogFadeInDuration > 0)
+                this->fogFadeInDuration = 20;
+
         this->localTimer = 0;
         this->activate();