Changeset 6372 for code/branches/presentation2

Timestamp:

Dec 17, 2009, 4:52:45 PM (15 years ago)

Author:

rgrieder

Message:

Added new XML parameter for the Scene: soundReferenceDistance.
This value represents the distance to a sound source where the gain is still 1.0. Further away it will decrease with 1/(distance - soundReferenceDistance).
Default value is 20.

Location:

code/branches/presentation2/src/orxonox

Files:

• Scene.cc (modified) (2 diffs)
• Scene.h (modified) (2 diffs)
• sound/BaseSound.cc (modified) (1 diff)
• sound/WorldSound.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/Scene.cc

@@ -58 +58 @@
         this->setScene(SmartPtr<Scene>(this, false), OBJECTID_UNKNOWN);
         this->bShadows_ = true;
+        this->soundReferenceDistance_ = 20.0;
 
         if (GameMode::showsGraphics())
@@ -113 +114 @@
         XMLPortParam(Scene, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2f, 0.2f, 0.2f, 1.0f));
         XMLPortParam(Scene, "shadow", setShadow, getShadow, xmlelement, mode).defaultValues(true);
+        XMLPortParam(Scene, "soundReferenceDistance", setSoundReferenceDistance, getSoundReferenceDistance, xmlelement, mode).defaultValues(true);
 
         XMLPortParam(Scene, "gravity", setGravity, getGravity, xmlelement, mode);

code/branches/presentation2/src/orxonox/Scene.h

@@ -71 +71 @@
                 { return this->bShadows_; }
 
+            inline void setSoundReferenceDistance(float distance)
+                { this->soundReferenceDistance_ = distance; }
+            inline float getSoundReferenceDistance() const
+                { return this->soundReferenceDistance_; }
+
             inline Radar* getRadar()
                 { return this->radar_; }
@@ -96 +101 @@
             std::list<BaseObject*>   objects_;
             bool                     bShadows_;
+            float                    soundReferenceDistance_;
             Radar*                   radar_;
 

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

@@ -132 +132 @@
         alSource3f(this->audioSource_, AL_VELOCITY,  0, 0, 0);
         alSource3f(this->audioSource_, AL_DIRECTION, 0, 0, 0);
-        alSourcei(this->audioSource_, AL_REFERENCE_DISTANCE, 20);
-        alSourcei(this->audioSource_, AL_MAX_DISTANCE, 10000);
         if (ALint error = alGetError())
             COUT(2) << "Sound Warning: Setting source parameters to 0 failed: "

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

@@ -35 +35 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
+#include "Scene.h"
 #include "SoundManager.h"
 #include <core/ConsoleCommandCompilation.h>
@@ -79 +80 @@
     {
         BaseSound::initialiseSource();
+        if (this->getScene())
+        {
+            float refDist = this->getScene()->getSoundReferenceDistance();
+            alSourcei(this->audioSource_, AL_REFERENCE_DISTANCE, refDist);
+            // TODO: 500 is very magical here. Derive something better
+            alSourcei(this->audioSource_, AL_MAX_DISTANCE, refDist * 500);
+        }
         this->tick(0); // update position, orientation and velocity
     }