Changeset 8495 in orxonox.OLD for trunk/src/lib/graphics/effects/snow_effect.cc

Timestamp:

Jun 15, 2006, 9:50:56 PM (19 years ago)

Author:

bensch

Message:

merged the branche atmos back. no conflicts

File:

• trunk/src/lib/graphics/effects/snow_effect.cc (modified) (7 diffs)

trunk/src/lib/graphics/effects/snow_effect.cc

@@ -50 +50 @@
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);
-        }
-
-        if(snowActivate)
+                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
+        }
+
+  if(snowActivate) {
                 this->activate();
+    SnowEffect::snowParticles->precache((int) this->snowLife);
+  }  
 }
 
@@ -87 +89 @@
 }
 
-bool SnowEffect::init()
+void SnowEffect::init()
 {
         this->emitter = new PlaneEmitter();
@@ -96 +98 @@
         this->particles = 12000;
         this->texture = "maps/snow_flake_01_32x32.png";
-        this->life = 8;
+        this->snowLife = 8;
         this->randomLife = 2;
         this->snowRadius = 3.5;
@@ -111 +113 @@
         this->snowCoord = Vector(100,450,400);
         this->snowWindForce = 1;
-
-        return true;
-}
-
-bool SnowEffect::activate()
+}
+
+void SnowEffect::activate()
 {
         PRINTF(0)("Activating SnowEffect\n");
@@ -124 +124 @@
         SnowEffect::snowParticles->setName("SnowEffectTrailParticles");
         SnowEffect::snowParticles->setMaterialTexture(texture);
-        SnowEffect::snowParticles->setLifeSpan(life, randomLife);
+        SnowEffect::snowParticles->setLifeSpan(snowLife, randomLife);
         SnowEffect::snowParticles->setRadius(0.0, snowRadius, randomRadius);
         SnowEffect::snowParticles->setRadius(0.2, snowRadius, randomRadius*0.8);
@@ -141 +141 @@
         this->emitter->setSize(snowSize);
 
-        // SnowEffect::snowParticles->precache(8);
-
-        if (this->snowWindForce > 1)
-                this->soundSource.loop(this->windBuffer);
-
-        return true;
-}
-
-
-bool SnowEffect::deactivate()
+  if (this->snowWindForce != 0)
+    this->soundSource.play(this->windBuffer, 0.1f * this->snowWindForce, true);
+ 
+}
+
+
+void SnowEffect::deactivate()
 {
         PRINTF(0)("Deactivating SnowEffect\n");
@@ -159 +156 @@
         if (this->windBuffer != NULL)
                 ResourceManager::getInstance()->unload(this->windBuffer);
-
-        return true;
 }