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

Timestamp:

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

Author:

amaechler

Message:

branches/atmospheric_engine: fog activate, cleanups

File:

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

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);
 }