Changeset 4209 in orxonox.OLD

Timestamp:

May 17, 2005, 10:38:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: initAudio saver now

Location:

orxonox/branches/openAL/src

Files:

• lib/sound/sound_engine.cc (modified) (5 diffs)
• lib/sound/sound_engine.h (modified) (4 diffs)
• orxonox.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/branches/openAL/src/lib/sound/sound_engine.cc

@@ -98 +98 @@
 }
 
+/**
+   \brief deletes a SoundSource
+*/
 SoundSource::~SoundSource(void)
 {
@@ -159 +162 @@
 {
   this->setClassName ("SoundEngine");
-   
-   this->initAudio();
-
-   this->listener = NULL;
-   this->bufferList = new tList<SoundBuffer>;
-   this->sourceList = new tList<SoundSource>;
+  
+  this->listener = NULL;
+  this->bufferList = new tList<SoundBuffer>;
+  this->sourceList = new tList<SoundSource>;
 }
 
@@ -209 +210 @@
     }
   delete bufferIterator;
+
+  // removing openAL from AudioResource
+  alutExit();
 }
 
@@ -232 +236 @@
   this->listener = listener;
 }
+
+/**
+   \brief Sets the doppler values of openAL
+   \param dopplerFactor the extent of the doppler-effect
+   \param the Speed the sound travels
+*/
+void SoundEngine::setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity)
+{
+  alDopplerFactor(dopplerFactor);
+  alDopplerVelocity(dopplerVelocity);
+}
+
 
 /**
@@ -345 +361 @@
 bool SoundEngine::initAudio(void)
 {
+  ALenum result;
+
+  PRINTF(3)("Initialisazing openAL sound library\n");
+
   alutInit(NULL, 0);
-  alGetError();
-
-  alDopplerFactor(SOUND_DOPPLER_FACTOR);
-  alDopplerVelocity(SOUND_DOPPLER_VELOCITY);
+  if ((result = alGetError()) != AL_NO_ERROR)
+    SoundEngine::PrintALErrorString(result);
+
+  this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);
 }
 

orxonox/branches/openAL/src/lib/sound/sound_engine.h

@@ -1 +1 @@
 /*! 
     \file sound_engine.h
-    \brief Definition of the SoundEngine singleton Class
-    
+    \brief Definition of the SoundEngine singleton Class  
 */
 
@@ -78 +77 @@
 
   void setListener(PNode* listener);
+  void setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity);
+
 
   void addBuffer(SoundBuffer* buffer);
@@ -86 +87 @@
   void update(void);
 
+  // administrative
   void flushUnusedBuffers(void);
+  bool initAudio(void);
 
   // error handling:
@@ -92 +95 @@
   //  static void PrintALCErrorString(ALenum err);
 
+
  private:
   SoundEngine(void);
   static SoundEngine* singletonRef;
 
-  bool initAudio(void);
 
   PNode* listener;                 //!< The listener of the Scene

orxonox/branches/openAL/src/orxonox.cc

@@ -123 +123 @@
   if( initVideo() == -1) return -1;
   if( initSound() == -1) return -1;
-  printf("> Initializing input\n");
+  PRINT(3)("> Initializing input\n");
   if( initInput() == -1) return -1;
-  printf("> Initializing networking\n");
+  PRINT(3)("> Initializing networking\n");
   if( initNetworking () == -1) return -1;
   //printf("> Initializing world\n");
@@ -151 +151 @@
 int Orxonox::initSound() 
 {
-  printf("> Initializing sound\n");
+  PRINT(3)("> Initializing sound\n");
   // SDL_Init(SDL_INIT_AUDIO);
-  SoundEngine::getInstance();
+  SoundEngine::getInstance()->initAudio();
   return 0;
 }

orxonox/branches/openAL/src/story_entities/world.cc

@@ -489 +489 @@
   this->spawn(terrain);
 
-  SoundEngine::getInstance()->setListener(tn);
+  SoundEngine::getInstance()->setListener(this->localCamera);
 
   ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);

orxonox/branches/openAL/src/world_entities/test_gun.cc

@@ -88 +88 @@
     }
   
-  this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/explo.wav", WAV);
+  this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV);
   this->weaponSource = new SoundSource(this->fireSound, this);
 }