Changeset 7685 in orxonox.OLD

Timestamp:

May 18, 2006, 3:07:45 PM (18 years ago)

Author:

amaechler

Message:

branches/atmosphere_engine: wind, rain changes

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

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

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

@@ -67 +67 @@
         LoadParam(root, "life", this, RainEffect, setRainLife);
         LoadParam(root, "wind", this, RainEffect, setRainWind);
-
-//      LOAD_PARAM_START_CYCLE(root, element);
-//      {
-//              element->ToText();
-//              LoadParam_CYCLE(element, "option", this, RainEffect, setRainOption);
-//      }
-//      LOAD_PARAM_END_CYCLE(element);
-
+        LoadParam(root, "option", this, RainEffect, setRainOption);
 }
 
@@ -87 +80 @@
         this->rainLife = 4;
         this->rainMaxParticles = this->rainRate * this->rainLife;
+        this->rainWindForce  = 0;
 
         this->emitter = new PlaneEmitter(this->rainSize);
@@ -119 +113 @@
         this->emitter->setEmissionVelocity(this->rainVelocity);
 
-        this->emitter->setSpread(this->rainWindForce / 5, .2);
+        this->emitter->setSpread(this->rainWindForce / 50, 0.2);
 
         this->soundSource.loop(this->rainBuffer);
@@ -136 +130 @@
 {
         //float distance = (State::getCameraNode()->getAbsCoor() - rainCoord).len();
-        
         // PRINTF(0)( "RainEffect, coords: %f, %f, %f\n", this->rainCoord.x, this->rainCoord.y, this->rainCoord.z );
 
-        //if (this->rainMove) {
-                //PRINTF(0)( "Moving Rain" );
-        //      this->rainCoord = State::getCameraNode()->getAbsCoor();
-        //      this->emitter->setRelCoor(this->rainCoord.x +150, this->rainCoord.y+700, this->rainCoord.z+150);
-        //}
+        if (this->rainMove) {
+                PRINTF(0)( "Moving Rain" );
+                this->rainCoord = State::getCameraNode()->getAbsCoor();
+                this->emitter->setRelCoor(this->rainCoord.x +150, this->rainCoord.y+700, this->rainCoord.z+150);
+        }
 }

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

@@ -8 +8 @@
 #include "vector.h"
 #include "vector2D.h"
+#include <string>
 
 #include "particle_system.h"
@@ -41 +42 @@
                 inline void setRainLife(float life) { this->rainLife = life; }
                 inline void setRainWind(int force) { this->rainWindForce = force; }
-
-                inline void setRainOption(string option) { 
-                        PRINTF(0)( "setting move true\n");
-                        this->rainMove = true;
-                }
+                inline void setRainOption(const std::string& option) { if (option == "moverain") this->rainMove = true; }