Changeset 8022 in orxonox.OLD

Timestamp:

May 31, 2006, 1:01:38 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: activating/deactivating snowEffect in the oxw-file works,default: deactivate

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

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

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

@@ -53 +53 @@
         }
 
-        this->activate();
+  if(snowActivate)
+    this->activate();
 }
 
@@ -78 +79 @@
         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);
 }
 
@@ -85 +92 @@
 
         // Default values
+  this->snowActivate = false;
+  this->snowMove = false;
         this->particles = 12000;
         this->texture = "maps/snow_flake_01_32x32.png";
@@ -103 +112 @@
         this->snowWindForce = 1;
 
-        this->activated = false;
+//      this->activated = false;
 }
 
@@ -109 +118 @@
 {
         PRINTF(0)("Activating SnowEffect\n");
-        activated = true;
+//      activated = true;
 
         SnowEffect::snowParticles = new SpriteParticles(particles);
@@ -141 +150 @@
 {
         PRINTF(0)("Deactivating SnowEffect\n");
-        activated = false;
+        //activated = false;
 
         this->emitter->setSystem(NULL);
@@ -165 +174 @@
 
 void SnowEffect::tick(float dt)
-{
+{/*
   float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
   
@@ -197 +206 @@
     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);
   }
 }

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

@@ -49 +49 @@
                 inline void coord(float x, float y, float z) { this->snowCoord = Vector(x, y, z); }
     inline void wind(int force) { this->snowWindForce = force; }
+    inline void setSnowOption(const std::string& option) { /*if (option == "fade") this->snowFade = true;*/
+                                                                                  if (option == "movesnow") this->snowMove = true;
+                                                                                  if (option == "activate") this->snowActivate = true; }
 
 
@@ -65 +68 @@
                 int                                                                                                                                     snowWindForce;
 
-                bool                                                                                                                            activated;
-
+                //bool                                                                                                                          activated;
+    bool                              snowMove;
+    bool                              snowActivate;
+    
                 PlaneEmitter*                                                                                           emitter;