Changeset 5892 for code/branches/core5

Timestamp:

Oct 6, 2009, 9:18:40 AM (15 years ago)

Author:

rgrieder

Message:

Removed hard coded sound in Level, Engine and PongBall and replaced SoundMainMenu with a simple SoundBase.

Location:

code/branches/core5/src

Files:

• modules/pong/PongBall.cc (modified) (8 diffs)
• modules/pong/PongBall.h (modified) (1 diff)
• orxonox/Level.cc (modified) (5 diffs)
• orxonox/Level.h (modified) (2 diffs)
• orxonox/gamestates/GSMainMenu.cc (modified) (3 diffs)
• orxonox/gamestates/GSMainMenu.h (modified) (1 diff)
• orxonox/items/Engine.cc (modified) (6 diffs)
• orxonox/items/Engine.h (modified) (1 diff)
• orxonox/sound/CMakeLists.txt (modified) (1 diff)
• orxonox/sound/SoundMainMenu.cc (deleted)
• orxonox/sound/SoundMainMenu.h (deleted)

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

@@ -33 +33 @@
 #include "gametypes/Gametype.h"
 #include "PongBat.h"
-#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -43 +42 @@
     PongBall::PongBall(BaseObject* creator)
         : MovableEntity(creator)
-        , sidesound_(NULL)
-        , batsound_(NULL)
-        , scoresound_(NULL)
     {
         RegisterObject(PongBall);
@@ -57 +53 @@
 
         this->registerVariables();
-
-        if (GameMode::playsSound())
-        {
-            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");
-        }
     }
 
     PongBall::~PongBall()
     {
-        if (this->sidesound_)
-            delete this->sidesound_;
-        if (this->batsound_)
-            delete this->batsound_;
-        if (this->scoresound_)
-            delete this->scoresound_;
     }
 
@@ -108 +86 @@
 
             this->fireEvent();
-            if (GameMode::playsSound())
-                this->sidesound_->play();
         }
 
@@ -128 +104 @@
                         
                         this->fireEvent();
-                        if (GameMode::playsSound())
-                            this->batsound_->play();
                     }
                     else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -136 +110 @@
                         {
                             this->getGametype()->playerScored(this->bat_[0]->getPlayer());
-                            if (GameMode::playsSound())
-                                this->scoresound_->play();
                             return;
                         }
@@ -152 +124 @@
 
                         this->fireEvent();
-                        if (GameMode::playsSound())
-                            this->batsound_->play();
                     }
                     else if (GameMode::isMaster() && position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -159 +129 @@
                         if (this->getGametype() && this->bat_[1])
                         {
-                            if (GameMode::playsSound())
-                                this->scoresound_->play();
                             this->getGametype()->playerScored(this->bat_[1]->getPlayer());
                             return;

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

@@ -76 +76 @@
             unsigned int* batID_;
             float relMercyOffset_;
-
-            SoundBase* sidesound_;
-            SoundBase* batsound_;
-            SoundBase* scoresound_;
     };
 }

code/branches/core5/src/orxonox/Level.cc

@@ -39 +39 @@
 #include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
-#include "sound/SoundBase.h"
 #include "LevelManager.h"
 
@@ -53 +52 @@
         this->xmlfilename_ = this->getFilename();
         this->xmlfile_ = 0;
-        this->ambientsound_ = 0;
     }
 
@@ -65 +63 @@
             if (this->xmlfile_)
                 Loader::unload(this->xmlfile_);
-
-            if (this->ambientsound_ != NULL)
-                delete this->ambientsound_;
         }
     }
@@ -77 +72 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-
-        XMLPortParamLoadOnly(Level, "ambientsound", loadAmbientSound, xmlelement, mode);
 
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
@@ -150 +143 @@
     }
 
-    void Level::loadAmbientSound(const std::string& filename)
-    {
-        if(filename == "") return;
-        else
-        {
-            if(this->ambientsound_ == NULL)
-            {
-                this->ambientsound_ = new SoundBase();
-            }
-
-            this->ambientsound_->loadFile(filename);
-            this->ambientsound_->play(true);
-        }
-    }
-
     void Level::playerEntered(PlayerInfo* player)
     {

code/branches/core5/src/orxonox/Level.h

@@ -53 +53 @@
                 { return this->description_; }
 
-            void loadAmbientSound(const std::string& filename);
-
             void playerEntered(PlayerInfo* player);
             void playerLeft(PlayerInfo* player);
@@ -73 +71 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
-
-            SoundBase*             ambientsound_;
     };
 }

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

@@ -39 +39 @@
 #include "core/GUIManager.h"
 #include "Scene.h"
-#include "sound/SoundMainMenu.h"
+#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -62 +62 @@
         {
             // Load sound
-            this->ambient_ = new SoundMainMenu();
+            this->ambient_ = new SoundBase(0);
+            this->ambient_->loadFile("ambient/mainmenu.wav");
         }
     }
@@ -69 +70 @@
     {
         if (GameMode::playsSound())
-        {
-            this->ambient_->destroy();
-        }
+            delete this->ambient_;
 
         InputManager::getInstance().destroyState("mainMenu");

code/branches/core5/src/orxonox/gamestates/GSMainMenu.h

@@ -59 +59 @@
 
         // ambient sound for the main menu
-        SoundMainMenu* ambient_;
+        SoundBase*        ambient_;
     };
 }

code/branches/core5/src/orxonox/items/Engine.cc

@@ -37 +37 @@
 #include "pickup/ModifierType.h"
 #include "tools/Shader.h"
-#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -68 +67 @@
         this->setConfigValues();
         this->registerVariables();
-
-        this->sound_ = NULL;
     }
 
@@ -80 +77 @@
             if (this->boostBlur_)
                 this->boostBlur_->destroy();
-
-            if(this->sound_ != NULL)
-                delete this->sound_;
         }
     }
@@ -102 +96 @@
         XMLPortParam(Engine, "accelerationleftright", setAccelerationLeftRight, setAccelerationLeftRight, xmlelement, mode);
         XMLPortParam(Engine, "accelerationupdown",    setAccelerationUpDown,    setAccelerationUpDown,    xmlelement, mode);
-
-        XMLPortParamLoadOnly(Engine, "sound", loadSound, xmlelement, mode);
     }
 
@@ -240 +232 @@
                 this->boostBlur_ = 0;
             }
-
-            if(this->sound_ != NULL)
-                this->sound_->attachToEntity(ship);
         }
     }
@@ -253 +242 @@
             return Vector3::ZERO;
     }
-
-    void Engine::loadSound(const std::string filename)
-    {
-        if(filename == "") return;
-        else
-        {
-            if(this->sound_ == NULL)
-            {
-                this->sound_ = new SoundBase(this->ship_);
-            }
-
-            this->sound_->loadFile(filename);
-            this->sound_->play(true);
-        }
-    }
 }

code/branches/core5/src/orxonox/items/Engine.h

@@ -130 +130 @@
             Shader* boostBlur_;
             float blurStrength_;
-
-            SoundBase* sound_;
     };
 }

code/branches/core5/src/orxonox/sound/CMakeLists.txt

@@ -2 +2 @@
     SoundManager.cc
     SoundBase.cc
-    SoundMainMenu.cc
 )