Changeset 8480 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics

Timestamp:

Jun 15, 2006, 4:57:51 PM (18 years ago)

Author:

amaechler

Message:

sound fixed

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• rain_effect.cc (modified) (3 diffs)
• rain_effect.h (modified) (2 diffs)
• sglmodel.h (deleted)
• snow_effect.cc (modified) (2 diffs)

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

@@ -39 +39 @@
 
 /* TODO:
-  - preCaching
   - test multiple rain emitters
   - Think about what happens with building poss. to hang movewithcam off
@@ -69 +68 @@
     if(rainActivate) {
         this->activate();
-        RainEffect::rainParticles->precache((int)this->rainLife);
+        RainEffect::rainParticles->precache((int)this->rainLife * 5); // TODO: Figure out the correct value
     }
 }
@@ -155 +154 @@
     this->emitter->setSpread(this->rainWindForce / 50, 0.2);
 
-    this->soundSource.loop(this->rainBuffer, this->soundRainVolume);
+    this->soundSource.play(this->rainBuffer, this->soundRainVolume, true);
+
     if (this->rainWindForce != 0)
-        this->soundSource.loop(this->windBuffer, 0.1f * this->rainWindForce);
+        this->soundSource.play(this->windBuffer, 0.1f * this->rainWindForce, true);
 
     if (this->rainFadeInDuration == 0)

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

@@ -82 +82 @@
 private:
     static SparkParticles*      rainParticles;
-    ParticleEmitter*      emitter;
+    ParticleEmitter*            emitter;
 
     GLfloat         rainFadeInDuration;
     GLfloat         rainFadeOutDuration;
-    float         localTimer;
+    float           localTimer;
 
     Vector          rainCoord;
@@ -94 +94 @@
     GLfloat         rainLife;
     GLfloat         rainMaxParticles;
-    int         rainWindForce;
-    bool          rainMove;
-    bool          rainActivate;
+    int             rainWindForce;
+    bool            rainMove;
+    bool            rainActivate;
 
     OrxSound::SoundSource     soundSource;

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

@@ -53 +53 @@
         }
 
-        if(snowActivate)
+  if(snowActivate) {
                 this->activate();
+    SnowEffect::snowParticles->precache((int) this->snowLife);
+  }  
 }
 
@@ -139 +141 @@
         this->emitter->setSize(snowSize);
 
-  SnowEffect::snowParticles->precache((int) this->snowLife);
-
-        if (this->snowWindForce > 1)
-                this->soundSource.loop(this->windBuffer);
+  if (this->snowWindForce != 0)
+    this->soundSource.play(this->windBuffer, 0.1f * this->snowWindForce, true);
+ 
 }