Changeset 8020 in orxonox.OLD

Timestamp:

May 31, 2006, 12:32:34 PM (18 years ago)

Author:

hdavid

Message:

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

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• rain_effect.cc (modified) (3 diffs)
• rain_effect.h (modified) (2 diffs)

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

@@ -58 +58 @@
         }
 
-        this->activate();
+  if(rainActivate)
+         this->activate();
 }
 
@@ -82 +83 @@
         LoadParam(root, "life", this, RainEffect, setRainLife);
         LoadParam(root, "wind", this, RainEffect, setRainWind);
-        LoadParam(root, "option", this, RainEffect, setRainOption);
+  
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    LoadParam_CYCLE(element, "option", this, RainEffect, setRainOption);
+  }
+  LOAD_PARAM_END_CYCLE(element);
+  
 }
 
@@ -89 +96 @@
 {
         //Default values
+  this->rainActivate = false;
+  this->rainMove = false;
         this->rainCoord = Vector(500, 500, 500);
         this->rainSize = Vector2D(1000, 1000);

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

@@ -45 +45 @@
                 inline void setRainLife(float life) { this->rainLife = life; }
                 inline void setRainWind(int force) { this->rainWindForce = force; }
-                inline void setRainOption(const std::string& option) { if (option == "moverain") this->rainMove = true; }
+                inline void setRainOption(const std::string& option) { if (option == "moverain") this->rainMove = true;
+                                                                                if (option == "activate") this->rainActivate = true; }
 
 
@@ -60 +61 @@
                 int                                                                                                                             rainWindForce;
                 bool                                                                                                                    rainMove;
+    bool                              rainActivate;
 
                 OrxSound::SoundSource                   soundSource;