Changeset 6202 for code/branches/presentation2/src/orxonox/sound

Timestamp:

Dec 2, 2009, 4:52:42 PM (15 years ago)

Author:

youngk

Message:

Implemented speed dependent audio pitch. BUG pitching doesn't currently work.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (3 diffs)
• BaseSound.h (modified) (2 diffs)

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

@@ -50 +50 @@
         RegisterRootObject(BaseSound);
 
+        this->volume_ = 1;
+        this->pitch_ = 1;
+
         if (GameMode::playsSound())
         {
@@ -129 +132 @@
         if (GameMode::playsSound())
             alSourcei(this->audioSource_, AL_LOOPING, (val ? AL_TRUE : AL_FALSE));
+    }
+
+    void BaseSound::setPitch(float pitch)
+    {
+        if (pitch > 2 || pitch < 0.5)
+        {
+            COUT(2) << "Sound warning: pitch out of range, cropping value." << std::endl;
+            pitch = pitch > 2 ? 2 : pitch;
+            pitch = pitch < 0.5 ? 0.5 : pitch;
+        }        
+        this->pitch_ = pitch;
+        if (GameMode::playsSound())
+            alSourcei(this->audioSource_, AL_PITCH, pitch);
     }
 
@@ -194 +210 @@
         alSource3f(this->audioSource_, AL_POSITION,  0, 0, 0);
         this->updateVolume();
+        this->setPitch(this->getPitch());
         alSourcei (this->audioSource_, AL_LOOPING, (this->bLoop_ ? AL_TRUE : AL_FALSE));
         if (this->isPlaying() || this->isPaused())

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

@@ -74 +74 @@
         void setLooping(bool val);
 
+        float getPitch() const   { return this->pitch_; }
+        void setPitch(float pitch);
+
         //ALuint getALAudioSource(void);
 
@@ -92 +95 @@
         std::string     source_;
         float           volume_;
+        float           pitch_;
         bool            bLoop_;
         State           state_;