Fix bugs in filter node implementations

SirBob01 · May 17, 2023 · 23e01b8 · 23e01b8
1 parent 8580edc
commit 23e01b8
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 31 deletions.
diff --git a/src/Dynamo.hpp b/src/Dynamo.hpp
@@ -14,14 +14,14 @@
 #include "Sound/Chunk.hpp"
 #include "Sound/Convolver.hpp"
 #include "Sound/Device.hpp"
-#include "Sound/Filters/Attenuation.hpp"
-#include "Sound/Filters/Binaural.hpp"
-#include "Sound/Filters/Filter.hpp"
-#include "Sound/Filters/Stereo.hpp"
+#include "Sound/EffectNode.hpp"
+#include "Sound/Filters/AttenuationEffect.hpp"
+#include "Sound/Filters/BinauralEffect.hpp"
+#include "Sound/Filters/GainEffect.hpp"
+#include "Sound/Filters/StereoEffect.hpp"
 #include "Sound/HRTF.hpp"
 #include "Sound/Jukebox.hpp"
 #include "Sound/Listener.hpp"
-#include "Sound/Material.hpp"
 #include "Sound/Resample.hpp"
 #include "Sound/Sound.hpp"
 

diff --git a/src/Sound/EffectNode.cpp b/src/Sound/EffectNode.cpp
@@ -46,5 +46,6 @@ namespace Dynamo::Sound {
                            u32 length,
                            ListenerSet &listeners) {
         // TODO: Implement
+        return process(src, offset, length, listeners);
     }
 } // namespace Dynamo::Sound
