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

Remove doppler effect;

This commit is contained in:
bjorn 2017-06-18 16:20:21 -07:00
parent 52b203240d
commit 18fa9f7d76
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/audio.c
View File

@ -23,14 +23,6 @@ int l_lovrAudioUpdate(lua_State* L) {
return 0;
}
int l_lovrAudioGetDopplerEffect(lua_State* L) {
float factor, speedOfSound;
lovrAudioGetDopplerEffect(&factor, &speedOfSound);
lua_pushnumber(L, factor);
lua_pushnumber(L, speedOfSound);
return 2;
}
int l_lovrAudioGetOrientation(lua_State* L) {
float angle, ax, ay, az;
lovrAudioGetOrientation(&angle, &ax, &ay, &az);
@ -94,13 +86,6 @@ int l_lovrAudioRewind(lua_State* L) {
return 0;
}
int l_lovrAudioSetDopplerEffect(lua_State* L) {
float factor = luaL_checknumber(L, 1);
float speedOfSound = luaL_checknumber(L, 2);
lovrAudioSetDopplerEffect(factor, speedOfSound);
return 0;
}
int l_lovrAudioSetOrientation(lua_State* L) {
float angle = luaL_checknumber(L, 1);
float ax = luaL_checknumber(L, 2);
@ -139,7 +124,6 @@ int l_lovrAudioStop(lua_State* L) {
const luaL_Reg lovrAudio[] = {
{ "update", l_lovrAudioUpdate },
{ "getDopplerEffect", l_lovrAudioGetDopplerEffect },
{ "getOrientation", l_lovrAudioGetOrientation },
{ "getPosition", l_lovrAudioGetPosition },
{ "getVelocity", l_lovrAudioGetVelocity },
@ -149,7 +133,6 @@ const luaL_Reg lovrAudio[] = {
{ "pause", l_lovrAudioPause },
{ "resume", l_lovrAudioResume },
{ "rewind", l_lovrAudioRewind },
{ "setDopplerEffect", l_lovrAudioSetDopplerEffect },
{ "setOrientation", l_lovrAudioSetOrientation },
{ "setPosition", l_lovrAudioSetPosition },
{ "setVelocity", l_lovrAudioSetVelocity },

16
src/audio/audio.c
View File

@ -75,15 +75,6 @@ void lovrAudioAdd(Source* source) {
}
}
void lovrAudioGetDopplerEffect(float* factor, float* speedOfSound) {
#ifdef LOVR_WEB
*factor = *speedOfSound = 0;
#else
alGetFloatv(AL_DOPPLER_FACTOR, factor);
alGetFloatv(AL_SPEED_OF_SOUND, speedOfSound);
#endif
}
void lovrAudioGetOrientation(float* angle, float* ax, float* ay, float* az) {
quat_getAngleAxis(state.orientation, angle, ax, ay, az);
}
@ -137,13 +128,6 @@ void lovrAudioRewind() {
}
}
void lovrAudioSetDopplerEffect(float scale, float speedOfSound) {
#ifndef LOVR_WEB
alDopplerFactor(scale);
alSpeedOfSound(speedOfSound);
#endif
}
void lovrAudioSetOrientation(float angle, float ax, float ay, float az) {
// Rotate the unit forward/up vectors by the quaternion derived from the specified angle/axis

2
src/audio/audio.h
View File

@ -22,7 +22,6 @@ void lovrAudioInit();
void lovrAudioDestroy();
void lovrAudioUpdate();
void lovrAudioAdd(Source* source);
void lovrAudioGetDopplerEffect(float* factor, float* speedOfSound);
void lovrAudioGetOrientation(float* angle, float* ax, float* ay, float* az);
void lovrAudioGetPosition(float* x, float* y, float* z);
void lovrAudioGetVelocity(float* x, float* y, float* z);
@ -32,7 +31,6 @@ int lovrAudioIsSpatialized();
void lovrAudioPause();
void lovrAudioResume();
void lovrAudioRewind();
void lovrAudioSetDopplerEffect(float factor, float speedOfSound);
void lovrAudioSetOrientation(float angle, float ax, float ay, float az);
void lovrAudioSetPosition(float x, float y, float z);
void lovrAudioSetVelocity(float x, float y, float z);