Changeset 9720 for code/branches/sfxThilo

Timestamp:

Oct 28, 2013, 3:58:45 PM (11 years ago)

Author:

thiweber

Message:

im Pong Score-Sound eingefuegt (PongBall.cc)

Location:

code/branches/sfxThilo

Files:

• data/levels/pong.oxw (modified) (1 diff)
• src/modules/pong/Pong.cc (modified) (2 diffs)
• src/modules/pong/PongBall.cc (modified) (6 diffs)
• src/modules/pong/PongBall.h (modified) (4 diffs)
• src/modules/pong/PongScore.cc (modified) (1 diff)
• src/modules/pong/PongScore.h (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)

code/branches/sfxThilo/data/levels/pong.oxw

@@ -34 +34 @@
 
 <Template name=pongball>
-  <PongBall>
+  <PongBall 
+   defScoreSound = "sounds/Button.ogg"
+   defBoundarySound = "sounds/Button_press2.ogg">
     <attached>
       <Model mesh="sphere.mesh" scale=2 />

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

@@ -47 +47 @@
 #include "PongBot.h"
 #include "PongAI.h"
+
 namespace orxonox
 {
@@ -117 +118 @@
             }
         }
+
     }
 

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

@@ -40 +40 @@
 
 #include "PongBat.h"
+
+#include "sound/WorldSound.h" //Thilo
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -66 +69 @@
 
         this->registerVariables();
+
+        //Thilo
+        if (GameMode::isMaster())
+             {
+                 this->defScoreSound_ = new WorldSound(this->getContext());
+                 this->defScoreSound_->setLooping(false);
+                 this->defBatSound_ = new WorldSound(this->getContext());
+                 this->defBatSound_->setLooping(false);
+                 this->defBoundarySound_ = new WorldSound(this->getContext());
+                 this->defBoundarySound_->setLooping(false);
+             }
+             else
+             {
+                 this->defScoreSound_ = 0;
+             }
     }
 
@@ -81 +99 @@
             delete[] this->batID_;
         }
+    }
+
+    //Thilo
+    void PongBall::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(PongBall, XMLPort, xmlelement, mode);
+        XMLPortParam(PongBall, "defScoreSound",  setDefScoreSound,  getDefScoreSound,  xmlelement, mode);
+        XMLPortParam(PongBall, "defBatSound",  setDefBatSound,  getDefBatSound,  xmlelement, mode);
+        XMLPortParam(PongBall, "defBoundarySound",  setDefBoundarySound,  getDefBoundarySound,  xmlelement, mode);
     }
 
@@ -155 +182 @@
                     else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
+                        defScoreSound_->play();//Thilo
                         if (this->getGametype() && this->bat_[0])
                         {
@@ -182 +210 @@
                     else if (GameMode::isMaster() && position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
+                        defScoreSound_->play();//Thilo
                         if (this->getGametype() && this->bat_[1])
                         {
@@ -262 +291 @@
             this->bat_[1] = orxonox_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[1]));
     }
+
+    void PongBall::setDefScoreSound(const std::string &pongSound)
+    {
+        if( defScoreSound_ )
+            defScoreSound_->setSource(pongSound);
+        else
+            assert(0); // This should never happen, because soundpointer is only available on master
+    }
+
+    const std::string& PongBall::getDefScoreSound()
+    {
+        if( defScoreSound_ )
+            return defScoreSound_->getSource();
+        else
+            assert(0);
+        return BLANKSTRING;
+    }
+
+    void PongBall::setDefBatSound(const std::string &pongSound)
+    {
+        if( defBatSound_ )
+            defBatSound_->setSource(pongSound);
+        else
+            assert(0); // This should never happen, because soundpointer is only available on master
+    }
+
+    const std::string& PongBall::getDefBatSound()
+    {
+        if( defBatSound_ )
+            return defBatSound_->getSource();
+        else
+            assert(0);
+        return BLANKSTRING;
+    }
+
+    void PongBall::setDefBoundarySound(const std::string &pongSound)
+    {
+        if( defBoundarySound_ )
+            defBoundarySound_->setSource(pongSound);
+        else
+            assert(0); // This should never happen, because soundpointer is only available on master
+    }
+
+    const std::string& PongBall::getDefBoundarySound()
+    {
+        if( defBoundarySound_ )
+            return defBoundarySound_->getSource();
+        else
+            assert(0);
+        return BLANKSTRING;
+    }
 }

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

@@ -42 +42 @@
 #include "worldentities/MovableEntity.h"
 
+
 namespace orxonox
 {
@@ -63 +64 @@
 
             virtual void tick(float dt);
+
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
             /**
@@ -123 +126 @@
             static const float MAX_REL_Z_VELOCITY;
 
+            void setDefScoreSound(const std::string& engineSound); //Thilo
+            const std::string& getDefScoreSound(); //Thilo
+
         private:
             void registerVariables();
@@ -135 +141 @@
             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
     };
 }

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

@@ -41 +41 @@
 
 #include "Pong.h"
+#include "sound/WorldSound.h" /////////////////////////////
 
 namespace orxonox

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

@@ -124 +124 @@
             WeakPtr<PlayerInfo> player1_; //!< Store information about left player permanently.
             WeakPtr<PlayerInfo> player2_; //!< Same for the right player. To end the game properly.
+            WorldSound* scoreSound_;
+
     };
 }

code/branches/sfxThilo/src/orxonox/gamestates/GSMainMenu.cc

@@ -85 +85 @@
     {
         if (GameMode::playsSound())
-            this->ambient_->destroy();
+            this->ambient_->destroy(); //CHECK Thilo destroy ?preDestroy()? !!!!!!!
 
         InputManager::getInstance().destroyState("MainMenuHackery");