Changeset 9889 for code/branches

Timestamp:

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

Author:

thiweber

Message:

A few changes..

Location:

code/branches/sfxThilo

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• data/levels/Spacerace2.oxw (modified) (1 diff)
• data/levels/asteroidField.oxw (modified) (1 diff)
• data/levels/asteroids.oxw (modified) (1 diff)
• data/levels/dynamicMatch.oxw (modified) (1 diff)
• data/levels/lastManStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStandingII.oxw (modified) (1 diff)
• data/levels/maxim.oxw (modified) (1 diff)
• data/levels/pirateAttack.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/presentationHS12.oxw (modified) (1 diff)
• data/levels/spaceRace.oxw (modified) (1 diff)
• data/levels/surfaceRace.oxw (modified) (1 diff)
• data/levels/teamBaseMatch.oxw (modified) (1 diff)
• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• data/levels/templates/spaceshipAssff.oxt (modified) (2 diffs)
• data/levels/underAttack.oxw (modified) (1 diff)
• src/modules/pong/PongBall.cc (modified) (8 diffs)
• src/modules/pong/PongBall.h (modified) (2 diffs)
• src/orxonox/MoodManager.h (modified) (1 diff)
• src/orxonox/items/MultiStateEngine.cc (modified) (1 diff)
• src/orxonox/sound/AmbientSound.cc (modified) (2 diffs)
• src/orxonox/sound/AmbientSound.h (modified) (2 diffs)
• src/orxonox/sound/BaseSound.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)
• src/orxonox/sound/WorldAmbientSound.cc (modified) (4 diffs)
• src/orxonox/sound/WorldAmbientSound.h (modified) (2 diffs)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (7 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/branches/sfxThilo/data/defaultConfig/keybindings.ini

@@ -58 +58 @@
 KeyLeftWindows=
 KeyLessThan=
-KeyM=
+KeyM="WorldAmbientSound nextsong"
 KeyMail=
 KeyMediaSelect=

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

@@ -14 +14 @@
 
 ?>
+<WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
+
 
 <?lua

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

@@ -11 +11 @@
   include("templates/lodInformation.oxt")
 ?>
+<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -5 +5 @@
  screenshot = "asteroids.png"
 />
+<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -5 +5 @@
  screenshot = "dynamicMatch.png"
 />
+<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -32 +32 @@
       include("includes/pickups.oxi")
     ?>
+    
+    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
 <!----- Spawnpoints

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

@@ -33 +33 @@
       include("includes/pickups.oxi")
     ?>
+    
+    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
 <Bot />

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

@@ -27 +27 @@
     skybox       = "Orxonox/skyBoxBasic"
   >
+  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
+  
 <!-- TODO:
 1. make collisionshapes bulletproof: -> attach movable entity with dynamic collisionshape within a static collisionshape 

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

@@ -25 +25 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  
+  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
   <NotificationQueueCEGUI

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

@@ -25 +25 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
+
+<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
     
 <Level

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

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

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

@@ -486 +486 @@
 
 <!-- SOUNDS & MUSIC -->
-            <WorldSound name="scoreSound" position="-920,0,0" source="sounds/ReadyGo.ogg" >
+            <WorldSound name="scoreSound" position="-920,0,0" source="sounds/Button.ogg" >
               <events>
                 <play>

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

@@ -29 +29 @@
     skybox       = "Orxonox/skyBoxMoreNebula"
   >
+  
+  <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
+  
 
     <?lua math.randomseed(98) ?>

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

@@ -10 +10 @@
  tags = "gametype"
 />
+<WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -19 +19 @@
 >
 
+<WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
+
   <templates>
     <Template link=lodtemplate_default />

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

@@ -22 +22 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  
+  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
 
   <Scene

code/branches/sfxThilo/data/levels/templates/spaceshipAssff.oxt

@@ -37 +37 @@
    linearDamping     = 0.7
    angularDamping    = 0.9999999
+
+   explosionSound = "sounds/Explosion2.ogg"
   >
     <engines>
@@ -82 +84 @@
    defEngineSndNormal = "sounds/Engine_low.ogg"
    defEngineSndBoost = "sounds/Engine_high.ogg"
-
+   
    accelerationfront     = 500
    accelerationbrake     = 500

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

@@ -20 +20 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
 
   <Scene

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_;
     };
 }

code/branches/sfxThilo/src/orxonox/MoodManager.h

@@ -51 +51 @@
 
         private:
-            virtual void moodChanged(const std::string& mood) = 0;
+            virtual bool moodChanged(const std::string& mood) = 0;
 
             static void changedMood(const std::string& mood);

