Changeset 8247 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects

Timestamp:

Jun 8, 2006, 2:55:02 PM (19 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: fog activate, cleanups

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (1 diff)
• fog_effect.cc (modified) (5 diffs)
• fog_effect.h (modified) (2 diffs)
• rain_effect.cc (modified) (3 diffs)
• rain_effect.h (modified) (1 diff)

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

@@ -155 +155 @@
 
         // glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        glShadeModel(GL_SMOOTH);
-        glEnable(GL_DEPTH_TEST);
-        glEnable(GL_CULL_FACE);
-        glCullFace(GL_BACK);
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-        
-        glLineWidth(3.0f);
+        // glShadeModel(GL_SMOOTH);
+        // glEnable(GL_DEPTH_TEST);
+        // glEnable(GL_CULL_FACE);
+        // glCullFace(GL_BACK);
+        // glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+        
+        // glLineWidth(3.0f);
 
         static float time = 0.0f;

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

@@ -38 +38 @@
                 this->loadParams(root);
 
-  if( this->fogActivate )
-         this->activate();
+        if (this->fogActivate)
+                this->activate();
 }
 
@@ -57 +57 @@
         LoadParam(root, "range", this, FogEffect, setFogRange);
         LoadParam(root, "color", this, FogEffect, setFogColor);
-  LoadParam(root, "option", this, FogEffect, setFogOption);
+
+        LOAD_PARAM_START_CYCLE(root, element);
+        {
+                LoadParam_CYCLE(element, "option", this, FogEffect, setFogOption);
+        }
+        LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -63 +68 @@
 {
         //default values
-  this->fogActivate = false;
+        this->fogActivate = false;
         this->fogMode = GL_EXP2;
         this->fogDensity = 0.001;
         this->fogStart = 0;
         this->fogEnd = 5000;
-  this->colorVector = Vector(0.7, 0.7, 0.7);
+        this->colorVector = Vector(0.7, 0.7, 0.7);
 }
-
 
 
@@ -76 +80 @@
 {
         PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
+
+        this->fogActivate = true;
 
         glEnable(GL_FOG);
@@ -95 +101 @@
 {
         PRINTF(0)("Deactivating FogEffect\n");
+
+        this->fogActivate = false;
+        
         glDisable(GL_FOG);
 }

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

@@ -22 +22 @@
                 virtual bool activate();
                 virtual bool deactivate();
-    
-    void activateFog() { this->activate(); }
-    void deactivateFog() { this->deactivate(); }
+
+                void activateFog() { this->activate(); }
+                void deactivateFog() { this->deactivate(); }
 
                 inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
@@ -30 +30 @@
                 inline void setFogRange(float start, float end) { this->fogStart = start; this->fogEnd = end; }
                 inline void setFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
-    inline void setFogOption(const std::string& option) { if (option == "activate") this->fogActivate = true; }
+                inline void setFogOption(const std::string& option) { if (option == "activate") this->fogActivate = true; }
 
         private:
                 GLint stringToFogMode(const std::string& mode);
 
-        private:
-                GLint                   fogMode;
-                GLfloat                 fogDensity;
-                GLfloat                 fogStart;
-                GLfloat                 fogEnd;
-                Vector                  colorVector;
-    bool                     fogActivate;
+                bool                            fogActivate;
+
+                GLint                           fogMode;
+                GLfloat                         fogDensity;
+                GLfloat                         fogStart;
+                GLfloat                         fogEnd;
+                Vector                          colorVector;
 };
 

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

@@ -116 +116 @@
 
         lightMan = LightManager::getInstance();
+        this->rainAmbient = lightMan->getAmbientColor();
 }
 
@@ -163 +164 @@
         this->rainActivate = false;
         this->emitter->setSystem(NULL);
+
+        // Stop Sound
         this->soundSource.stop();
 
-        lightMan->setAmbientColor(1,1,1);
+        // Restore Light Ambient
+        lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
 }
 
@@ -182 +186 @@
                 float progress = this->localTimer / this->rainStartDuration;
 
-                // PRINTF(0)("Progress %f: \n", progress);
+                // Dim Light
+                lightMan->setAmbientColor(1.1 - progress, 1.1 - progress, 1.1 - progress);
 
                 // use alpha in color to fade in

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

@@ -78 +78 @@
                 float                                   soundRainVolume;
 
-                LightManager* lightMan;
+                LightManager*                           lightMan;
+                GLfloat                                 rainAmbient;
+
 };