diff options
| -rw-r--r-- | Alc/ALu.c | 8 | ||||
| -rw-r--r-- | OpenAL32/Include/alSource.h | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alSource.c | 8 |
4 files changed, 10 insertions, 10 deletions
@@ -1074,7 +1074,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop { /* If the slot's auxiliary send auto is off, the data sent to the * effect slot is the same as the dry path, sans filter effects */ - RoomRolloff[i] = props->RollOffFactor; + RoomRolloff[i] = props->RolloffFactor; DecayDistance[i] = 0.0f; RoomAirAbsorption[i] = AIRABSORBGAINHF; } @@ -1133,7 +1133,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop case InverseDistance: if(props->RefDistance > 0.0f) { - ALfloat dist = lerp(props->RefDistance, ClampedDist, props->RollOffFactor); + ALfloat dist = lerp(props->RefDistance, ClampedDist, props->RolloffFactor); if(dist > 0.0f) Attenuation = props->RefDistance / dist; for(i = 0;i < NumSends;i++) { @@ -1151,7 +1151,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop case LinearDistance: if(props->MaxDistance != props->RefDistance) { - Attenuation = props->RollOffFactor * (ClampedDist-props->RefDistance) / + Attenuation = props->RolloffFactor * (ClampedDist-props->RefDistance) / (props->MaxDistance-props->RefDistance); Attenuation = maxf(1.0f - Attenuation, 0.0f); for(i = 0;i < NumSends;i++) @@ -1171,7 +1171,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop case ExponentDistance: if(ClampedDist > 0.0f && props->RefDistance > 0.0f) { - Attenuation = powf(ClampedDist/props->RefDistance, -props->RollOffFactor); + Attenuation = powf(ClampedDist/props->RefDistance, -props->RolloffFactor); for(i = 0;i < NumSends;i++) RoomAttenuation[i] = powf(ClampedDist/props->RefDistance, -RoomRolloff[i]); } diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 7d2ff59a..03034ce8 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -35,7 +35,7 @@ typedef struct ALsource { ALfloat OuterAngle; ALfloat RefDistance; ALfloat MaxDistance; - ALfloat RollOffFactor; + ALfloat RolloffFactor; ALfloat Position[3]; ALfloat Velocity[3]; ALfloat Direction[3]; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 5cd233b9..8e2fe1e9 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -186,7 +186,7 @@ struct ALvoiceProps { ALfloat OuterAngle; ALfloat RefDistance; ALfloat MaxDistance; - ALfloat RollOffFactor; + ALfloat RolloffFactor; ALfloat Position[3]; ALfloat Velocity[3]; ALfloat Direction[3]; diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 6030bd3c..46f23a75 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -504,7 +504,7 @@ static ALboolean SetSourcefv(ALsource *Source, ALCcontext *Context, SourceProp p case AL_ROLLOFF_FACTOR: CHECKVAL(*values >= 0.0f); - Source->RollOffFactor = *values; + Source->RolloffFactor = *values; DO_UPDATEPROPS(); return AL_TRUE; @@ -1143,7 +1143,7 @@ static ALboolean GetSourcedv(ALsource *Source, ALCcontext *Context, SourceProp p return AL_TRUE; case AL_ROLLOFF_FACTOR: - *values = Source->RollOffFactor; + *values = Source->RolloffFactor; return AL_TRUE; case AL_REFERENCE_DISTANCE: @@ -2988,7 +2988,7 @@ static void InitSourceParams(ALsource *Source, ALsizei num_sends) Source->Orientation[1][2] = 0.0f; Source->RefDistance = 1.0f; Source->MaxDistance = FLT_MAX; - Source->RollOffFactor = 1.0f; + Source->RolloffFactor = 1.0f; Source->Gain = 1.0f; Source->MinGain = 0.0f; Source->MaxGain = 1.0f; @@ -3099,7 +3099,7 @@ static void UpdateSourceProps(ALsource *source, ALvoice *voice, ALsizei num_send props->OuterAngle = source->OuterAngle; props->RefDistance = source->RefDistance; props->MaxDistance = source->MaxDistance; - props->RollOffFactor = source->RollOffFactor; + props->RolloffFactor = source->RolloffFactor; for(i = 0;i < 3;i++) props->Position[i] = source->Position[i]; for(i = 0;i < 3;i++) |