Changeset 7576 in orxonox.OLD

Timestamp:

May 10, 2006, 5:03:37 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: basic snow

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• snow_effect.cc (modified) (7 diffs)
• snow_effect.h (modified) (3 diffs)

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

@@ -19 +19 @@
 
 #include "glincl.h"
+#include "debug.h"
 
 #include "state.h"
@@ -25 +26 @@
 
 #include "parser/tinyxml/tinyxml.h"
+
+//SHELL_COMMAND(activate, SnowEffect, activateSnow);
 
 using namespace std;
@@ -34 +37 @@
   this->setClassID(CL_SNOW_EFFECT, "SnowEffect");
 
-//   this->snowMode = GL_LINEAR;
-//   this->snowDensity = 0.001f;
-//   this->snowStart = 10.0f;
-//   this->snowEnd = 1000.0f;
-
   if (root != NULL)
     this->loadParams(root);
@@ -46 +44 @@
   this->activate();
 }
-
 
 
@@ -69 +66 @@
 bool SnowEffect::init()
 {
-  Vector2D      size;
-  size.x = 1200;
-  size.y = 1200;
-  this->emitter = new PlaneEmitter(size, 900, 40, 5);
+  this->emitter = new PlaneEmitter();
 }
 
@@ -80 +74 @@
 {
   PRINTF(0)("Activating Snow Effect\n");
-  /*
-  SnowEffect::snowParticles = new SpriteParticles(2000);
+  
+  SnowEffect::snowParticles = new SpriteParticles(10000);
   SnowEffect::snowParticles->setName("SnowEffectTrailParticles");
-  SnowEffect::snowParticles->setMaterialTexture("maps/radial-trans-noise.png");
-  SnowEffect::snowParticles->setLifeSpan(1.0, .3);
-  SnowEffect::snowParticles->setRadius(0.0, .5);
-  SnowEffect::snowParticles->setRadius(0.2, 2.0);
-  SnowEffect::snowParticles->setRadius(.5, .8);
-  SnowEffect::snowParticles->setRadius(1.0, .8);
-  SnowEffect::snowParticles->setColor(0.0, 1,0,0,.7);
-  SnowEffect::snowParticles->setColor(0.2, .8,.8,0,.5);
-  SnowEffect::snowParticles->setColor(0.5, .8,.8,.8,.8);
-  SnowEffect::snowParticles->setColor(1.0, .8,.8,.8,.0);
+  SnowEffect::snowParticles->setMaterialTexture("maps/snow_flake_01_32x32.png");
+  //SnowEffect::snowParticles->setSize(1);
+  SnowEffect::snowParticles->setLifeSpan(8, 2);
+  SnowEffect::snowParticles->setRadius(0.0, 5.0, 10.0);
+  SnowEffect::snowParticles->setRadius(0.2, 5.0, 10);
+  SnowEffect::snowParticles->setRadius(1.0, 5.0, 10);
+  SnowEffect::snowParticles->setMass(0, 1.0, .3);
+  SnowEffect::snowParticles->setColor(0,1, 1, 1,.5);
+  SnowEffect::snowParticles->setColor(.5, .6, .6, .6, .2);
+  SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+
   
   this->emitter->setSystem(SnowEffect::snowParticles);
-
-  this->updateNode(0);
-  this->emitter->setEmissionRate(45.0);
-  this->emitter->setEmissionVelocity(0.0);*/
+  
+ // this->updateNode(0);
+  this->emitter->setEmissionRate(900);
+  this->emitter->setEmissionVelocity(150, 50);
+  this->emitter->setSpread(0, .3);
+  this->emitter->setSize(1200, 1200);
 }
 
@@ -105 +102 @@
 {
   PRINTF(0)("Deactivating Snow Effect\n");
+  
+  this->emitter->setSystem(NULL);
 }
 

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

@@ -14 +14 @@
 
 class SpriteParticles;
+class PlaneEmitter;
 
 class SnowEffect : public WeatherEffect
@@ -30 +31 @@
     virtual void draw() const;
     virtual void tick(float dt);
+    
+    void activateSnow();
 
 //     inline void setSnowMode(const std::string& mode) { this->snowMode = this->stringToSnowMode(mode); }
@@ -43 +46 @@
     static SpriteParticles* snowParticles;
     
-    ParticleEmitter*          emitter;
+    PlaneEmitter*          emitter;
 };