Changeset 5738 for code/trunk/src/orxonox/sound

Timestamp:

Sep 1, 2009, 2:03:05 AM (15 years ago)

Author:

landauf

Message:

merged libraries2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/sound/SoundBase.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (3 diffs)

code/trunk/src/orxonox/sound/SoundBase.cc

@@ -37 +37 @@
 #include "core/Core.h"
 #include "core/Resource.h"
-#include "orxonox/objects/worldentities/WorldEntity.h"
+#include "worldentities/WorldEntity.h"
 #include "SoundManager.h"
 
-namespace orxonox 
+namespace orxonox
 {
     SoundBase::SoundBase(WorldEntity* entity)

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -32 +32 @@
 
 #include "util/Math.h"
-#include "orxonox/CameraManager.h"
-#include "orxonox/objects/worldentities/Camera.h"
+#include "CameraManager.h"
+#include "graphics/Camera.h"
 #include "SoundBase.h"
 
@@ -146 +146 @@
         Vector3 at = orient.zAxis();
 
-        ALfloat orientation[6] = { at.x, at.y, at.z, 
+        ALfloat orientation[6] = { at.x, at.y, at.z,
                                  up.x, up.y, up.z };
 
@@ -158 +158 @@
             (*i)->update();
     }
-    
+
     /**
     * Check if sound is available