Changeset 4196 in orxonox.OLD for orxonox/branches/openAL

Timestamp:

May 16, 2005, 3:16:33 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: implemented some basic Functions

Location:

orxonox/branches/openAL/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• defs/alincl.h (copied) (copied from orxonox/branches/openAL/src/defs/glincl.h) (1 diff)
• lib/coord/p_node.h (modified) (1 diff)
• lib/math/vector.cc (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (3 diffs)
• lib/sound/sound_engine.h (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)

orxonox/branches/openAL/src/Makefile.am

@@ -131 +131 @@
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/alincl.h \
                  defs/comincl.h \
                  defs/confincl.h \

orxonox/branches/openAL/src/Makefile.in

@@ -375 +375 @@
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/alincl.h \
                  defs/comincl.h \
                  defs/confincl.h \

orxonox/branches/openAL/src/defs/alincl.h

@@ -1 +1 @@
 /*!
-  \file glincl.h
-  \brief This file includes gl Headers.
+  \file alincl.h
+  \brief This file includes al Headers.
   
-  no Class is defined here, but the opengl Headers
+  no Class is defined here, but the openAL Headers
 */
 
-#ifndef _GLINCL_H
-#define _GLINCL_H
-
-#include <SDL.h>
+#ifndef _ALINCL_H
+#define _ALINCL_H
 
 #ifndef __APPLE__
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <AL/al.h>
+#include <AL/alu.h>
+#include <AL/alut.h>
 #else
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
+#include <OpenAL/al.h>
+#include <OpenAL/alu.h>
+#include <OpenAL/alut.h>
 #endif
 
-#endif /* _GLINCL_H */
+#endif /* _ALINCL_H */

orxonox/branches/openAL/src/lib/coord/p_node.h

@@ -66 +66 @@
   void setRelDir (const Quaternion& relDir);
   inline const Quaternion& getAbsDir () const { return this->absDirection; }
+  inline Vector getAbsDirV(void) const { return this->absDirection.apply(Vector(0,1,0)); }
   void setAbsDir (const Quaternion& absDir);
   void shiftDir (const Quaternion& shift);

orxonox/branches/openAL/src/lib/math/vector.cc

@@ -329 +329 @@
 */
 
-Vector Quaternion::apply (Vector& v) const
+Vector Quaternion::apply (const Vector& v) const
 {
   Quaternion q;

orxonox/branches/openAL/src/lib/math/vector.h

@@ -96 +96 @@
   return r;}
   Quaternion inverse () const;
-  Vector apply (Vector& f) const;
+  Vector apply (const Vector& f) const;
   float norm () const;
   void matrix (float m[4][4]) const;

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

@@ -17 +17 @@
 
 #include "sound_engine.h"
+#include "p_node.h"
+#include "list.h"
 
 using namespace std;
 
+
+/**
+   \brief Creates a Soundbuffer out of an inputfile
+   \param fileName The name of the File
+*/
+SoundBuffer::SoundBuffer(const char* fileName)
+{
+  SoundEngine::getInstance()->addBuffer(this);
+
+  ALenum format;
+  ALvoid* data;
+  ALsizei freq;
+
+  alGenBuffers(1, &this->bufferID);
+  alutLoadWAVFile((ALbyte*)fileName, &format, &data, &this->size, &freq, &this->loop);
+  alBufferData(this->bufferID, format, data, this->size, freq);
+  alutUnloadWAV(format, data, this->size, freq);
+}
+
+SoundBuffer::~SoundBuffer(void)
+{
+  SoundEngine::getInstance()->removeBuffer(this);
+}
+
+
+
+/**
+   \brief creates a SoundSource at position sourceNode with the SoundBuffer buffer
+*/
+SoundSource::SoundSource(SoundBuffer* buffer, PNode* sourceNode)
+{
+  SoundEngine::getInstance()->addSource(this);
+
+  this->buffer = buffer;
+  this->sourceNode = sourceNode;
+}
+
+SoundSource::~SoundSource(void)
+{
+  SoundEngine::getInstance()->removeSource(this);
+}
 
 /**
@@ -26 +69 @@
 SoundEngine::SoundEngine () 
 {
-   this->setClassName ("SoundEngine");
+  this->setClassName ("SoundEngine");
+   
+   this->initAudio();
 
+   this->listener = NULL;
+   this->bufferList = new tList<SoundBuffer>;
+   this->sourceList = new tList<SoundSource>;
 }
 
@@ -54 +102 @@
 
 }
+
+/**
+   \brief sets The listener (normaly the Camera)
+*/
+void SoundEngine::setListener(PNode* listener)
+{
+  this->listener = listener;
+}
+
+
+void SoundEngine::addBuffer(SoundBuffer* buffer)
+{
+  this->bufferList->add(buffer);
+}
+
+void SoundEngine::removeBuffer(SoundBuffer* buffer)
+{
+  this->bufferList->remove(buffer);
+}
+
+void SoundEngine::addSource(SoundSource* source)
+{
+  this->sourceList->add(source);
+}
+void SoundEngine::removeSource(SoundSource* source)
+{
+  this->sourceList->remove(source);
+}
+
+
+/**
+   \brief updates all The positions, Directions and Velocities of all Sounds
+*/
+void SoundEngine::update(void)
+{
+
+  // updating the Listeners Position
+  if (this->listener)
+    {
+      alListener3f(AL_POSITION,
+                   this->listener->getAbsCoor().x,
+                   this->listener->getAbsCoor().y,
+                   this->listener->getAbsCoor().z);
+      alListener3f(AL_VELOCITY,
+                   this->listener->getVelocity().x,
+                   this->listener->getVelocity().y,
+                   this->listener->getVelocity().z);
+      Vector absDirV = this->listener->getAbsDirV();
+      alListener3f(AL_ORIENTATION, 
+                   absDirV.x,
+                   absDirV.y,
+                   absDirV.z);
+    }
+  // updating all the Sources positions
+  tIterator<SoundSource>* iterator = this->sourceList->getIterator();
+  SoundSource* enumSource = iterator->nextElement();
+  while (enumSource)
+    {
+      alSource3f(enumSource->getID(), AL_POSITION,
+                 enumSource->getNode()->getAbsCoor().x,
+                 enumSource->getNode()->getAbsCoor().y,
+                 enumSource->getNode()->getAbsCoor().z);
+      alSource3f(enumSource->getID(), AL_VELOCITY,
+                 enumSource->getNode()->getVelocity().x,
+                 enumSource->getNode()->getVelocity().y,
+                 enumSource->getNode()->getVelocity().z);
+
+      enumSource = iterator->nextElement();
+    }
+  delete iterator;
+}
+
+/**
+   \brief initializes Audio in general
+*/
+bool SoundEngine::initAudio(void)
+{
+  alutInit(NULL, 0);
+  alGetError();
+}
+

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

@@ -9 +9 @@
 
 #include "base_object.h"
+#include "alincl.h"
 
 // FORWARD DEFINITION
+class PNode;
+template<class T> class tList;
 
-//! A Class that handles audio via the openAudioLibrary
+
+//! A class that represents a datastructure to play Sounds.
+class SoundBuffer
+{
+ public:
+  SoundBuffer(const char* fileName);
+  ~SoundBuffer(void);
+
+ private:
+  ALuint bufferID;              //!< The address of the Buffer.
+
+  ALsizei size;                 //!< The size of the Buffer.
+  ALboolean loop;               //!< loop information.
+};
+
+//! A class that represents a SoundSource
+class SoundSource
+{
+ public:
+  SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
+  ~SoundSource(void);
+
+  /** \retruns The ID of the Source */
+  inline ALuint getID(void) { return this->sourceID; }
+  /** \returns the SourceNode of this Source */
+  inline PNode* getNode(void) { return this->sourceNode;}
+
+ private:
+  ALuint sourceID;              //!< The ID of the Source
+  SoundBuffer* buffer;          //!< The buffer to play in this source.
+  PNode* sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
+};
+
+
+
+//! A class that handles audio via the openAudioLibrary
 class SoundEngine : public BaseObject {
 
@@ -19 +57 @@
   virtual ~SoundEngine(void);
 
+  void setListener(PNode* listener);
+
+  void addBuffer(SoundBuffer* buffer);
+  void removeBuffer(SoundBuffer* buffer);
+  void addSource(SoundSource* source);
+  void removeSource(SoundSource* source);
+
+
+  void update(void);
+
  private:
   SoundEngine(void);
   static SoundEngine* singletonRef;
+
+  bool initAudio(void);
+
+  PNode* listener;                 //!< The listener of the Scene
+  tList<SoundBuffer>* bufferList;  //!< A list of buffers
+  tList<SoundSource>* sourceList;  //!< A list for all the sources in the scene.
+
 };
 

orxonox/branches/openAL/src/orxonox.cc

@@ -35 +35 @@
 #include "game_loader.h"
 #include "graphics_engine.h"
+#include "sound_engine.h"
 #include "resource_manager.h"
 #include "text_engine.h"
@@ -151 +152 @@
   printf("> Initializing sound\n");
   // SDL_Init(SDL_INIT_AUDIO);
-  printf("Not yet implemented\n");
+  SoundEngine::getInstance();
   return 0;
 }