Changeset 9889 for code/branches/sfxThilo/src/modules

Timestamp:

Dec 9, 2013, 4:06:38 PM (11 years ago)

Author:

thiweber

Message:

A few changes..

Location:

code/branches/sfxThilo/src/modules/pong

Files:

• PongBall.cc (modified) (8 diffs)
• PongBall.h (modified) (2 diffs)

code/branches/sfxThilo/src/modules/pong/PongBall.cc

@@ -41 +41 @@
 #include "PongBat.h"
 
-#include "sound/WorldSound.h" //Thilo
+#include "sound/WorldSound.h"
 #include "core/XMLPort.h"
 
@@ -70 +70 @@
         this->registerVariables();
 
-        //Thilo
+        //initialize sound
         if (GameMode::isMaster())
              {
                  this->defScoreSound_ = new WorldSound(this->getContext());
-                 this->defScoreSound_->setLooping(false);
+                 this->defScoreSound_->setVolume(1.0f);
                  this->defBatSound_ = new WorldSound(this->getContext());
-                 this->defBatSound_->setLooping(false);
+                 this->defBatSound_->setVolume(0.4f);
                  this->defBoundarySound_ = new WorldSound(this->getContext());
-                 this->defBoundarySound_->setLooping(false);
+                 this->defBoundarySound_->setVolume(0.5f);
              }
              else
              {
                  this->defScoreSound_ = 0;
+                 this->defBatSound_ = 0;
+                 this->defBoundarySound_ = 0;
              }
     }
@@ -101 +103 @@
     }
 
-    //Thilo
+    //xml port for loading sounds
     void PongBall::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -144 +146 @@
         if (position.z > this->fieldHeight_ / 2 || position.z < -this->fieldHeight_ / 2)
         {
-            // Its velocity in z-direction is inverted (i.e. it bounces off).
+            defBoundarySound_->play(); //play boundary sound
+                // Its velocity in z-direction is inverted (i.e. it bounces off).
             velocity.z = -velocity.z;
             // And its position is set as to not overstep the boundary it has just crossed.
@@ -169 +172 @@
                     if (fabs(distance) <= 1) // If the bat is there to parry.
                     {
-                        // Set the ball to be exactly at the boundary.
+                        defBatSound_->play(); //play bat sound
+                        // Set the ball to be exactly at the boundary.
                         position.x = this->fieldWidth_ / 2;
                         // Invert its velocity in x-direction (i.e. it bounces off).
@@ -182 +186 @@
                     else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
-                        defScoreSound_->play();//Thilo
+                        defScoreSound_->play();//play score sound
                         if (this->getGametype() && this->bat_[0])
                         {
@@ -197 +201 @@
                     if (fabs(distance) <= 1) // If the bat is there to parry.
                     {
-                        // Set the ball to be exactly at the boundary.
+                        defBatSound_->play(); //play bat sound
+                        // Set the ball to be exactly at the boundary.
                         position.x = -this->fieldWidth_ / 2;
                         // Invert its velocity in x-direction (i.e. it bounces off).
@@ -210 +215 @@
                     else if (GameMode::isMaster() && position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
-                        defScoreSound_->play();//Thilo
+                        defScoreSound_->play();//play score sound
                         if (this->getGametype() && this->bat_[1])
                         {

code/branches/sfxThilo/src/modules/pong/PongBall.h

@@ -126 +126 @@
             static const float MAX_REL_Z_VELOCITY;
 
-            void setDefScoreSound(const std::string& engineSound); //Thilo
-            const std::string& getDefScoreSound(); //Thilo
+            void setDefScoreSound(const std::string& engineSound);
+            const std::string& getDefScoreSound();
+            void setDefBatSound(const std::string& engineSound);
+            const std::string& getDefBatSound();
+            void setDefBoundarySound(const std::string& engineSound);
+            const std::string& getDefBoundarySound();
 
         private:
@@ -141 +145 @@
             unsigned int* batID_; //!< The object IDs of the bats, to be able to synchronize them over the network.
             float relMercyOffset_; //!< Offset, that makes the player not loose, when, in all fairness, he would have.
-            WorldSound* defScoreSound_;//Thilo
+            WorldSound* defScoreSound_;
+            WorldSound* defBatSound_;
+            WorldSound* defBoundarySound_;
     };
 }