Changeset 334

Timestamp:

Nov 28, 2007, 5:42:23 PM (16 years ago)

Author:

nicolape

Message:

Sound is now working in Orxonox! Added a test background sound that plays when starting the game

Location:

code/branches/audio

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/wavdata (added)
• bin/wavdata/FancyPants.wav (added)
• bin/wavdata/pirate.wav (added)
• include/AL/CMakeLists.txt (deleted)
• lib/libalut.a (deleted)
• lib/libalut.so (deleted)
• lib/libalut.so.0.1.0 (deleted)
• lib/libopenal.a (deleted)
• lib/libopenal.so (deleted)
• lib/libopenal.so.0.0.0 (deleted)
• src/audio/Ambient.cc (modified) (3 diffs)
• src/audio/Ambient.h (modified) (1 diff)
• src/audio/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/orxonox.cc (modified) (1 diff)

code/branches/audio/CMakeLists.txt

@@ -49 +49 @@
 FIND_PACKAGE(ENet)
 FIND_PACKAGE(Boost)
-#FIND_PACKAGE(OpenAL)
+FIND_PACKAGE(OpenAL)
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy audio)
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${OPENAL_LIB_DIR} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy audio openal alut)
 #Sets the search path for include files
 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})

code/branches/audio/src/audio/Ambient.cc

@@ -32 +32 @@
                  ListenerOri[5]=0;
 
+
+        // Initialize OpenAL and clear the error bit.
+
+        alutInit(NULL, 0);
+        alGetError();
+
+        // Load the wav data.
+
+        if(LoadALData() == AL_FALSE)
+        {
+            printf("Error loading sound data.");
+                
+        }
+
+        SetListenerValues();
+
+        // Setup an exit procedure.
+
+        //atexit(KillALData);
+
                 std::cout << "Play sone ambient background sound";
         }
@@ -42 +62 @@
         ALsizei freq;
         ALboolean loop;
+
 
         alGenBuffers(1, &Buffer);
@@ -67 +88 @@
                 return AL_TRUE;
 
+
         return AL_FALSE;
 }       
+
+void Ambient::SetListenerValues()
+{
+        alListenerfv(AL_POSITION,    ListenerPos);
+        alListenerfv(AL_VELOCITY,    ListenerVel);
+        alListenerfv(AL_ORIENTATION, ListenerOri);
+}
+
+void Ambient::KillALData()
+{
+        alDeleteBuffers(1, &Buffer);
+        alDeleteSources(1, &Source);
+        alutExit();
+}
+
+void Ambient::play()
+{
+        alSourcePlay(Source);
+
+}
+
+
         
         

code/branches/audio/src/audio/Ambient.h

@@ -14 +14 @@
         public:
                 Ambient();
+                void play();
         private:
                 ALboolean LoadALData(); 
-
+                void SetListenerValues();
+                void KillALData();
 
                 ALuint Buffer;

code/branches/audio/src/audio/CMakeLists.txt

@@ -4 +4 @@
 SET(INC_FILES Ambient.h)
 
-INCLUDE_DIRECTORIES(..)
 
 ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(../openal/lib)
+TARGET_LINK_LIBRARIES(audio alut)
+TARGET_LINK_LIBRARIES(audio openal)
+
+

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

@@ -6 +6 @@
 ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader audio)
+TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${OPENAL_LIBRARIES} loader audio)
 
 INCLUDE_DIRECTORIES(..)

code/branches/audio/src/orxonox/orxonox.cc

@@ -192 +192 @@
       {
                                 audio::Ambient* bgsound = new audio::Ambient();
+                                bgsound->play();
                                         
         string levelFile = "sp_level_moonstation.oxw";