adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the switch from positional -> not positional sfx actually work w/o having sfx channels permanently stuck somewhere in 3D world; there is no reason to use different distance models, and that eliminates the need to change models when switching positional <-> not

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3639 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-07-09 03:49:12 +00:00
parent 82a7cf0520
commit fda0c409e5
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/sound/openal/audiodrv_openal.c
+1 -4
View File
@@ -193,10 +193,7 @@ openAL_Init (audio_Driver *driver, sint32 flags)
return -1; return -1;
} }
if (optStereoSFX) alDistanceModel (AL_INVERSE_DISTANCE);
alDistanceModel (AL_INVERSE_DISTANCE);
else
alDistanceModel (AL_NONE);
(void) driver; // eat compiler warning (void) driver; // eat compiler warning
sc2/src/libs/sound/openal/audiodrv_openal.h
-1
View File
@@ -22,7 +22,6 @@
#include "config.h" #include "config.h"
#include "libs/sound/sound.h" #include "libs/sound/sound.h"
#include "options.h"
#include "endian_uqm.h" #include "endian_uqm.h"
#if defined (__APPLE__) #if defined (__APPLE__)
sc2/src/libs/sound/sfx.c
+2 -2
View File
@@ -29,6 +29,7 @@
static void CheckFinishedChannels (void); static void CheckFinishedChannels (void);
static const SoundPosition notPositional = {FALSE};
void void
PlayChannel (COUNT channel, SOUND snd, SoundPosition pos, PlayChannel (COUNT channel, SOUND snd, SoundPosition pos,
@@ -50,8 +51,7 @@ PlayChannel (COUNT channel, SOUND snd, SoundPosition pos,
soundSource[channel].sample = sample; soundSource[channel].sample = sample;
soundSource[channel].positional_object = positional_object; soundSource[channel].positional_object = positional_object;
if (optStereoSFX) UpdateSoundPosition (channel, optStereoSFX ? pos : notPositional);
UpdateSoundPosition (channel, pos);
audio_Sourcei (soundSource[channel].handle, audio_BUFFER, audio_Sourcei (soundSource[channel].handle, audio_BUFFER,
sample->buffer[0]); sample->buffer[0]);