Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4504 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Jun 4, 2005, 12:38:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

Location:
orxonox/trunk/src
Files:
3 added
22 edited
1 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4500 r4504  
    11MAINSRCDIR=.
    22include $(MAINSRCDIR)/defs/include_paths.am
    3 
    43
    54
    … …  
    6766                 lib/graphics/importer/material.cc \
    6867                 lib/graphics/importer/texture.cc \
     68                 lib/sound/sound_engine.cc \
    6969                 lib/lang/base_object.cc \
    7070                 lib/util/ini_parser.cc \
    … …  
    116116                 defs/sdlincl.h \
    117117                 defs/glincl.h \
     118                 defs/alincl.h \
    118119                 defs/comincl.h \
    119120                 defs/confincl.h \
    … …  
    137138                 lib/graphics/importer/material.h \
    138139                 lib/graphics/importer/texture.h \
     140                 lib/sound/sound_engine.h \
    139141                 lib/lang/base_object.h \
    140142                 lib/util/ini_parser.h \

  • orxonox/trunk/src/Makefile.in

    r4500 r4504  
    6969        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    7070        md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
    71         material.$(OBJEXT) texture.$(OBJEXT) base_object.$(OBJEXT) \
    72         ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
    73         curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
     71        material.$(OBJEXT) texture.$(OBJEXT) sound_engine.$(OBJEXT) \
     72        base_object.$(OBJEXT) ini_parser.$(OBJEXT) substring.$(OBJEXT) \
     73        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    7474        benchmark.$(OBJEXT)
    7575orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    … …  
    102102@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    103103@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
    104 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po ./$(DEPDIR)/state.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
     105@AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po ./$(DEPDIR)/state.Po \
    105106@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
    106107@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
    … …  
    296297                 lib/graphics/importer/material.cc \
    297298                 lib/graphics/importer/texture.cc \
     299                 lib/sound/sound_engine.cc \
    298300                 lib/lang/base_object.cc \
    299301                 lib/util/ini_parser.cc \
    … …  
    345347                 defs/sdlincl.h \
    346348                 defs/glincl.h \
     349                 defs/alincl.h \
    347350                 defs/comincl.h \
    348351                 defs/confincl.h \
    … …  
    366369                 lib/graphics/importer/material.h \
    367370                 lib/graphics/importer/texture.h \
     371                 lib/sound/sound_engine.h \
    368372                 lib/lang/base_object.h \
    369373                 lib/util/ini_parser.h \
    … …  
    402406          esac; \
    403407        done; \
    404         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
     408        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    405409        cd $(top_srcdir) && \
    406           $(AUTOMAKE) --foreign  src/Makefile
     410          $(AUTOMAKE) --gnu  src/Makefile
    407411.PRECIOUS: Makefile
    408412Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    491495@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
    492496@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
     497@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
    493498@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Po@am__quote@
    494499@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    … …  
    12101215@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    12111216@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi`
     1217
     1218sound_engine.o: lib/sound/sound_engine.cc
     1219@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.o -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc; \
     1220@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
     1221@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.o' libtool=no @AMDEPBACKSLASH@
     1222@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
     1223@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1224@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc
     1225
     1226sound_engine.obj: lib/sound/sound_engine.cc
     1227@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.obj -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`; \
     1228@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
     1229@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.obj' libtool=no @AMDEPBACKSLASH@
     1230@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
     1231@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1232@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`
    12121233
    12131234base_object.o: lib/lang/base_object.cc
    … …  
    14451466
    14461467distdir: $(DISTFILES)
    1447         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1468        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/sound $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    14481469        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14491470        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/defs/include_paths.am

    r4457 r4504  
    1616AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
    1717AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
     18AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
    1819AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    1920AM_CXXFLAGS+=-I$(MAINSRCDIR)/font

  • orxonox/trunk/src/lib/Makefile.in

    r4484 r4504  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --foreign  src/lib/Makefile
     190          $(AUTOMAKE) --gnu  src/lib/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/event/Makefile.in

    r4484 r4504  
    212212          esac; \
    213213        done; \
    214         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
    215215        cd $(top_srcdir) && \
    216           $(AUTOMAKE) --foreign  src/lib/event/Makefile
     216          $(AUTOMAKE) --gnu  src/lib/event/Makefile
    217217.PRECIOUS: Makefile
    218218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/Makefile.in

    r4438 r4504  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     181          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r4438 r4504  
    181181          esac; \
    182182        done; \
    183         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     183        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    184184        cd $(top_srcdir) && \
    185           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     185          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    186186.PRECIOUS: Makefile
    187187Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/Makefile.in

    r4438 r4504  
    241241          esac; \
    242242        done; \
    243         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     243        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    244244        cd $(top_srcdir) && \
    245           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     245          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    246246.PRECIOUS: Makefile
    247247Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/particles/Makefile.in

    r4438 r4504  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --foreign  src/lib/particles/Makefile
     213          $(AUTOMAKE) --gnu  src/lib/particles/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/physics/Makefile.in

    r4438 r4504  
    217217          esac; \
    218218        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
    220220        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --foreign  src/lib/physics/Makefile
     221          $(AUTOMAKE) --gnu  src/lib/physics/Makefile
    222222.PRECIOUS: Makefile
    223223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/tinyxml/Makefile.in

    r4438 r4504  
    204204          esac; \
    205205        done; \
    206         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
    207207        cd $(top_srcdir) && \
    208           $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
     208          $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
    209209.PRECIOUS: Makefile
    210210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/orxonox.cc

    r4446 r4504  
    3333#include "game_loader.h"
    3434#include "graphics_engine.h"
     35#include "sound_engine.h"
    3536#include "resource_manager.h"
    3637#include "object_manager.h"
    … …  
    7273  Orxonox::singletonRef = NULL;
    7374  delete GraphicsEngine::getInstance(); // deleting the Graphics
     75  delete TextEngine::getInstance();
     76  delete SoundEngine::getInstance();
    7477  delete ResourceManager::getInstance(); // deletes the Resource Manager
    7578  delete ObjectManager::getInstance();
    … …  
    121124  if( initVideo() == -1) return -1;
    122125  if( initSound() == -1) return -1;
    123   printf("> Initializing input\n");
     126  PRINT(3)("> Initializing input\n");
    124127  if( initInput() == -1) return -1;
    125   printf("> Initializing networking\n");
     128  PRINT(3)("> Initializing networking\n");
    126129  if( initNetworking () == -1) return -1;
    127130  //printf("> Initializing world\n");
    … …  
    149152int Orxonox::initSound()
    150153{
    151   printf("> Initializing sound\n");
     154  PRINT(3)("> Initializing sound\n");
    152155  // SDL_Init(SDL_INIT_AUDIO);
    153   printf("Not yet implemented\n");
     156  SoundEngine::getInstance()->initAudio();
    154157  return 0;
    155158}

  • orxonox/trunk/src/story_entities/world.cc

    r4502 r4504  
    6565#include "event_handler.h"
    6666
     67#include "sound_engine.h"
     68
    6769using namespace std;
    6870
    … …  
    182184  delete this->particleEngine;
    183185  TextEngine::getInstance()->flush();
     186  SoundEngine::getInstance()->flushAllBuffers();
     187
    184188  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
    185189  delete PhysicsEngine::getInstance();
    … …  
    468472  this->spawn(terrain);
    469473
     474  SoundEngine::getInstance()->setListener(this->localCamera);
    470475
    471476
    … …  
    10791084  this->garbageCollector->update();
    10801085  this->nullParent->update (this->dtS);
     1086
     1087  SoundEngine::getInstance()->update();
    10811088}
    10821089

  • orxonox/trunk/src/subprojects/Makefile.in

    r4438 r4504  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --foreign  src/subprojects/Makefile
     190          $(AUTOMAKE) --gnu  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/gui/Makefile.in

    r4438 r4504  
    194194target_vendor = @target_vendor@
    195195MAINSRCDIR = ../..
    196 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
    197196AM_LDFLAGS = $(MWINDOWS)
    198197gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/gui/libORXgui.a
    … …  
    229228          esac; \
    230229        done; \
    231         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile'; \
     230        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile'; \
    232231        cd $(top_srcdir) && \
    233           $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile
     232          $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile
    234233.PRECIOUS: Makefile
    235234Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    688687        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    689688
     689include $(MAINSRCDIR)/defs/include_paths.am
    690690# Tell versions [3.59,3.63) of GNU make to not export all variables.
    691691# Otherwise a system limit (for SysV at least) may be exceeded.

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4492 r4504  
    237237          esac; \
    238238        done; \
    239         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
     239        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
    240240        cd $(top_srcdir) && \
    241           $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
     241          $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
    242242.PRECIOUS: Makefile
    243243Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4493 r4504  
    260260          esac; \
    261261        done; \
    262         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
     262        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
    263263        cd $(top_srcdir) && \
    264           $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
     264          $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
    265265.PRECIOUS: Makefile
    266266Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4438 r4504  
    180180target_vendor = @target_vendor@
    181181MAINSRCDIR = ../..
    182 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    183182AM_LDFLAGS = $(MWINDOWS)
    184183testmain_SOURCES = testmain.cc
    … …  
    197196          esac; \
    198197        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
     198        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
    200199        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
     200          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
    202201.PRECIOUS: Makefile
    203202Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    435434        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    436435
     436include $(MAINSRCDIR)/defs/include_paths.am
    437437# Tell versions [3.59,3.63) of GNU make to not export all variables.
    438438# Otherwise a system limit (for SysV at least) may be exceeded.

  • orxonox/trunk/src/util/resource_manager.cc

    r4468 r4504  
    2424#include "texture.h"
    2525#include "text_engine.h"
     26#include "sound_engine.h"
    2627
    2728#include "list.h"
    … …  
    312313          else
    313314            PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
     315          break;
     316        case WAV:
     317          if(isFile(fullName))
     318            tmpResource->pointer = new SoundBuffer(fullName);
    314319          break;
    315320        case IMAGE:
    … …  
    407412              delete (Texture*)resource->pointer;
    408413              break;
     414            case WAV:
     415              delete (SoundBuffer*)resource->pointer;
     416              break;
    409417            case TTF:
    410418              delete (Font*)resource->pointer;

  • orxonox/trunk/src/world_entities/test_gun.cc

    r4467 r4504  
    3131#include "list.h"
    3232#include "animation3d.h"
     33#include "sound_engine.h"
    3334
    3435#include "object_manager.h"
    … …  
    8990      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
    9091    }
    91 
     92 
     93  this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV);
     94  this->weaponSource = new SoundSource(this->fireSound, this);
     95  this->weaponSource->setRolloffFactor(.1);
    9296  Projectile* p = new TestBullet(this);
    9397  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
    … …  
    146150
    147151  Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
     152  weaponSource->play();
     153
    148154  pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
    149155  pj->setAbsDir(this->getAbsDir());

  • orxonox/trunk/src/world_entities/weapon.h

    r3888 r4504  
    175175  int leftRight;   // this will become an enum
    176176
     177  SoundBuffer* fireSound;
     178  SoundSource* weaponSource;
     179
     180
    177181 private:
    178182  bool enabled;                    //<! states if the weapon is enabled or not

  • orxonox/trunk/src/world_entities/world_entity.h

    r4261 r4504  
    1313#include "load_param.h"
    1414
    15 
    1615//class CollisionCluster;
    1716class CharacterAttributes;
    1817class Model;
     18class SoundEngine;
     19class SoundBuffer;
     20class SoundSource;
     21
    1922//! Basic class from which all interactive stuff in the world is derived from
    2023class WorldEntity : public PNode
Note: See TracChangeset for help on using the changeset viewer.