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

Timestamp:

May 31, 2006, 1:16:43 PM (19 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: activating/deactivating fogEffect in the oxw-file works,default: deactivate

File:

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

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

@@ -20 +20 @@
 #include "glincl.h"
 
-/*#include "shell_command.h"
-SHELL_COMMAND(activateFog, FogEffect, FogEffect::activate)
-        ->setAlias("aFog");
-SHELL_COMMAND(deactivateFog, FogEffect, FogEffect::deactivate)
-        ->setAlias("dFog");*/
+#include "shell_command.h"
+
+SHELL_COMMAND(activate, FogEffect, activateFog);
+SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
 
 using namespace std;
@@ -39 +38 @@
                 this->loadParams(root);
 
-        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);
 }
 
@@ -62 +63 @@
 {
         //default values
+  this->fogActivate = false;
         this->fogMode = GL_EXP2;
         this->fogDensity = 0.001;