code/branches/sfxThilo/src/orxonox/items/MultiStateEngine.cc

@@ -61 +61 @@
             this->defEngineSndNormal_->setLooping(true);
             this->defEngineSndBoost_->setLooping(true);
+            this->defEngineSndNormal_->setVolume(0.8f);
+            this->defEngineSndBoost_->setVolume(0.5f);
             this->lua_ = new LuaState();
         }

code/branches/sfxThilo/src/orxonox/sound/AmbientSound.cc

@@ -79 +79 @@
     }
 
-    void AmbientSound::setAmbientSource(const std::string& source)
+    bool AmbientSound::setAmbientSource(const std::string& source)
     {
         this->ambientSource_ = source;
-        this->moodChanged(MoodManager::getInstance().getMood());
+        return(this->moodChanged(MoodManager::getInstance().getMood()));
     }
 
-    void AmbientSound::moodChanged(const std::string& mood)
+    bool AmbientSound::moodChanged(const std::string& mood)
     {
         if (GameMode::playsSound())
@@ -95 +95 @@
                 orxout(user_info) << "Loading ambient sound " << path << "..." << endl; // TODO: make this output internal if we implement sound streaming
                 this->setSource(path);
+
+                // all went fine
+                return true;
             }
             else
             {
                 orxout(internal_warning, context::sound) << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << endl;
+
+                // everything went southways
+                return false;
             }
         }
+        return false;
     }
 

code/branches/sfxThilo/src/orxonox/sound/AmbientSound.h

@@ -54 +54 @@
         void pause();
 
-        void setAmbientSource(const std::string& source);
+        bool setAmbientSource(const std::string& source);
         inline const std::string& getAmbientSource() const
             { return this->ambientSource_; }
@@ -68 +68 @@
         void preDestroy();
         float getRealVolume();
-        void moodChanged(const std::string& mood);
+        bool moodChanged(const std::string& mood);
         inline void ambientSourceChanged()
             { this->setAmbientSource(this->ambientSource_); }

code/branches/sfxThilo/src/orxonox/sound/BaseSound.cc

@@ -47 +47 @@
     BaseSound::BaseSound()
         : bPooling_(false)
-        , volume_(1.0)
+        , volume_(0.7)
         , bLooping_(false)
         , state_(Stopped)

code/branches/sfxThilo/src/orxonox/sound/SoundManager.cc

@@ -218 +218 @@
             .description("Defines the overall volume.")
             .callback(this, &SoundManager::checkSoundVolumeValidity);
-        SetConfigValueAlias(volume_[SoundType::Music], "ambientVolume_", 1.0f)
+        SetConfigValueAlias(volume_[SoundType::Music], "ambientVolume_", 0.7f)
             .description("Defines the ambient volume.")
             .callback(this, &SoundManager::checkAmbientVolumeValidity);

code/branches/sfxThilo/src/orxonox/sound/WorldAmbientSound.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "AmbientSound.h"
+#include "core/command/ConsoleCommand.h"
+#include <exception>
+
 
 namespace orxonox
 {
+        SetConsoleCommand("WorldAmbientSound", "nextsong",      &WorldAmbientSound::nextSong);
+
     RegisterClass(WorldAmbientSound);
 
@@ -44 +49 @@
         this->ambientSound_ = new AmbientSound();
         this->registerVariables();
+        soundList_.push_back("Earth.ogg");
+        soundList_.push_back("Jupiter.ogg");
+        soundList_.push_back("Mars.ogg");
+        soundList_.push_back("allgorythm-lift_up.ogg");
+        soundList_.push_back("allgorythm-resonance_blaster.ogg");
+        soundList_.push_back("AlphaCentauri.ogg");
+        soundList_.push_back("Asteroid_rocks.ogg");
+        soundList_.push_back("Ganymede.ogg");
+        soundList_.push_back("luke_grey_-_hypermode.ogg");
+
     }
-
     WorldAmbientSound::~WorldAmbientSound()
     {
@@ -51 +65 @@
         {
             this->ambientSound_->destroy();
+            WorldAmbientSound::soundList_.clear();
         }
     }
@@ -94 +109 @@
             this->ambientSound_->stop();
     }
+
+    void WorldAmbientSound::nextSong()
+    {
+
+        //HACK: Assuption - there is only one WorldAmbientSound in a level and only one level is used.
+        for (ObjectList<WorldAmbientSound>::iterator it = ObjectList<WorldAmbientSound>::begin();
+             it != ObjectList<WorldAmbientSound>::end(); ++it)
+        {
+                while(it->ambientSound_->setAmbientSource(WorldAmbientSound::soundList_[WorldAmbientSound::soundNumber_]) == false){
+                        WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
+                }
+                WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
+        }
+    }
 }

