LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 07:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 2 by Bloutiouf: Sound attenuation by distanceSound

Browse Source 
attenuation by distance.

Adds:
love.audio.[gs]etDistanceModel(model-identifier)
Source:[gs]etMinVolume(min-volume)
Source:[gs]etMaxVolume(max-volume)
Source:[gs]etDistance(reference, max)
Source:[gs]etRolloffFactor(rolloff)

Valid Distance models:
"none", "inverse", "inverse clamped", "linear", "linear clamped", "exponent",
"exponent clamped"

Suggestion:
Merge Source:setMinVolume, Source:setMinVolume and Source:setVolume. May be
confusing for lovers though.

May have broken platform/msvc2010/love.vcxproj.filters (had to be modified by
hand without really knowing what I am doing).
This commit is contained in:
vrld
2011-12-29 22:45:51 +01:00
parent 6178aea6ef 36a93e46c7
commit 3b01da803e
17 changed files with 482 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/wrap_Source.cpp
+70 -1
View File
@@ -211,11 +211,70 @@ namespace audio
int w_Source_isStatic(lua_State * L)
{
Source * t= luax_checksource(L, 1);
Source * t = luax_checksource(L, 1);
luax_pushboolean(L, t->isStatic());
return 1;
}
int w_Source_setMinVolume(lua_State * L)
{
Source * t = luax_checksource(L, 1);
t->setMinVolume((float)luaL_checknumber(L, 2));
return 0;
}
int w_Source_getMinVolume(lua_State * L)
{
Source * t = luax_checksource(L, 1);
lua_pushnumber(L, t->getMinVolume());
return 1;
}
int w_Source_setMaxVolume(lua_State * L)
{
Source * t = luax_checksource(L, 1);
t->setMaxVolume((float)luaL_checknumber(L, 2));
return 0;
}
int w_Source_getMaxVolume(lua_State * L)
{
Source * t = luax_checksource(L, 1);
lua_pushnumber(L, t->getMaxVolume());
return 1;
}
int w_Source_setDistance(lua_State * L)
{
Source * t = luax_checksource(L, 1);
t->setReferenceDistance((float)luaL_checknumber(L, 2));
if (!lua_isnoneornil(L, 3)) // lua_isnoneornil instead of lua_isnumber to throw an error
t->setMaxDistance((float)luaL_checknumber(L, 3)); // in case of invalid argument type
return 0;
}
int w_Source_getDistance(lua_State * L)
{
Source * t = luax_checksource(L, 1);
lua_pushnumber(L, t->getReferenceDistance());
lua_pushnumber(L, t->getMaxDistance());
return 2;
}
int w_Source_setRolloffFactor(lua_State * L)
{
Source * t = luax_checksource(L, 1);
t->setRolloffFactor((float)luaL_checknumber(L, 2));
return 0;
}
int w_Source_getRolloffFactor(lua_State * L)
{
Source * t = luax_checksource(L, 1);
lua_pushnumber(L, t->getRolloffFactor());
return 1;
}
static const luaL_Reg functions[] = {
{ "play", w_Source_play },
{ "stop", w_Source_stop },
@@ -241,6 +300,16 @@ namespace audio
{ "isStopped", w_Source_isStopped },
{ "isPaused", w_Source_isPaused },
{ "isStatic", w_Source_isStatic },
{ "setMinVolume", w_Source_setMinVolume },
{ "getMinVolume", w_Source_getMinVolume },
{ "setMaxVolume", w_Source_setMaxVolume },
{ "getMaxVolume", w_Source_getMaxVolume },
{ "setDistance", w_Source_setDistance },
{ "getDistance", w_Source_setDistance },
{ "setRolloffFactor", w_Source_setRolloffFactor },
{ "getRolloffFactor", w_Source_getRolloffFactor },
{ 0, 0 }
};