Changeset 7651 in orxonox.OLD

Timestamp:

May 17, 2006, 4:05:14 PM (18 years ago)

Author:

amaechler

Message:

branches/atmosphere_engine: cosmetics

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• snow_effect.cc (modified) (6 diffs)
• snow_effect.h (modified) (2 diffs)

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

@@ -41 +41 @@
 
   this->init();
-  
+
   if (root != NULL)
     this->loadParams(root);
@@ -60 +60 @@
   WeatherEffect::loadParams(root);
 
-   LoadParam(root, "numParticles", this, SnowEffect, numParticles);
-   LoadParam(root, "materialTexture", this, SnowEffect, materialTexture);
-   LoadParam(root, "lifeSpans", this, SnowEffect, lifeSpan);
-   LoadParam(root, "radius", this, SnowEffect, radius);
-   LoadParam(root, "mass", this, SnowEffect, mass);
-   LoadParam(root, "emissionRate", this, SnowEffect, emissionRate);
-   LoadParam(root, "emissionVelocity", this, SnowEffect, emissionVelocity);
-   LoadParam(root, "spread", this, SnowEffect, spread);
-   LoadParam(root, "size", this, SnowEffect, size);
-   LoadParam(root, "coord", this, SnowEffect, coord);
+  LoadParam(root, "numParticles", this, SnowEffect, numParticles);
+  LoadParam(root, "materialTexture", this, SnowEffect, materialTexture);
+  LoadParam(root, "lifeSpans", this, SnowEffect, lifeSpan);
+  LoadParam(root, "radius", this, SnowEffect, radius);
+  LoadParam(root, "mass", this, SnowEffect, mass);
+  LoadParam(root, "emissionRate", this, SnowEffect, emissionRate);
+  LoadParam(root, "emissionVelocity", this, SnowEffect, emissionVelocity);
+  LoadParam(root, "spread", this, SnowEffect, spread);
+  LoadParam(root, "size", this, SnowEffect, size);
+  LoadParam(root, "coord", this, SnowEffect, coord);
 }
 
@@ -75 +75 @@
 {
   this->emitter = new PlaneEmitter();
-  
+
   // Default values
   particles = 10000;
@@ -86 +86 @@
   randomMass = 0.3;
   rate = 900;
-  velocity = -200;
-  randomVelocity = 0;
+  velocity = -100;
+  randomVelocity = 5;
   angle = 0;
   randomAngle = 0.3;
@@ -93 +93 @@
   snowSize = Vector2D(1200, 1200);
   snowCoord = Vector(100, 600, 200);
-  
+
   activated = false;
 }
-
-
 
 bool SnowEffect::activate()
@@ -159 +157 @@
 }
 
-void SnowEffect::numParticles(int n)
-{
-  this->particles = n;
-}
-
-void SnowEffect::materialTexture(const std::string& texture)
-{
-  this->texture = texture;
-}
-
-void SnowEffect::lifeSpan(float lifeSpan, float randomLifeSpan)
-{
-  this->life = lifeSpan;
-  this->randomLife = randomLifeSpan;
-}
-
-void SnowEffect::radius(float radius, float randomRadius)
-{
-  this->snowRadius = radius;
-  this->randomRadius = randomRadius;
-}
-
-void SnowEffect::mass(float mass, float randomMass)
-{
-  this->snowMass = mass;
-  this->randomMass = randomMass;
-}
-
-void SnowEffect::emissionRate(float emissionRate)
-{
-  this->rate = emissionRate;
-}
-
-void SnowEffect::emissionVelocity(float velocity, float randomVelocity)
-{
-  this->velocity = velocity;
-  this->randomVelocity = randomVelocity;
-}
-
-void SnowEffect::spread(float angle, float randomAngle)
-{
-  this->angle = angle;
-  this->randomAngle = randomAngle;
-}
-
-void SnowEffect::size(float sizeX, float sizeY)
-{
-  this->snowSize = Vector2D(sizeX, sizeY);
-}
-
-void SnowEffect::coord( float coorX, float coorY, float coorZ)
-{
-  this->snowCoord = Vector(coorX, coorY, coorZ);
-}

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

@@ -35 +35 @@
     void activateSnow();
     void deactivateSnow();
-    
+
   private:
-    void numParticles(int n);
-    void materialTexture(const std::string& texture);
-    void lifeSpan(float lifeSpan, float randomLifeSpan);
-    void radius(float radius, float randomRadius);
-    void mass(float mass, float randomMass);
-    void emissionRate(float emissionRate);
-    void emissionVelocity(float velocity, float randomVelocity);
-    void spread(float angle, float randomAngle);
-    void size(float sizeX, float sizeY);
-    void coord(float xCoor, float yCoor, float zCoor);
-    
+    void numParticles(int n) { this->particles = n; }
+    void materialTexture(const std::string& texture) { this->texture = texture; }
+    void lifeSpan(float lifeSpan, float randomLifeSpan) { this->life = lifeSpan; this->randomLife = randomLifeSpan; }
+    void radius(float radius, float randomRadius) { this->snowRadius = radius; this->randomRadius = randomRadius; }
+    void mass(float mass, float randomMass) { this->snowMass = mass; this->randomMass = randomMass; }
+    void emissionRate(float emissionRate){ this->rate = emissionRate; }
+    void emissionVelocity(float velocity, float randomVelocity){ this->velocity = velocity; this->randomVelocity = randomVelocity; }
+    void spread(float angle, float randomAngle) { this->angle = angle; this->randomAngle = randomAngle; }
+    void size(float sizeX, float sizeY) { this->snowSize = Vector2D(sizeX, sizeY); }
+    void coord(float x, float y, float z) { this->snowCoord = Vector(x, y, z); }
+
     int particles;
     std::string texture;
@@ -61 +61 @@
 
     bool activated;
-    
+
     static SpriteParticles* snowParticles;
-    
+
     PlaneEmitter*          emitter;
 };