lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm spatial blend for now;

This commit is contained in:
bjorn 2021-02-26 13:24:01 -07:00
parent cb1b78f2cc
commit 92492dcef1
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/l_audio_source.c
View File

@ -95,20 +95,6 @@ static int l_lovrSourceIsSpatial(lua_State* L) {
return 1;
}
static int l_lovrSourceGetSpatialBlend(lua_State* L) {
Source* source = luax_checktype(L, 1, Source);
float blend = lovrSourceGetSpatialBlend(source);
lua_pushnumber(L, blend);
return 1;
}
static int l_lovrSourceSetSpatialBlend(lua_State* L) {
Source* source = luax_checktype(L, 1, Source);
float blend = luax_checkfloat(L, 2);
lovrSourceSetSpatialBlend(source, blend);
return 0;
}
static int l_lovrSourceGetInterpolation(lua_State* L) {
Source* source = luax_checktype(L, 1, Source);
SourceInterpolation interpolation = lovrSourceGetInterpolation(source);
@ -303,8 +289,6 @@ const luaL_Reg lovrSource[] = {
{ "tell", l_lovrSourceTell },
{ "getDuration", l_lovrSourceGetDuration },
{ "isSpatial", l_lovrSourceIsSpatial },
{ "getSpatialBlend", l_lovrSourceGetSpatialBlend },
{ "setSpatialBlend", l_lovrSourceSetSpatialBlend },
{ "getInterpolation", l_lovrSourceGetInterpolation },
{ "setInterpolation", l_lovrSourceSetInterpolation },
{ "getPosition", l_lovrSourceGetPosition },

8
src/modules/audio/audio.c
View File

@ -483,14 +483,6 @@ bool lovrSourceIsSpatial(Source *source) {
return source->spatial;
}
float lovrSourceGetSpatialBlend(Source* source) {
return source->blend;
}
void lovrSourceSetSpatialBlend(Source* source, float blend) {
source->blend = blend;
}
SourceInterpolation lovrSourceGetInterpolation(Source* source) {
return source->bilinear ? SOURCE_BILINEAR : SOURCE_NEAREST;
}

2
src/modules/audio/audio.h
View File

@ -60,8 +60,6 @@ void lovrSourceSeek(Source* source, double time, TimeUnit units);
double lovrSourceTell(Source* source, TimeUnit units);
double lovrSourceGetDuration(Source* source, TimeUnit units);
bool lovrSourceIsSpatial(Source* source);
float lovrSourceGetSpatialBlend(Source* source);
void lovrSourceSetSpatialBlend(Source* source, float blend);
SourceInterpolation lovrSourceGetInterpolation(Source* source);
void lovrSourceSetInterpolation(Source* source, SourceInterpolation interpolation);
void lovrSourceGetPose(Source* source, float position[4], float orientation[4]);

2
src/modules/audio/spatializer_phonon.c
View File

@ -249,7 +249,7 @@ uint32_t phonon_apply(Source* source, const float* input, float* output, uint32_
phonon_iplApplyDirectSoundEffect(state.directSoundEffect[index], in, path, options, tmp);
float blend = lovrSourceGetSpatialBlend(source);
float blend = 1.f;
IPLHrtfInterpolation interpolation = lovrSourceGetInterpolation(source) == SOURCE_BILINEAR ? IPL_HRTFINTERPOLATION_BILINEAR : IPL_HRTFINTERPOLATION_NEAREST;
phonon_iplApplyBinauralEffect(state.binauralEffect[index], state.binauralRenderer, tmp, path.direction, interpolation, blend, out);