aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2008-07-03 03:13:43 -0700
committerChris Robinson <[email protected]>2008-07-03 03:13:43 -0700
commit3a09e446b3b298c0da638f46a7b72ad246044a18 (patch)
treef0a08ecdc7369376f00b95860c8deecbb441292f /Alc
parent2d0b12e49ee7023a51da855f0878290ab3e7e9ad (diff)
Leave SourceToListener untransformed for use with untransformed velocities
Distance is also left untransformed so cone calculations with SoundToListener are correct
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALu.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 7b9363c3..8ef39cfa 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -273,6 +273,10 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource,
if(isMono != AL_FALSE)
{
//1. Translate Listener to origin (convert to head relative)
+ // Note that Direction and SourceToListener are *not* transformed.
+ // SourceToListener is used with the source and listener velocities,
+ // which are untransformed, and Direction is used with SourceToListener
+ // for the sound cone
if(ALSource->bHeadRelative==AL_FALSE)
{
// Build transform matrix
@@ -290,10 +294,21 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource,
Position[0] -= ALContext->Listener.Position[0];
Position[1] -= ALContext->Listener.Position[1];
Position[2] -= ALContext->Listener.Position[2];
+
+ SourceToListener[0] = -Position[0];
+ SourceToListener[1] = -Position[1];
+ SourceToListener[2] = -Position[2];
+
// Transform source position and direction into listener space
aluMatrixVector(Position, Matrix);
- aluMatrixVector(Direction, Matrix);
}
+ else
+ {
+ SourceToListener[0] = -Position[0];
+ SourceToListener[1] = -Position[1];
+ SourceToListener[2] = -Position[2];
+ }
+ aluNormalize(SourceToListener);
aluNormalize(Direction);
//2. Calculate distance attenuation
@@ -372,11 +387,6 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource,
WetMix = __max(WetMix,MinVolume);
//3. Apply directional soundcones
- SourceToListener[0] = -Position[0];
- SourceToListener[1] = -Position[1];
- SourceToListener[2] = -Position[2];
- aluNormalize(SourceToListener);
-
Angle = aluAcos(aluDotproduct(Direction,SourceToListener)) * 180.0f /
3.141592654f;
if(Angle >= InnerAngle && Angle <= OuterAngle)