diff options
-rw-r--r-- | Alc/ALc.c | 10 | ||||
-rw-r--r-- | Alc/ALu.c | 7 | ||||
-rw-r--r-- | OpenAL32/Include/alMain.h | 3 | ||||
-rw-r--r-- | OpenAL32/Include/alu.h | 3 |
4 files changed, 12 insertions, 11 deletions
@@ -393,12 +393,6 @@ enum LogLevel LogLevel = LogWarning; enum LogLevel LogLevel = LogError; #endif -// Cone scalar -ALdouble ConeScale = 0.5; - -// Localized Z scalar for mono sources -ALdouble ZScale = 1.0; - /* Flag to trap ALC device errors */ static ALCboolean TrapALCError = ALC_FALSE; @@ -496,11 +490,11 @@ static void alc_init(void) str = getenv("__ALSOFT_HALF_ANGLE_CONES"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, NULL, 0) == 1)) - ConeScale = 1.0; + ConeScale = 1.0f; str = getenv("__ALSOFT_REVERSE_Z"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, NULL, 0) == 1)) - ZScale = -1.0; + ZScale = -1.0f; str = getenv("__ALSOFT_TRAP_ERROR"); if(str && (strcasecmp(str, "true") == 0 || strtol(str, NULL, 0) == 1)) @@ -37,6 +37,13 @@ #include "bs2b.h" +/* Cone scalar */ +ALfloat ConeScale = 0.5f; + +/* Localized Z scalar for mono sources */ +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]; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index f23a6507..151391b4 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -788,9 +788,6 @@ extern enum LogLevel LogLevel; } while(0) -extern ALdouble ConeScale; -extern ALdouble ZScale; - extern ALint RTPrioLevel; #ifdef __cplusplus diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 2c20837b..a62ca1c5 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -185,6 +185,9 @@ ALvoid MixSource(struct ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size); ALvoid aluHandleDisconnect(ALCdevice *device); +extern ALfloat ConeScale; +extern ALfloat ZScale; + #ifdef __cplusplus } #endif |