Changeset 8242 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc

Timestamp:

Jun 8, 2006, 2:04:37 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: general activate, cleanups

File:

• branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc (modified) (8 diffs)

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

@@ -53 +53 @@
         }
 
-  if(snowActivate)
-    this->activate();
+        if(snowActivate)
+                this->activate();
 }
 
@@ -76 +76 @@
         LoadParam(root, "emissionRate", this, SnowEffect, emissionRate);
         LoadParam(root, "emissionVelocity", this, SnowEffect, emissionVelocity);
-  LoadParam(root, "wind", this, SnowEffect, wind);
+        LoadParam(root, "wind", this, SnowEffect, wind);
         LoadParam(root, "size", this, SnowEffect, size);
         LoadParam(root, "coord", this, SnowEffect, coord);
   
-  LOAD_PARAM_START_CYCLE(root, element);
-  {
-    LoadParam_CYCLE(element, "option", this, SnowEffect, setSnowOption);
-  }
-  LOAD_PARAM_END_CYCLE(element);
+        LOAD_PARAM_START_CYCLE(root, element);
+        {
+                LoadParam_CYCLE(element, "option", this, SnowEffect, setSnowOption);
+        }
+        LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -92 +92 @@
 
         // Default values
-  this->snowActivate = false;
-  this->snowMove = false;
+        this->snowActivate = false;
+        this->snowMove = false;
         this->particles = 12000;
         this->texture = "maps/snow_flake_01_32x32.png";
@@ -109 +109 @@
         this->alpha = 0.5;
         this->snowSize = Vector2D(2500, 2500);
-  this->snowCoord = Vector(100,450,400);
+        this->snowCoord = Vector(100,450,400);
         this->snowWindForce = 1;
-
-//      this->activated = false;
 }
 
@@ -118 +116 @@
 {
         PRINTF(0)("Activating SnowEffect\n");
-//      activated = true;
+
+        this->snowActivate = true;
 
         SnowEffect::snowParticles = new SpriteParticles(particles);
@@ -140 +139 @@
         this->emitter->setSize(snowSize);
 
-  //SnowEffect::snowParticles->precache(8);
+        // SnowEffect::snowParticles->precache(8);
 
         if (this->snowWindForce > 1)
@@ -150 +149 @@
 {
         PRINTF(0)("Deactivating SnowEffect\n");
-        //activated = false;
-
+
+        this->snowActivate = false;
         this->emitter->setSystem(NULL);
 
@@ -161 +160 @@
 void SnowEffect::draw() const
 {
+        if (!this->snowActivate)
+                return;
 }
 
 void SnowEffect::tick(float dt)
-{/*
-  float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
-  
-  if(activated)
-  {
-    if(distance > 0.3*snowSize.x || distance > 0.3*snowSize.y)
-                  this->deactivate();
-    else if(distance > 0.25*snowSize.x || distance > 0.25*snowSize.y) 
-      this->alpha = 0.15;
-    else if(distance > 0.2*snowSize.x || distance > 0.2*snowSize.y) 
-      this->alpha = 0.25;
-    else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y) 
-      this->alpha = 0.4;
-
-    SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
-    SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
-    SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
-  }
-  else
-  {
-  if(distance < 0.3*snowSize.x || distance < 0.3*snowSize.y )
-    this->activate();
-  if( distance < 0.25*snowSize.x || distance < 0.25*snowSize.y )
-    this->alpha = 0.25;
-  else if( distance < 0.2*snowSize.x || distance < 0.2*snowSize.y )
-    this->alpha = 0.4;
-  else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
-    this->alpha = 0.5;
-
-    SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
-    SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
-    SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
-}*/
-  if (this->snowMove) {
-    this->snowCoord = State::getCameraNode()->getAbsCoor();
-    this->emitter->setRelCoor(this->snowCoord.x , this->snowCoord.y+300, this->snowCoord.z);
-  }
-}
-
+{
+        if (!this->snowActivate)
+                return;
+
+        /*
+        float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
+        
+        if(activated)
+        {
+        if(distance > 0.3*snowSize.x || distance > 0.3*snowSize.y)
+                        this->deactivate();
+        else if(distance > 0.25*snowSize.x || distance > 0.25*snowSize.y)
+        this->alpha = 0.15;
+        else if(distance > 0.2*snowSize.x || distance > 0.2*snowSize.y)
+        this->alpha = 0.25;
+        else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
+        this->alpha = 0.4;
+        
+        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
+        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
+        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+        }
+        else
+        {
+        if(distance < 0.3*snowSize.x || distance < 0.3*snowSize.y )
+        this->activate();
+        if( distance < 0.25*snowSize.x || distance < 0.25*snowSize.y )
+        this->alpha = 0.25;
+        else if( distance < 0.2*snowSize.x || distance < 0.2*snowSize.y )
+        this->alpha = 0.4;
+        else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
+        this->alpha = 0.5;
+        
+        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
+        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
+        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+        }*/
+
+        if (this->snowMove) {
+                this->snowCoord = State::getCameraNode()->getAbsCoor();
+                this->emitter->setRelCoor(this->snowCoord.x , this->snowCoord.y+300, this->snowCoord.z);
+        }
+}