Changeset 7682 in orxonox.OLD

Timestamp:

May 18, 2006, 2:38:19 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) (5 diffs)
• rain_effect.h (modified) (2 diffs)

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

@@ -60 +60 @@
         WeatherEffect::loadParams(root);
 
-        LoadParam(root, "moverain", this, RainEffect, setMoveRain);
+        // LoadParam(root, "moverain", this, RainEffect, setMoveRain);
         LoadParam(root, "coord", this, RainEffect, setRainCoord);
         LoadParam(root, "size", this, RainEffect, setRainSize);
@@ -66 +66 @@
         LoadParam(root, "velocity", this, RainEffect, setRainVelocity);
         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);
+
 }
 
@@ -74 +83 @@
         this->rainCoord = Vector(500, 500, 500);
         this->rainSize = Vector2D(1000, 1000);
-        this->rainRate = 5000;
+        this->rainRate = 3000;
         this->rainVelocity = -300;
-        this->rainLife = 2;
+        this->rainLife = 4;
+        this->rainMaxParticles = this->rainRate * this->rainLife;
 
         this->emitter = new PlaneEmitter(this->rainSize);
@@ -90 +100 @@
         if (unlikely(RainEffect::rainParticles == NULL))
         {
-                RainEffect::rainParticles = new SparkParticles(50000);
+                RainEffect::rainParticles = new SparkParticles((int) this->rainMaxParticles);
                 RainEffect::rainParticles->setName("RainParticles");
+                RainEffect::rainParticles->precache((int)this->rainLife);
                 RainEffect::rainParticles->setLifeSpan(this->rainLife, 2);
-                RainEffect::rainParticles->setRadius(0.02, 0.02);
-                RainEffect::rainParticles->setRadius(0.01, 0.01);
-                RainEffect::rainParticles->setRadius(0.03, 0.03);
-                RainEffect::rainParticles->setRadius(0.04, 0.04);
-                RainEffect::rainParticles->setColor(0.7, 0.3, 0.3, 0.5, 0.2); // grey blue 1
-                RainEffect::rainParticles->setColor(1, 0.4, 0.4, 0.5, 0.1); // grey blue 2
-                RainEffect::rainParticles->setColor(0.5, 0.7, 0.7, 0.7, 0); // light grey
+                RainEffect::rainParticles->setRadius(0, 0.03);
+                RainEffect::rainParticles->setRadius(0.2, 0.02);
+                RainEffect::rainParticles->setRadius(1, 0.01);
+                RainEffect::rainParticles->setColor(0, 0.3, 0.3, 0.5, 0.2); // grey blue 1
+                RainEffect::rainParticles->setColor(0.5, 0.4, 0.4, 0.5, 0.2); // grey blue 2
+                RainEffect::rainParticles->setColor(1, 0.7, 0.7, 0.7, 0.2); // light grey
         }
 
@@ -109 +119 @@
         this->emitter->setEmissionVelocity(this->rainVelocity);
 
-        this->emitter->setSpread(0, .2);
+        this->emitter->setSpread(this->rainWindForce / 5, .2);
 
         this->soundSource.loop(this->rainBuffer);

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

@@ -40 +40 @@
                 inline void setRainVelocity(float velocity) { this->rainVelocity = -velocity; }
                 inline void setRainLife(float life) { this->rainLife = life; }
-                inline void setMoveRain() { PRINTF(0)( "setting move true\n"); this->rainMove = true; }
+                inline void setRainWind(int force) { this->rainWindForce = force; }
+
+                inline void setRainOption(string option) { 
+                        PRINTF(0)( "setting move true\n");
+                        this->rainMove = true;
+                }
 
 
@@ -52 +57 @@
                 GLfloat                                                                                                         rainVelocity;
                 GLfloat                                                                                                         rainLife;
+                GLfloat                                                                                                         rainMaxParticles;
+                int                                                                                                                             rainWindForce;
                 bool                                                                                                                    rainMove;