Changeset 5956 for code

Timestamp:

Oct 14, 2009, 5:01:49 PM (15 years ago)

Author:

youngk

Message:

Implemented Mood functionality plus the ability to change the background sound in the main menu

Location:

code/branches/sound3/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• MoodManager.cc (added)
• MoodManager.h (added)
• gamestates/GSMainMenu.cc (modified) (6 diffs)
• gamestates/GSMainMenu.h (modified) (3 diffs)

code/branches/sound3/src/orxonox/CMakeLists.txt

@@ -28 +28 @@
   LevelManager.cc
   Main.cc
+  MoodManager.cc
   PawnManager.cc
   PlayerManager.cc
@@ -55 +56 @@
   TOLUA_FILES
     LevelManager.h
+    MoodManager.h
     pickup/BaseItem.h
     pickup/PickupInventory.h

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

@@ -36 +36 @@
 #include "core/Game.h"
 #include "core/ConsoleCommand.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
@@ -49 +50 @@
         , inputState_(0)
     {
+                RegisterRootObject(GSMainMenu);
         inputState_ = InputManager::getInstance().createInputState("mainMenu");
         inputState_->setMouseMode(MouseMode::Nonexclusive);
@@ -64 +66 @@
             // Load sound
             this->ambient_ = new AmbientSound(0);
-            this->ambient_->setSource("ambient/mainmenu.wav");
         }
     }
@@ -92 +93 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startIOConsole), "startIOConsole"));
+                
+                // create command to change sound path
+                CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
 
         KeyBinderManager::getInstance().setToDefault();
@@ -99 +103 @@
         {
             this->ambient_->setLoop(true);
-            this->ambient_->play();
+                        this->ambient_->setPlayOnLoad(true);
         }
+
+                this->setConfigValues();
     }
 
@@ -119 +125 @@
     {
     }
+
+        void GSMainMenu::setConfigValues()
+    {
+        SetConfigValue(soundPathMain_, "ambient/mainmenu.wav")
+            .description("Contains the path to the main menu sound file.")
+                        .callback(this, &GSMainMenu::reloadSound);
+    }
+
+        void GSMainMenu::reloadSound() {
+                if (GameMode::playsSound())
+        {
+                        this->ambient_->setSource(soundPathMain_);
+                }
+        }
+
+        const std::string& GSMainMenu::getMainMenuSoundPath() {
+                return soundPathMain_;
+        }
+
+        void GSMainMenu::setMainMenuSoundPath(const std::string& path) {
+                ModifyConfigValue(soundPathMain_, set, path);
+        }
 
     void GSMainMenu::startStandalone()

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

@@ -34 +34 @@
 #include "util/OgreForwardRefs.h"
 #include "core/GameState.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSMainMenu : public GameState
+    class _OrxonoxExport GSMainMenu : public GameState, public OrxonoxClass
     {
     public:
@@ -46 +47 @@
         void deactivate();
         void update(const Clock& time);
+
+                void setConfigValues();
+                void reloadSound();
+                const std::string& getMainMenuSoundPath();
+                void setMainMenuSoundPath(const std::string& path);
 
         static void startStandalone();
@@ -61 +67 @@
         // ambient sound for the main menu
         AmbientSound*     ambient_;
+                std::string               soundPathMain_;
     };
 }