Implement cone/falloff;

Author: bjornbytes

src/api/l_audio_source.c

@@ -242,25 +242,23 @@ static int l_lovrSourceSetCone(lua_State* L) {
 
 static int l_lovrSourceGetFalloff(lua_State* L) {
   Source* source = luax_checktype(L, 1, Source);
-  float innerDistance, outerDistance, outerVolume;
-  lovrSourceGetFalloff(source, &innerDistance, &outerDistance, &outerVolume);
+  float innerDistance, minVolume;
+  lovrSourceGetFalloff(source, &innerDistance, &minVolume);
   lua_pushnumber(L, innerDistance);
-  lua_pushnumber(L, outerDistance);
-  lua_pushnumber(L, outerVolume);
+  lua_pushnumber(L, minVolume);
   return 3;
 }
 
 static int l_lovrSourceSetFalloff(lua_State* L) {
   Source* source = luax_checktype(L, 1, Source);
   if (!lua_toboolean(L, 2)) {
-    lovrSourceSetFalloff(source, 0.f, 0.f, 1.f);
+    lovrSourceSetFalloff(source, 0.f, 1.f);
   } else if (lua_isboolean(L, 2)) {
-    lovrSourceSetFalloff(source, 0.f, FLT_MAX, 0.f);
+    lovrSourceSetFalloff(source, 0.f, 0.f);
   } else {
     float innerDistance = luax_checkfloat(L, 2);
-    float outerDistance = luax_checkfloat(L, 3);
-    float outerVolume = luax_optfloat(L, 4, 0.);
-    lovrSourceSetFalloff(source, innerDistance, outerDistance, outerVolume);
+    float minVolume = luax_optfloat(L, 3, 0.);
+    lovrSourceSetFalloff(source, innerDistance, minVolume);
   }
   return 0;
 }

src/modules/audio/audio.c

@@ -41,8 +41,7 @@ struct Source {
   float outerAngle;
   float outerAngleVolume;
   float innerDistance;
-  float outerDistance;
-  float outerDistanceVolume;
+  float minFalloffVolume;
   uint32_t occlusionRays;
   uint32_t transmissionRays;
   float reverb;
@@ -576,8 +575,7 @@ Source* lovrSourceClone(Source* source) {
   clone->outerAngle = source->outerAngle;
   clone->outerAngleVolume = source->outerAngleVolume;
   clone->innerDistance = source->innerDistance;
-  clone->outerDistance = source->outerDistance;
-  clone->outerDistanceVolume = source->outerDistanceVolume;
+  clone->minFalloffVolume = source->minFalloffVolume;
   clone->occlusionRays = source->occlusionRays;
   clone->transmissionRays = source->transmissionRays;
   clone->reverb = source->reverb;
@@ -764,16 +762,14 @@ void lovrSourceSetCone(Source* source, float innerAngle, float outerAngle, float
   source->outerAngleVolume = outerVolume;
 }
 
-void lovrSourceGetFalloff(Source* source, float* innerDistance, float* outerDistance, float* outerVolume) {
+void lovrSourceGetFalloff(Source* source, float* innerDistance, float* minVolume) {
   *innerDistance = source->innerDistance;
-  *outerDistance = source->outerDistance;
-  *outerVolume = source->outerDistanceVolume;
+  *minVolume = source->minFalloffVolume;
 }
 
-void lovrSourceSetFalloff(Source* source, float innerDistance, float outerDistance, float outerVolume) {
+void lovrSourceSetFalloff(Source* source, float innerDistance, float minVolume) {
   source->innerDistance = innerDistance;
-  source->outerDistance = outerDistance;
-  source->outerDistanceVolume = outerVolume;
+  source->minFalloffVolume = minVolume;
 }
 
 void lovrSourceGetOcclusion(Source* source, uint32_t* occlusionRays, uint32_t* transmissionRays) {
@@ -874,14 +870,32 @@ static void convertPose(float* position, float* orientation, IPLCoordinateSpace3
   vec3_init(&basis->origin.x, position);
 }
 
-static void applyAttenuation(IPLfloat32 distance, void* userdata) {
+static float applyAttenuation(IPLfloat32 distance, void* userdata) {
   Source* source = userdata;
-  return 1.f; // TODO
+  if (distance <= source->innerDistance) {
+    return 1.f;
+  } else {
+    return MAX(source->innerDistance / distance, source->minFalloffVolume);
+  }
 }
 
-static float applyDirectivity(IPLVector3 direction, void* userdata) {
+static float applyDirectivity(IPLVector3 sourceDirection, void* userdata) {
   Source* source = userdata;
-  return 1.f; // TODO
+
+  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));
+
+  if (angle < source->innerAngle) {
+    return 1.f;
+  } else if (angle >= source->outerAngle) {
+    return source->outerAngleVolume;
+  } else {
+    float t = (angle - source->innerAngle) / (source->outerAngle - source->innerAngle);
+    return source->outerAngleVolume + (1.f - source->outerAngleVolume) * t;
+  }
 }
 
 static void onSpatializerLog(IPLLogLevel iplLevel, const char* message) {
@@ -1048,9 +1062,9 @@ static void phonon_update(float dt) {
     vec3_sub(vec3_init(&source->relativeDirection[backbuffer].x, source->position), state.position);
 
     source->inputs.directFlags = 0;
-    if (source->outerDistanceVolume < 1.f) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_AIRABSORPTION;
     if (vec3_dot(source->absorption, source->absorption) > 1e-5) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_AIRABSORPTION;
     if (source->innerAngle < (float) M_PI) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_DIRECTIVITY;
+    if (source->minFalloffVolume < 1.f) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_DISTANCEATTENUATION;
     if (source->occlusionRays > 0) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_OCCLUSION;
     if (source->occlusionRays > 0 && source->transmissionRays > 0) source->inputs.directFlags |= IPL_DIRECTSIMULATIONFLAGS_TRANSMISSION;
 
@@ -1213,7 +1227,7 @@ static bool phonon_mix_source(Source* source, float* _src, float* dst, float* _t
 
   // Direct effects, applied in-place
   IPLDirectEffectParams* directParams = &source->outputs[index].direct;
-  if (directParams.flags) {
+  if (directParams->flags) {
     tail |= !iplDirectEffectApply(source->directEffect, directParams, &src, &src);
   }
 

src/modules/audio/audio.h

@@ -124,8 +124,8 @@ void lovrSourceGetAbsorption(Source* source, float absorption[3]);
 void lovrSourceSetAbsorption(Source* source, float absorption[3]);
 void lovrSourceGetCone(Source* source, float* innerAngle, float* outerAngle, float* outerVolume);
 void lovrSourceSetCone(Source* source, float innerAngle, float outerAngle, float outerVolume);
-void lovrSourceGetFalloff(Source* source, float* innerDistance, float* outerDistance, float* outerVolume);
-void lovrSourceSetFalloff(Source* source, float innerDistance, float outerDistance, float outerVolume);
+void lovrSourceGetFalloff(Source* source, float* innerDistance, float* minVolume);
+void lovrSourceSetFalloff(Source* source, float innerDistance, float minVolume);
 void lovrSourceGetOcclusion(Source* source, uint32_t* occlusionRays, uint32_t* transmissionRays);
 void lovrSourceSetOcclusion(Source* source, uint32_t occlusionRays, uint32_t transmissionRays);
 void lovrSourceGetReverb(Source* source, float* reverb, ReverbMode* mode);