Changeset 5899 for code/branches/core5/src/orxonox/sound/WorldSound.cc

Timestamp:

Oct 7, 2009, 11:19:19 AM (16 years ago)

Author:

rgrieder

Message:

Renaming BaseSound::setSoundFile (and all its associates) to setSource to be compliant with classes like ParicleInterface.

File:

• code/branches/core5/src/orxonox/sound/WorldSound.cc (modified) (4 diffs)

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

@@ -52 +52 @@
     {
         SUPER(WorldSound, XMLPort, xmlelement, mode);
-        XMLPortParamExtern(WorldSound, BaseSound, this, "soundFile", setSoundFile, getSoundFile, xmlelement, mode);
+        XMLPortParamExtern(WorldSound, BaseSound, this, "source", setSource, getSource, xmlelement, mode);
         XMLPortParamExtern(WorldSound, BaseSound, this, "loop", setLoop, getLoop, xmlelement, mode);
         XMLPortParamExtern(WorldSound, BaseSound, this, "playOnLoad", setPlayOnLoad, getPlayOnLoad, xmlelement, mode);
@@ -65 +65 @@
     void WorldSound::tick(float dt)
     {
-        if (alIsSource(this->source_))
+        if (alIsSource(this->audioSource_))
         {
             const Vector3& pos = this->getWorldPosition();
-            alSource3f(this->source_, AL_POSITION, pos.x, pos.y, pos.z);
+            alSource3f(this->audioSource_, AL_POSITION, pos.x, pos.y, pos.z);
             ALenum error = alGetError();
             if (error == AL_INVALID_VALUE)
@@ -74 +74 @@
 
             const Vector3& vel = this->getVelocity();
-            alSource3f(this->source_, AL_VELOCITY, vel.x, vel.y, vel.z);
+            alSource3f(this->audioSource_, AL_VELOCITY, vel.x, vel.y, vel.z);
             error = alGetError();
             if (error == AL_INVALID_VALUE)
@@ -81 +81 @@
             const Quaternion& orient = this->getWorldOrientation();
             Vector3 at = orient.zAxis();
-            alSource3f(this->source_, AL_DIRECTION, at.x, at.y, at.z);
+            alSource3f(this->audioSource_, AL_DIRECTION, at.x, at.y, at.z);
             error = alGetError();
             if (error == AL_INVALID_VALUE)