Changeset 2930

Timestamp:

Apr 27, 2009, 1:18:13 PM (16 years ago)

Author:

erwin

Message:

Sound: Added building things, corrected some typos

Location:

code/branches/sound/src

Files:

• CMakeLists.txt (modified) (1 diff)
• sound/SoundBase.h (modified) (2 diffs)
• sound/SoundManager.cc (modified) (4 diffs)
• sound/SoundManager.h (modified) (4 diffs)

code/branches/sound/src/CMakeLists.txt

@@ -141 +141 @@
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)
-#ADD_SUBDIRECTORY(audio)
+ADD_SUBDIRECTORY(sound)
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)

code/branches/sound/src/sound/SoundBase.h

@@ -26 +26 @@
  *
  */
+#ifndef _SOUNDBASE_H__
+#define _SOUNDBASE_H__
 
 #include <al.h>
@@ -64 +66 @@
     }; // class SoundBase
 } // namepsace orxonox
+
+#endif // _SOUNDBASE_H__

code/branches/sound/src/sound/SoundManager.cc

@@ -30 +30 @@
 
 #include "orxonox/CameraManager.h"
+#include "orxonox/objects/worldentities/Camera.h"
+#include "util/Math.h"
 #include "SoundManager.h"
 
@@ -61 +63 @@
         this->context_ = alcCreateContext(this->device_, NULL);
         alcMakeContextCurrent(this->context_);
-        ALenum error = alcGetError();
+        ALenum error = alcGetError(this->device_);
         if(error != ALC_NO_ERROR)
             COUT(2) << "OpenAL: Could not create sound context." << std::endl;
@@ -112 +114 @@
         Quaternion orient = camera->getOrientation();
         Vector3 up = orient.xAxis(); // just a wild guess
-        Vecotr3 at = orient.zAxis();
+        Vector3 at = orient.zAxis();
 
-        float[3][2] orientation = { { at.x, at.y, at.z },
-                                    { up.x, up.y, up.z } };
+        ALfloat* orientation = { at.x, at.y, at.z, 
+                                 up.x, up.y, up.z };
 
         alListenerfv(AL_POSITION, orientation);
@@ -127 +129 @@
     }
 
-} // namespace orxonox
+}  

code/branches/sound/src/sound/SoundManager.h

@@ -25 +25 @@
  *      ...
  */
+#ifndef _SOUNDMANGER_H__
+#define _SOUNDMANGER_H__
 
 #include <al.h>
 #include <alc.h>
 
-#include <Tickable.h>
+#include <orxonox/objects/Tickable.h>
 
-class SoundBase;
+namespace orxonox
+{
+    class SoundBase;
 
-namespace Orxonox
-{
     /**
      * The SoundManager class manages the OpenAL device, context and listener
@@ -41 +43 @@
      *
      */
-    class SoundManager : public Tickable
+    class SoundManager : public Tickable 
     {
     public:
@@ -49 +51 @@
         void removeSound(SoundBase* sound);
         
-        void tick(float dt);
+        virtual void tick(float dt);
 
     private:
@@ -61 +63 @@
 
     }; // class SoundManager
-} // namespace Orxonox
+} // namespace orxonox
+
+#endif // _SOUNDMANAGER_H__