aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALu.c71
-rw-r--r--OpenAL32/Include/alListener.h1
-rw-r--r--OpenAL32/Include/alu.h28
-rw-r--r--OpenAL32/alListener.c32
4 files changed, 74 insertions, 58 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 72614bf8..c1388c4a 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -44,34 +44,6 @@ ALfloat ConeScale = 0.5f;
ALfloat ZScale = 1.0f;
-static __inline ALvoid aluCrossproduct(const ALfloat *inVector1, const ALfloat *inVector2, ALfloat *outVector)
-{
- outVector[0] = inVector1[1]*inVector2[2] - inVector1[2]*inVector2[1];
- outVector[1] = inVector1[2]*inVector2[0] - inVector1[0]*inVector2[2];
- outVector[2] = inVector1[0]*inVector2[1] - inVector1[1]*inVector2[0];
-}
-
-static __inline ALfloat aluDotproduct(const ALfloat *inVector1, const ALfloat *inVector2)
-{
- return inVector1[0]*inVector2[0] + inVector1[1]*inVector2[1] +
- inVector1[2]*inVector2[2];
-}
-
-static __inline ALfloat aluNormalize(ALfloat *inVector)
-{
- ALfloat length, inverse_length;
-
- length = aluSqrt(aluDotproduct(inVector, inVector));
- if(length > 0.0f)
- {
- inverse_length = 1.0f/length;
- inVector[0] *= inverse_length;
- inVector[1] *= inverse_length;
- inVector[2] *= inverse_length;
- }
- return length;
-}
-
static __inline ALvoid aluMatrixVector(ALfloat *vector,ALfloat w,ALfloat matrix[4][4])
{
ALfloat temp[4] = {
@@ -456,38 +428,23 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
//1. Translate Listener to origin (convert to head relative)
if(ALSource->bHeadRelative == AL_FALSE)
{
- ALfloat U[3],V[3],N[3];
ALfloat Matrix[4][4];
-
- // Build transform matrix
- N[0] = ALContext->Listener.Forward[0]; // At-vector
- N[1] = ALContext->Listener.Forward[1];
- N[2] = ALContext->Listener.Forward[2];
- V[0] = ALContext->Listener.Up[0]; // Up-vector
- V[1] = ALContext->Listener.Up[1];
- V[2] = ALContext->Listener.Up[2];
- if(aluNormalize(N) > 0.0f && aluNormalize(V) > 0.0f)
+ for(i = 0;i < 4;i++)
{
- /* Build and normalize right-vector */
- aluCrossproduct(N, V, U);
- if(aluNormalize(U) > 0.0f)
- {
- Matrix[0][0]=U[0]; Matrix[0][1]=V[0]; Matrix[0][2]=-N[0]; Matrix[0][3]=0.0f;
- Matrix[1][0]=U[1]; Matrix[1][1]=V[1]; Matrix[1][2]=-N[1]; Matrix[1][3]=0.0f;
- Matrix[2][0]=U[2]; Matrix[2][1]=V[2]; Matrix[2][2]=-N[2]; Matrix[2][3]=0.0f;
- Matrix[3][0]=0.0f; Matrix[3][1]=0.0f; Matrix[3][2]= 0.0f; Matrix[3][3]=1.0f;
-
- /* Translate position */
- Position[0] -= ALContext->Listener.Position[0];
- Position[1] -= ALContext->Listener.Position[1];
- Position[2] -= ALContext->Listener.Position[2];
-
- /* Transform source vectors into listener space */
- aluMatrixVector(Position, 1.0f, Matrix);
- aluMatrixVector(Direction, 0.0f, Matrix);
- aluMatrixVector(Velocity, 0.0f, Matrix);
- }
+ ALint i2;
+ for(i2 = 0;i2 < 4;i2++)
+ Matrix[i][i2] = ALContext->Listener.Matrix[i][i2];
}
+
+ /* Translate position */
+ Position[0] -= ALContext->Listener.Position[0];
+ Position[1] -= ALContext->Listener.Position[1];
+ Position[2] -= ALContext->Listener.Position[2];
+
+ /* Transform source vectors into listener space */
+ aluMatrixVector(Position, 1.0f, Matrix);
+ aluMatrixVector(Direction, 0.0f, Matrix);
+ aluMatrixVector(Velocity, 0.0f, Matrix);
}
else
{
diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index 0f399e5f..0e69f6c5 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -13,6 +13,7 @@ typedef struct ALlistener_struct
volatile ALfloat Velocity[3];
volatile ALfloat Forward[3];
volatile ALfloat Up[3];
+ volatile ALfloat Matrix[4][4];
volatile ALfloat Gain;
volatile ALfloat MetersPerUnit;
} ALlistener;
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index ffc8fa39..a3584775 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -260,6 +260,34 @@ static __inline void RestoreFPUMode(int state)
}
+static __inline void aluCrossproduct(const ALfloat *inVector1, const ALfloat *inVector2, ALfloat *outVector)
+{
+ outVector[0] = inVector1[1]*inVector2[2] - inVector1[2]*inVector2[1];
+ outVector[1] = inVector1[2]*inVector2[0] - inVector1[0]*inVector2[2];
+ outVector[2] = inVector1[0]*inVector2[1] - inVector1[1]*inVector2[0];
+}
+
+static __inline ALfloat aluDotproduct(const ALfloat *inVector1, const ALfloat *inVector2)
+{
+ return inVector1[0]*inVector2[0] + inVector1[1]*inVector2[1] +
+ inVector1[2]*inVector2[2];
+}
+
+static __inline void aluNormalize(ALfloat *inVector)
+{
+ ALfloat length, inverse_length;
+
+ length = aluSqrt(aluDotproduct(inVector, inVector));
+ if(length > 0.0f)
+ {
+ inverse_length = 1.0f/length;
+ inVector[0] *= inverse_length;
+ inVector[1] *= inverse_length;
+ inVector[2] *= inverse_length;
+ }
+}
+
+
ALvoid aluInitPanning(ALCdevice *Device);
ALint aluCart2LUTpos(ALfloat re, ALfloat im);
diff --git a/OpenAL32/alListener.c b/OpenAL32/alListener.c
index 37982b5c..32a12cfb 100644
--- a/OpenAL32/alListener.c
+++ b/OpenAL32/alListener.c
@@ -142,14 +142,44 @@ AL_API ALvoid AL_APIENTRY alListenerfv(ALenum eParam, const ALfloat *pflValues)
isfinite(pflValues[2]) && isfinite(pflValues[3]) &&
isfinite(pflValues[4]) && isfinite(pflValues[5]))
{
+ ALfloat U[3], V[3], N[3];
+
+ /* AT then UP */
+ N[0] = pflValues[0];
+ N[1] = pflValues[1];
+ N[2] = pflValues[2];
+ aluNormalize(N);
+ V[0] = pflValues[3];
+ V[1] = pflValues[4];
+ V[2] = pflValues[5];
+ aluNormalize(V);
+ /* Build and normalize right-vector */
+ aluCrossproduct(N, V, U);
+ aluNormalize(U);
+
LockContext(Context);
- // AT then UP
Context->Listener.Forward[0] = pflValues[0];
Context->Listener.Forward[1] = pflValues[1];
Context->Listener.Forward[2] = pflValues[2];
Context->Listener.Up[0] = pflValues[3];
Context->Listener.Up[1] = pflValues[4];
Context->Listener.Up[2] = pflValues[5];
+ Context->Listener.Matrix[0][0] = U[0];
+ Context->Listener.Matrix[0][1] = V[0];
+ Context->Listener.Matrix[0][2] = -N[0];
+ Context->Listener.Matrix[0][3] = 0.0f;
+ Context->Listener.Matrix[1][0] = U[1];
+ Context->Listener.Matrix[1][1] = V[1];
+ Context->Listener.Matrix[1][2] = -N[1];
+ Context->Listener.Matrix[1][3] = 0.0f;
+ Context->Listener.Matrix[2][0] = U[2];
+ Context->Listener.Matrix[2][1] = V[2];
+ Context->Listener.Matrix[2][2] = -N[2];
+ Context->Listener.Matrix[2][3] = 0.0f;
+ Context->Listener.Matrix[3][0] = 0.0f;
+ Context->Listener.Matrix[3][1] = 0.0f;
+ Context->Listener.Matrix[3][2] = 0.0f;
+ Context->Listener.Matrix[3][3] = 1.0f;
Context->UpdateSources = AL_TRUE;
UnlockContext(Context);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 11:41:04 +0000