Changeset 327

Timestamp:

Nov 28, 2007, 4:28:44 PM (17 years ago)

Author:

nicolape

Message:

Added audio test class

Location:

code/branches/audio

Files:

• CMakeLists.txt (modified) (1 diff)
• src/audio (added)
• src/audio/Ambient.cc (added)
• src/audio/Ambient.h (added)
• src/audio/CMakeLists.txt (added)
• src/openal/CMakeLists.txt (modified) (1 diff)
• src/openal/alext.h (modified) (1 diff)
• src/openal/alut.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/orxonox.cc (modified) (2 diffs)

code/branches/audio/CMakeLists.txt

@@ -51 +51 @@
 
 #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)
+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)
 #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/openal/CMakeLists.txt

@@ -3 +3 @@
 SET(INC_FILES al.h alc.h alext.h alut.h)
 
-TARGET_LINK_LIBRARIES(lib)
 
 
+

code/branches/audio/src/openal/alext.h

@@ -2 +2 @@
 #define _AL_ALEXT_H
 
-#include <AL/al.h>
-#include <AL/alc.h>
+#include "AL/al.h"
+#include "AL/alc.h"
 
 #ifdef __cplusplus

code/branches/audio/src/openal/alut.h

@@ -9 +9 @@
 #include <OpenAL/al.h>
 #else
-#include <AL/al.h>
-#include <AL/alc.h>
+#include "al.h"
+#include "alc.h"
 #endif
 

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 )
+TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader audio)
 
 INCLUDE_DIRECTORIES(..)

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

@@ -41 +41 @@
 #include "xml/xmlParser.h"
 #include "loader/LevelLoader.h"
+#include "audio/Ambient.h"
 
 
@@ -190 +191 @@
       void createScene(void)
       {
-
+                                audio::Ambient* bgsound = new audio::Ambient();
+                                        
         string levelFile = "sp_level_moonstation.oxw";
         loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+        
+        
+        
       }