Changeset 8023 in orxonox.OLD

Timestamp:

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

Author:

hdavid

Message:

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

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (4 diffs)
• fog_effect.h (modified) (3 diffs)
• rain_effect.cc (modified) (1 diff)
• rain_effect.h (modified) (1 diff)
• snow_effect.cc (modified) (1 diff)
• snow_effect.h (modified) (1 diff)

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;

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(); }
 
                 inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); }
@@ -27 +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; }
 
         private:
@@ -37 +41 @@
                 GLfloat                 fogEnd;
                 Vector                  colorVector;
+    bool                     fogActivate;
 };
 

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

@@ -153 +153 @@
 }
 
-void RainEffect::activateRain()
-{
-        this->activate();
-}
-
-void RainEffect::deactivateRain()
-{
-        this->deactivate();
-}
-
-
 void RainEffect::tick (float dt)
 {

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

@@ -34 +34 @@
                 virtual bool deactivate();
 
-                void activateRain();
-                void deactivateRain();
+    void activateRain() { this->activate(); }
+    void deactivateRain() { this->deactivate(); }
 
                 virtual void tick(float dt);

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

@@ -159 +159 @@
 }
 
-void SnowEffect::activateSnow()
-{
-        this->activate();
-}
-
-void SnowEffect::deactivateSnow()
-{
-        this->deactivate();
-}
-
 void SnowEffect::draw() const
 {

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

@@ -36 +36 @@
                 virtual void tick(float dt);
 
-                void activateSnow();
-                void deactivateSnow();
+    void activateSnow() { this->activate(); }
+    void deactivateSnow() { this->deactivate(); }
 
                 inline void numParticles(int n) { this->particles = n; }