X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAudio%2Fopenal_wrapper.cpp;h=e8203af75bbf377414a1b59af796ad1f4c949e83;hb=eae73ddd7a006ee6de9ffb01f3ec5f8e5fdc6d85;hp=84cfd8d70d665e35400e2fa794dffbac90e10e02;hpb=599b809be170b24db3e35f0105ed5e659dd7d637;p=lugaru.git
diff --git a/Source/Audio/openal_wrapper.cpp b/Source/Audio/openal_wrapper.cpp
index 84cfd8d..e8203af 100644
--- a/Source/Audio/openal_wrapper.cpp
+++ b/Source/Audio/openal_wrapper.cpp
@@ -22,7 +22,7 @@ along with Lugaru. If not, see .
#include "Audio/Sounds.hpp"
#include "Game.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
#include
#include
@@ -79,7 +79,7 @@ static void set_channel_position(const int channel, const float x,
}
-AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz)
+AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *, float fx, float fy, float fz, float tx, float ty, float tz)
{
if (!initialized)
return;
@@ -90,7 +90,7 @@ AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel,
listener_position[2] = -pos[2];
}
- ALfloat vec[6] = { fx, fy, -fz, tz, ty, -tz };
+ ALfloat vec[6] = { fx, fy, -fz, tx, ty, -tz };
alListenerfv(AL_ORIENTATION, vec);
// we ignore velocity, since doppler's broken in the Linux AL at the moment...
@@ -102,7 +102,7 @@ AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel,
}
}
-AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos, const float *vel)
+AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos)
{
if (!initialized)
return false;
@@ -117,7 +117,7 @@ AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos, const
return true;
}
-AL_API signed char OPENAL_3D_SetAttributes_(int channel, const XYZ &pos, const float *vel)
+AL_API signed char OPENAL_3D_SetAttributes_(int channel, const XYZ &pos)
{
if (!initialized)
return false;
@@ -566,11 +566,6 @@ AL_API void OPENAL_Update()
alcProcessContext(alcGetCurrentContext());
}
-AL_API signed char OPENAL_SetOutput(int outputtype)
-{
- return true;
-}
-
extern int channels[];
extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)