Context Navigation

Changeset 3060 for code/trunk/src

Timestamp:

May 25, 2009, 3:07:31 PM (16 years ago)

Message:

merged sound2 back to trunk

Location:

code/trunk

-                      r2963
+                      r3060
 ADD_SUBDIRECTORY(overlays)
 ADD_SUBDIRECTORY(tools)
+ADD_SUBDIRECTORY(sound)
 GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
 SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
 …
   ${CEGUILUA_LIBRARY}
   ${Boost_SYSTEM_LIBRARY}
+  ${OPENAL_LIBRARY}
+  ${ALUT_LIBRARY}
+  ${VORBISFILE_LIBRARY}
+  ${VORBIS_LIBRARY}
+  ${OGG_LIBRARY}
   ogreceguirenderer_orxonox
   tinyxml++_orxonox
 …
   core
   network
-  #audio
+)

r3028	r3060
56	56
57	57	static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
	58	static CameraManager* getInstancePtr() { return singletonRef_s; }
58	59
59	60	void useCamera(Ogre::Camera* camera);

-                      r3053
+                      r3060
     //gui
     class GUIManager;
+    //sound
+    class SoundBase;
+    class SoundManager;
+    class SoundMainMenu;
+}

-                      r2957
+                      r3060
 #include "objects/Scene.h"
 #include "GraphicsManager.h"
+#include "sound/SoundMainMenu.h"
 namespace orxonox
 …
         InputManager::getInstance().requestEnterState("mainMenu");
+        this->ambient_ = new SoundMainMenu();
+        this->ambient_->play(true);
+    }
     void GSMainMenu::deactivate()
+    {
+        delete this->ambient_;
         InputManager::getInstance().requestLeaveState("mainMenu");
         InputManager::getInstance().requestDestroyState("mainMenu");

-                      r2896
+                      r3060
         // console commands
         ConsoleCommand* ccStartGame_;
+        // ambient sound for the main menu
+        SoundMainMenu* ambient_;
     };
+}

-                      r3028
+                      r3060
 #include "objects/gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
+#include "sound/SoundBase.h"
 #include "util/Math.h"
 …
             if (this->xmlfile_)
                 Loader::unload(this->xmlfile_);
+            if(this->ambientsound_ != NULL)
+                delete this->ambientsound_;
+        }
+    }
 …
         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);
 …
+    }
+    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)
+    {

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

r2662	r3060
36	36	#include "objects/worldentities/pawns/SpaceShip.h"
37	37	#include "tools/Shader.h"
	38	#include "sound/SoundBase.h"
38	39
39	40	namespace orxonox
…	…
66	67	this->setConfigValues();
67	68	this->registerVariables();
	69
	70	this->sound_ = NULL;
68	71	}
69	72
…	…
76	79	if (this->boostBlur_)
77	80	delete this->boostBlur_;
	81
	82	if(this->sound_ != NULL)
	83	delete this->sound_;
78	84	}
79	85	}
…	…
95	101	XMLPortParam(Engine, "accelerationleftright", setAccelerationLeftRight, setAccelerationLeftRight, xmlelement, mode);
96	102	XMLPortParam(Engine, "accelerationupdown", setAccelerationUpDown, setAccelerationUpDown, xmlelement, mode);
	103
	104	XMLPortParamLoadOnly(Engine, "sound", loadSound, xmlelement, mode);
97	105	}
98	106
…	…
219	227	{
220	228	this->ship_ = ship;
	229
221	230	if (ship)
222	231	{
…	…
230	239	this->boostBlur_ = 0;
231	240	}
	241
	242	if(this->sound_ != NULL)
	243	this->sound_->attachToEntity(ship);
232	244	}
233	245	}
…	…
240	252	return Vector3::ZERO;
241	253	}
	254
	255	void Engine::loadSound(const std::string filename)
	256	{
	257	if(filename == "") return;
	258	else
	259	{
	260	if(this->sound_ == NULL)
	261	{
	262	this->sound_ = new SoundBase(this->ship_);
	263	}
	264
	265	this->sound_->loadFile(filename);
	266	this->sound_->play(true);
	267	}
	268	}
242	269	}

-                      r2662
+                      r3060
             virtual const Vector3& getDirection() const;
+            void loadSound(const std::string filename);
         private:
             void networkcallback_shipID();
 …
             Shader* boostBlur_;
             float blurStrength_;
+            SoundBase* sound_;
     };
+}

Note: See TracChangeset for help on using the changeset viewer.