Changeset 3108 for code/trunk

Timestamp:

May 29, 2009, 12:46:24 AM (16 years ago)

Author:

erwin

Message:

first attempt to implement sounds for pong, only score sound is working here

Location:

code/trunk/src/orxonox

Files:

• objects/worldentities/PongBall.cc (modified) (10 diffs)
• objects/worldentities/PongBall.h (modified) (3 diffs)
• sound/SoundBase.cc (modified) (2 diffs)
• sound/SoundManager.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/PongBall.cc

@@ -33 +33 @@
 #include "core/GameMode.h"
 #include "objects/gametypes/Gametype.h"
+#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -50 +51 @@
         this->batID_[1] = OBJECTID_UNKNOWN;
         this->relMercyOffset_ = 0.05;
-        
+
         this->registerVariables();
-    }
-    
+
+        this->sidesound_ = new SoundBase(this);
+        this->sidesound_->loadFile("sounds/pong_side.wav");
+
+        this->batsound_ = new SoundBase(this);
+        this->batsound_->loadFile("sounds/pong_bat.wav");
+
+        this->scoresound_ = new SoundBase(this);
+        this->scoresound_->loadFile("sounds/pong_score.wav");
+    }
+
     void PongBall::registerVariables()
     {
@@ -77 +87 @@
             {
                 velocity.z = -velocity.z;
+                this->sidesound_->play();
 
                 if (position.z > this->fieldHeight_ / 2)
@@ -98 +109 @@
                             velocity.x = -velocity.x;
                             velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
+                            this->batsound_->play();
                         }
                         else if (position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -104 +116 @@
                             {
                                 this->getGametype()->playerScored(this->bat_[0]->getPlayer());
+                                this->scoresound_->play();
                                 return;
                             }
@@ -116 +129 @@
                             velocity.x = -velocity.x;
                             velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
+                            this->batsound_->play();
                         }
                         else if (position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -121 +135 @@
                             if (this->getGametype() && this->bat_[1])
                             {
+                                this->scoresound_->play();
                                 this->getGametype()->playerScored(this->bat_[1]->getPlayer());
                                 return;
@@ -142 +157 @@
           {
             velocity.z = -velocity.z;
+            this->sidesound_->play();
 
             if (position.z > this->fieldHeight_ / 2)
@@ -162 +178 @@
                   position.x = this->fieldWidth_ / 2;
                   velocity.x = -velocity.x;
+                  this->batsound_->play();
                   velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                 }
@@ -172 +189 @@
                   position.x = -this->fieldWidth_ / 2;
                   velocity.x = -velocity.x;
+                  this->batsound_->play();
                   velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                 }

code/trunk/src/orxonox/objects/worldentities/PongBall.h

@@ -44 +44 @@
 
             virtual void tick(float dt);
-            
+
             void registerVariables();
 
@@ -65 +65 @@
             void setBats(PongBat** bats)
             { this->bat_ = bats; this->batID_[0] = this->bat_[0]->getObjectID(); this->batID_[1] = this->bat_[1]->getObjectID(); }
-            
+
             void applyBats()
             { if(!this->bat_) this->bat_ = new PongBat*[2]; if(this->batID_[0] != OBJECTID_UNKNOWN) this->bat_[0] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0])); if(this->batID_[1] != OBJECTID_UNKNOWN) this->bat_[1] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[1])); }
@@ -79 +79 @@
             unsigned int* batID_;
             float relMercyOffset_;
+
+            SoundBase* sidesound_;
+            SoundBase* batsound_;
+            SoundBase* scoresound_;
     };
 }

code/trunk/src/orxonox/sound/SoundBase.cc

@@ -97 +97 @@
                 alSourcei(this->source_, AL_LOOPING, AL_FALSE);
             alSourcePlay(this->source_);
+
+            if(alGetError() != AL_NO_ERROR)
+            {
+                 COUT(2) << "Sound: OpenAL: Error playin sound " << this->source_ << std::endl;
+            }
         }
     }
@@ -161 +166 @@
         alGenSources(1, &this->source_);
         alSourcei(this->source_, AL_BUFFER, this->buffer_);
-//         ALenum
         if(alGetError() != AL_NO_ERROR) {
             COUT(2) << "Sound: OpenAL: Error loading sample file: " << filename << std::endl;

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -52 +52 @@
         else
         {
-            COUT(4) << "Sound: OpenAL ALUT version: " << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
-            const char* str = alutGetMIMETypes(ALUT_LOADER_BUFFER);
-            if (str == NULL)
-                COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
-            else
-                COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << str << std::endl;
             if(SoundManager::device_s == NULL)
             {
@@ -82 +76 @@
                     if(alcMakeContextCurrent(this->context_) == AL_TRUE)
                         COUT(3) << "Sound: OpenAL: Context " << this->context_ << " loaded" << std::endl;
+
+                    COUT(4) << "Sound: OpenAL ALUT version: " << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+                    const char* str = alutGetMIMETypes(ALUT_LOADER_BUFFER);
+                    if (str == NULL)
+                        COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
+                    else
+                        COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << str << std::endl;
                 }
             }