Changeset 8253 in orxonox.OLD

Timestamp:

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

Author:

amaechler

Message:

branches/atmospheric_engine: fog fade

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (5 diffs)
• fog_effect.h (modified) (2 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);
 
 using namespace std;
@@ -69 +70 @@
         //default values
         this->fogActivate = false;
+        this->fogFadeDuration = 0;
+        this->localTimer = 0;
+        
         this->fogMode = GL_EXP2;
         this->fogDensity = 0.001;
@@ -74 +78 @@
         this->fogEnd = 5000;
         this->colorVector = Vector(0.7, 0.7, 0.7);
+
 }
 
@@ -82 +87 @@
 
         this->fogActivate = true;
-
+        
+        GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
+        glFogi(GL_FOG_MODE, this->fogMode);
+        glFogfv(GL_FOG_COLOR, fogColor);
+        glFogf(GL_FOG_DENSITY, this->fogDensity);
+        glHint(GL_FOG_HINT, GL_DONT_CARE);
+        glFogf(GL_FOG_START, this->fogStart);
+        glFogf(GL_FOG_END, this->fogEnd);
+        
         glEnable(GL_FOG);
-        {
-                GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
-
-                glFogi(GL_FOG_MODE, this->fogMode);
-                glFogfv(GL_FOG_COLOR, fogColor);
-                glFogf(GL_FOG_DENSITY, this->fogDensity);
-                glHint(GL_FOG_HINT, GL_DONT_CARE);
-                glFogf(GL_FOG_START, this->fogStart);
-                glFogf(GL_FOG_END, this->fogEnd);
-        }
-        glClearColor(0.5, 0.5, 0.5, 1.0);
+        // glClearColor(0.5, 0.5, 0.5, 1.0);
 }
 
@@ -105 +108 @@
         
         glDisable(GL_FOG);
+}
+
+void FogEffect::draw() const {
+
+        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration)
+                glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
+        //else
+        //      glFogf(GL_FOG_DENSITY, this->fogDensity);
+
+}
+void FogEffect::tick(float dt)
+{
+        if (!this->fogActivate)
+                return;
+                
+
+        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {
+                this->localTimer += dt;
+                float progress = this->localTimer / this->fogFadeDuration;
+                this->fogFadeDensity = progress * this->fogDensity;
+        }
+}
+
+void FogEffect::startFogging() {
+
+        if (this->fogActivate)
+                this->deactivate();
+
+        this->fogFadeDuration = 10;
+        this->localTimer = 0;
+        this->activate();
+
 }
 

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

@@ -26 +26 @@
                 void deactivateFog() { this->deactivate(); }
 
+                virtual void draw() const;
+                virtual void tick(float dt);
+
                 inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
                 inline void setFogDensity(float density) { this->fogDensity = density; }
@@ -32 +35 @@
                 inline void setFogOption(const std::string& option) { if (option == "activate") this->fogActivate = true; }
 
+                void startFogging();
+
         private:
                 GLint stringToFogMode(const std::string& mode);
 
                 bool                            fogActivate;
-
+                GLfloat                         fogFadeDuration;
+                float                           localTimer;
+                
                 GLint                           fogMode;
                 GLfloat                         fogDensity;
+                GLfloat                         fogFadeDensity;
+
                 GLfloat                         fogStart;
                 GLfloat                         fogEnd;