Changeset 6285 for code/branches/presentation2

Timestamp:

Dec 9, 2009, 2:31:54 PM (15 years ago)

Author:

youngk

Message:

Launching sound of the Rocket plays normally now. Changed AL_MAX_DISTANCE to 10000.

Location:

code/branches/presentation2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (3 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• orxonox/sound/BaseSound.cc (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -93 +93 @@
         this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
         this->attach(defSndWpnEngine_);
+
+        this->defSndWpnLaunch_ = new WorldSound(this);
+        this->defSndWpnLaunch_->setLooping(false);
+        this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+        this->attach(defSndWpnLaunch_);
     }
 
@@ -111 +116 @@
                 this->defSndWpnEngine_->stop();
             }
+            if(this->defSndWpnLaunch_->isPlaying())
+            {
+                this->defSndWpnLaunch_->stop();
+            }
             delete this->defSndWpnEngine_;
+            delete this->defSndWpnLaunch_;
         }
     }
@@ -133 +143 @@
 
         this->defSndWpnEngine_->play();
+        this->defSndWpnLaunch_->play();
     }
 

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h

@@ -124 +124 @@
 
             WorldSound* defSndWpnEngine_;
-            WorldSound* defSndWpnExplosion_;
+            WorldSound* defSndWpnLaunch_;
     };
 

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -54 +54 @@
 
         this->setMunitionName("RocketMunition");
-        this->setDefaultSound("sounds/Rocket_launch.ogg");
+        // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }
 

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -61 +61 @@
             {
                 alSourcei(this->audioSource_, AL_REFERENCE_DISTANCE, 20);
-                alSourcei(this->audioSource_, AL_MAX_DISTANCE, 300);
+                alSourcei(this->audioSource_, AL_MAX_DISTANCE, 10000);
             }
         }