diff --git a/src/Sound/EffectNode.hpp b/src/Sound/EffectNode.hpp
@@ -29,7 +29,7 @@ namespace Dynamo::Sound {
          * @brief Destroy the EffectNode object.
          *
          */
-        virtual ~EffectNode() = 0;
+        virtual ~EffectNode() = default;
 
         /**
          * @brief Connect an outgoing EffectNode.

diff --git a/src/Sound/Filters/AttenuationEffect.cpp b/src/Sound/Filters/AttenuationEffect.cpp
@@ -18,8 +18,8 @@ namespace Dynamo::Sound {
                                       u32 offset,
                                       u32 length,
                                       ListenerSet &listeners) {
-        ListenerProperties &listener = listeners.find_closest(_position);
-        f32 distance = (_position - listener.position).length();
+        ListenerProperties &listener = listeners.find_closest(position);
+        f32 distance = (position - listener.position).length();
         f32 gain = linear(distance);
 
         _output.resize(length, src.channels());

diff --git a/src/Sound/Filters/AttenuationEffect.hpp b/src/Sound/Filters/AttenuationEffect.hpp
@@ -15,8 +15,6 @@ namespace Dynamo::Sound {
         f32 _inner_radius;
         f32 _cutoff_radius;
 
-        Vec3 _position;
-
         /**
          * @brief Linear attenuation function.
          *
@@ -26,6 +24,12 @@ namespace Dynamo::Sound {
         f32 linear(f32 distance);
 
       public:
+        /**
+         * @brief Position of the sound source.
+         *
+         */
+        Vec3 position;
+
         /**
          * @brief Construct a new AttenuationEffect object.
          *
@@ -34,8 +38,6 @@ namespace Dynamo::Sound {
          */
         AttenuationEffect(f32 inner_radius, f32 cutoff_radius);
 
-        inline void set_position(Vec3 position) { _position = position; }
-
         Sound &process(Sound &src,
                        u32 offset,
                        u32 length,

diff --git a/src/Sound/Filters/BinauralEffect.cpp b/src/Sound/Filters/BinauralEffect.cpp
@@ -10,10 +10,10 @@ namespace Dynamo::Sound {
                                    u32 offset,
                                    u32 length,
                                    ListenerSet &listeners) {
-        ListenerProperties &listener = listeners.find_closest(_position);
+        ListenerProperties &listener = listeners.find_closest(position);
         _hrtf.get().calculate_HRIR(listener.position,
                                    listener.rotation,
-                                   _position,
+                                   position,
                                    _impulse_response);
         _output.set_frames(length);
         for (i32 c = 0; c < 2; c++) {

diff --git a/src/Sound/Filters/BinauralEffect.hpp b/src/Sound/Filters/BinauralEffect.hpp
@@ -15,7 +15,6 @@ namespace Dynamo::Sound {
     class BinauralEffect : public EffectNode {
         std::reference_wrapper<HRTF> _hrtf;
         std::array<Convolver, 2> _convolvers;
-        Vec3 _position;
 
         Sound _impulse_response;
         Sound _output;
@@ -30,18 +29,17 @@ namespace Dynamo::Sound {
 
       public:
         /**
-         * @brief Construct a new BinauralEffect object.
+         * @brief Position of the sound source.
          *
-         * @param hrtf HRTF interpolator
          */
-        BinauralEffect(HRTF &hrtf);
+        Vec3 position;
 
         /**
-         * @brief Set the position of the sound source.
+         * @brief Construct a new BinauralEffect object.
          *
-         * @param position
+         * @param hrtf HRTF interpolator
          */
-        inline void set_position(Vec3 position) { _position = position; }
+        BinauralEffect(HRTF &hrtf);
 
         Sound &process(Sound &src,
                        u32 offset,

diff --git a/src/Sound/Filters/GainEffect.cpp b/src/Sound/Filters/GainEffect.cpp
@@ -5,6 +5,7 @@ namespace Dynamo::Sound {
                                u32 offset,
                                u32 length,
                                ListenerSet &listeners) {
+        _output.resize(length, src.channels());
         for (u32 c = 0; c < src.channels(); c++) {
             for (u32 f = 0; f < length; f++) {
                 _output[c][f] = src[c][f + offset] * _gain;

diff --git a/src/Sound/Filters/GainEffect.hpp b/src/Sound/Filters/GainEffect.hpp
@@ -14,9 +14,9 @@ namespace Dynamo::Sound {
 
       public:
         /**
-         * @brief Set the position of the sound source.
+         * @brief Set the gain multiplier.
          *
-         * @param position
+         * @param gain
          */
         inline void set_gain(f32 gain) { _gain = gain; }
 

diff --git a/src/Sound/Filters/StereoEffect.cpp b/src/Sound/Filters/StereoEffect.cpp
@@ -5,8 +5,8 @@ namespace Dynamo::Sound {
                                  u32 offset,
                                  u32 length,
                                  ListenerSet &listeners) {
-        ListenerProperties &listener = listeners.find_closest(_position);
-        Vec3 delta = _position - listener.position;
+        ListenerProperties &listener = listeners.find_closest(position);
+        Vec3 delta = position - listener.position;
         Vec3 up = listener.rotation.up();
         Vec3 right = listener.rotation.right();
         Vec3 displacement = (delta - up * (delta * up));

diff --git a/src/Sound/Filters/StereoEffect.hpp b/src/Sound/Filters/StereoEffect.hpp
@@ -11,7 +11,6 @@ namespace Dynamo::Sound {
      *
      */
     class StereoEffect : public EffectNode {
-        Vec3 _position;
         Sound _output;
 
         /**
@@ -24,11 +23,10 @@ namespace Dynamo::Sound {
 
       public:
         /**
-         * @brief Set the position of the sound source.
+         * @brief Position of the sound source.
          *
-         * @param position
          */
-        inline void set_position(Vec3 position) { _position = position; }
+        Vec3 position;
 
         Sound &process(Sound &src,
                        u32 offset,

diff --git a/src/Sound/Jukebox.cpp b/src/Sound/Jukebox.cpp
@@ -117,8 +117,7 @@ namespace Dynamo::Sound {
         }
 
         // Apply the effects graph
-        transformed =
-            effect.process(transformed, 0, transformed.frames(), _listeners);
+        transformed = effect.run(transformed, 0, frames, _listeners);
 
         // Mix the filtered sound onto the composite signal
         for (u32 f = 0; f < transformed.frames(); f++) {