Effect fixes;

Author: bjornbytes

src/api/l_audio_source.c

@@ -229,8 +229,10 @@ static int l_lovrSourceGetCone(lua_State* L) {
 
 static int l_lovrSourceSetCone(lua_State* L) {
   Source* source = luax_checktype(L, 1, Source);
-  if (lua_isnoneornil(L, 2)) {
+  if (!lua_toboolean(L, 2)) {
     lovrSourceSetCone(source, 2.f * (float) M_PI, 2.f * (float) M_PI, 0.f);
+  } else if (lua_isboolean(L, 2)) {
+    lovrSourceSetCone(source, 0.f, (float) M_PI, 0.f);
   } else {
     float innerAngle = luax_checkfloat(L, 2);
     float outerAngle = luax_checkfloat(L, 3);
@@ -298,9 +300,15 @@ static int l_lovrSourceGetReverb(lua_State* L) {
 
 static int l_lovrSourceSetReverb(lua_State* L) {
   Source* source = luax_checktype(L, 1, Source);
-  float reverb = luax_optfloat(L, 2, 0.f);
-  ReverbMode mode = luax_checkenum(L, 3, ReverbMode, "listener");
-  lovrSourceSetReverb(source, reverb, mode);
+  if (!lua_toboolean(L, 2)) {
+    lovrSourceSetReverb(source, 0.f, REVERB_LISTENER);
+  } else if (lua_isboolean(L, 2)) {
+    lovrSourceSetReverb(source, 1.f, REVERB_LISTENER);
+  } else {
+    float reverb = luax_optfloat(L, 2, 0.f);
+    ReverbMode mode = luax_checkenum(L, 3, ReverbMode, "listener");
+    lovrSourceSetReverb(source, reverb, mode);
+  }
   return 0;
 }
 

src/modules/audio/audio.c

@@ -875,26 +875,26 @@ static float applyAttenuation(IPLfloat32 distance, void* userdata) {
   if (distance <= source->innerDistance) {
     return 1.f;
   } else {
-    return MAX(source->innerDistance / distance, source->minFalloffVolume);
+    return MAX(1.f / (1.f + MAX(distance - source->innerDistance, 0.f)), source->minFalloffVolume);
   }
 }
 
-static float applyDirectivity(IPLVector3 sourceDirection, void* userdata) {
+static float applyDirectivity(IPLVector3 sourceToListener, void* userdata) {
   Source* source = userdata;
 
-  float listenerDirection[3];
-  vec3_init(listenerDirection, &state.listenerBasis[state.backbuffer].origin.x);
-  vec3_sub(listenerDirection, source->position);
-  vec3_normalize(listenerDirection);
-  float angle = acosf(vec3_dot(&sourceDirection.x, listenerDirection));
+  float sourceDirection[3];
+  quat_getDirection(source->orientation, sourceDirection);
+  float angle = vec3_angle(sourceDirection, &sourceToListener.x);
 
   if (angle < source->innerAngle) {
     return 1.f;
   } else if (angle >= source->outerAngle) {
     return source->outerAngleVolume;
-  } else {
+  } else if (source->innerAngle < source->outerAngle) {
     float t = (angle - source->innerAngle) / (source->outerAngle - source->innerAngle);
-    return source->outerAngleVolume + (1.f - source->outerAngleVolume) * t;
+    return 1.f - (1.f - source->outerAngleVolume) * t;
+  } else {
+    return angle < source->innerAngle ? 1.f : source->outerAngleVolume;
   }
 }
 
@@ -1059,7 +1059,11 @@ static void phonon_update(float dt) {
 
   FOREACH_SOURCE(mask, source) {
     convertPose(source->position, source->orientation, &source->inputs.source);
+
+    float inverseListenerOrientation[4];
+    quat_conjugate(quat_init(inverseListenerOrientation, state.orientation));
     vec3_sub(vec3_init(&source->relativeDirection[backbuffer].x, source->position), state.position);
+    quat_rotate(inverseListenerOrientation, &source->relativeDirection[backbuffer].x);
 
     source->inputs.directFlags = 0;
     if (vec3_dot(source->absorption, source->absorption) > 1e-5) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_AIRABSORPTION;