Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 327


Ignore:
Timestamp:
Nov 28, 2007, 4:28:44 PM (17 years ago)
Author:
nicolape
Message:

Added audio test class

Location:
code/branches/audio
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/audio/CMakeLists.txt

    r303 r327  
    5151
    5252#Sets the search paths for the linking
    53 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)
     53LINK_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)
    5454#Sets the search path for include files
    5555INCLUDE_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

    r318 r327  
    33SET(INC_FILES al.h alc.h alext.h alut.h)
    44
    5 TARGET_LINK_LIBRARIES(lib)
    65
    76
     7
  • code/branches/audio/src/openal/alext.h

    r318 r327  
    22#define _AL_ALEXT_H
    33
    4 #include <AL/al.h>
    5 #include <AL/alc.h>
     4#include "AL/al.h"
     5#include "AL/alc.h"
    66
    77#ifdef __cplusplus
  • code/branches/audio/src/openal/alut.h

    r318 r327  
    99#include <OpenAL/al.h>
    1010#else
    11 #include <AL/al.h>
    12 #include <AL/alc.h>
     11#include "al.h"
     12#include "alc.h"
    1313#endif
    1414
  • code/branches/audio/src/orxonox/CMakeLists.txt

    r304 r327  
    66ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
    77
    8 TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader )
     8TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader audio)
    99
    1010INCLUDE_DIRECTORIES(..)
  • code/branches/audio/src/orxonox/orxonox.cc

    r304 r327  
    4141#include "xml/xmlParser.h"
    4242#include "loader/LevelLoader.h"
     43#include "audio/Ambient.h"
    4344
    4445
     
    190191      void createScene(void)
    191192      {
    192 
     193                                audio::Ambient* bgsound = new audio::Ambient();
     194                                       
    193195        string levelFile = "sp_level_moonstation.oxw";
    194196        loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     197       
     198       
     199       
    195200      }
    196201
Note: See TracChangeset for help on using the changeset viewer.