LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pre-emptive fix for an attenuation distance issue in iOS' OpenAL implementation.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-16 00:10:11 -04:00
parent 606f077e5d
commit 813457aa71
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Source.cpp
+12 -2
View File
@@ -25,6 +25,7 @@
// STD // STD
#include <iostream> #include <iostream>
#include <float.h> #include <float.h>
#include <algorithm>
namespace love namespace love
{ {
@@ -33,6 +34,13 @@ namespace audio
namespace openal namespace openal
{ {
#ifdef LOVE_IOS
// OpenAL on iOS barfs if the max distance is +inf.
static const float MAX_ATTENUATION_DISTANCE = 1000000.0f;
#else
static const float MAX_ATTENUATION_DISTANCE = FLT_MAX;
#endif
class InvalidFormatException : public love::Exception class InvalidFormatException : public love::Exception
{ {
public: public:
@@ -81,7 +89,7 @@ Source::Source(Pool *pool, love::sound::SoundData *soundData)
, maxVolume(1.0f) , maxVolume(1.0f)
, referenceDistance(1.0f) , referenceDistance(1.0f)
, rolloffFactor(1.0f) , rolloffFactor(1.0f)
, maxDistance(FLT_MAX) , maxDistance(MAX_ATTENUATION_DISTANCE)
, cone() , cone()
, offsetSamples(0) , offsetSamples(0)
, offsetSeconds(0) , offsetSeconds(0)
@@ -120,7 +128,7 @@ Source::Source(Pool *pool, love::sound::Decoder *decoder)
, maxVolume(1.0f) , maxVolume(1.0f)
, referenceDistance(1.0f) , referenceDistance(1.0f)
, rolloffFactor(1.0f) , rolloffFactor(1.0f)
, maxDistance(FLT_MAX) , maxDistance(MAX_ATTENUATION_DISTANCE)
, cone() , cone()
, offsetSamples(0) , offsetSamples(0)
, offsetSeconds(0) , offsetSeconds(0)
@@ -872,6 +880,8 @@ void Source::setMaxDistance(float distance)
if (channels > 1) if (channels > 1)
throw SpatialSupportException(); throw SpatialSupportException();
distance = std::min(distance, MAX_ATTENUATION_DISTANCE);
if (valid) if (valid)
{ {
alSourcef(source, AL_MAX_DISTANCE, distance); alSourcef(source, AL_MAX_DISTANCE, distance);