code/branches/sfxThilo/src/orxonox/sound/WorldAmbientSound.h

@@ -34 +34 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
+#include <string>
+#include <vector>
+
 
 namespace orxonox
@@ -54 +57 @@
             void play();
 
+            //This function changes the current ambient song.
+            //You can call nextSong() active in the level
+            //by pressing the key 'M'.
+            static void nextSong();
+
         private:
             void registerVariables();
 
+            //Vector with the diffrent available level sounds.
+            //The sound names are pushed in the WorldAmbientSound-constructor.
+            static std::vector<std::string> soundList_;
+
+            // This value will be initialized below, don't make this into
+            // a const, since we want to change it in nextSong().
+            static int soundNumber_;
+
+
             AmbientSound* ambientSound_;
     };
+
+    // This is an initialization for the soundnumber variable. Since it is
+    // static, we have to initialize it this way.
+    int WorldAmbientSound::soundNumber_ = 0;
+    std::vector<std::string> WorldAmbientSound::soundList_;
+
 }
 

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

@@ -81 +81 @@
             alSourcef(this->audioSource_, AL_REFERENCE_DISTANCE, refDist);
             // TODO: 500 is very magical here. Derive something better
-            alSourcef(this->audioSource_, AL_MAX_DISTANCE, refDist * 500);
+            alSourcef(this->audioSource_, AL_MAX_DISTANCE, refDist * 20);
         }
         this->tick(0); // update position, orientation and velocity

code/branches/sfxThilo/src/orxonox/weaponsystem/WeaponMode.cc

@@ -79 +79 @@
             this->defSndWpnFire_ = new WorldSound(this->getContext());
             this->defSndWpnFire_->setLooping(false);
+            this->defSndWpnFire_->setVolume(0.8f);
             this->bSoundAttached_ = false;
         }

code/branches/sfxThilo/src/orxonox/worldentities/pawns/Pawn.cc

@@ -46 +46 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSet.h"
+#include "sound/WorldSound.h"
 
 #include "controllers/FormationController.h"
@@ -100 +101 @@
 
         this->setSyncMode(ObjectDirection::Bidirectional); // needed to synchronise e.g. aimposition
+
+        if (GameMode::isMaster())
+        {
+            this->explosionSound_ = new WorldSound(this->getContext());
+            this->explosionSound_->setVolume(1.0f);
+        }
+        else
+        {
+            this->explosionSound_ = 0;
+        }
     }
 
@@ -109 +120 @@
                 this->weaponSystem_->destroy();
         }
+
     }
 
@@ -135 +147 @@
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
 
+        XMLPortParam(Pawn, "explosionSound",  setExplosionSound,  getExplosionSound,  xmlelement, mode);
+
         XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
     }
+
 
     void Pawn::registerVariables()
@@ -290 +305 @@
     void Pawn::kill()
     {
-        this->damage(this->health_);
+        this->damage(this->health_);
         this->death();
     }
@@ -314 +329 @@
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
-            // Set bAlive_ to false and wait for PawnManager to do the destruction
+            explosionSound_->play();
+                // Set bAlive_ to false and wait for PawnManager to do the destruction
             this->bAlive_ = false;
 
@@ -527 +543 @@
 
 
+    void Pawn::setExplosionSound(const std::string &explosionSound)
+    {
+        if(explosionSound_ )
+            explosionSound_->setSource(explosionSound);
+        else
+            assert(0); // This should never happen, because soundpointer is only available on master
+    }
+
+    const std::string& Pawn::getExplosionSound()
+    {
+        if( explosionSound_ )
+            return explosionSound_->getSource();
+        else
+            assert(0);
+        return BLANKSTRING;
+    }
+
 
 }

code/branches/sfxThilo/src/orxonox/worldentities/pawns/Pawn.h

@@ -36 +36 @@
 #include "interfaces/RadarViewable.h"
 #include "worldentities/ControllableEntity.h"
+
 
 namespace orxonox // tolua_export
@@ -178 +179 @@
             virtual void changedVisibility();
 
+            void setExplosionSound(const std::string& engineSound);
+            const std::string& getExplosionSound();
+
         protected:
             virtual void preDestroy();
@@ -231 +235 @@
 
             Vector3 aimPosition_;
+
+            WorldSound* explosionSound_;
+
     }; // tolua_export
 } // tolua_export