Refactor tween extensions to remove closures

Author: adamgraham

Runtime/Delegates.cs

@@ -1,18 +1,24 @@
 namespace Zigurous.Tweening
 {
     /// <summary>
-    /// A function delegate that gets the current value of a parameter.
+    /// A function delegate that gets the current value of a parameter from a
+    /// source object.
     /// </summary>
+    /// <typeparam name="S">The type of the source object.</typeparam>
     /// <typeparam name="T">The type of the parameter.</typeparam>
+    /// <param name="source">The source object to get the value from.</param>
     /// <returns>The current value of the parameter.</returns>
-    public delegate T TweenGetter<T>();
+    public delegate T TweenGetter<S,T>(S source);
 
     /// <summary>
-    /// A function delegate that sets a new value of a parameter.
+    /// A function delegate that sets a new value of a parameter on a source
+    /// object.
     /// </summary>
+    /// <typeparam name="S">The type of the source object.</typeparam>
     /// <typeparam name="T">The type of the parameter.</typeparam>
+    /// <param name="source">The source object to set the value on.</param>
     /// <param name="value">The new value of the parameter.</param>
-    public delegate void TweenSetter<T>(T value);
+    public delegate void TweenSetter<S,T>(S source, T value);
 
     /// <summary>
     /// A function delegate that can be invoked during various tween events
@@ -31,5 +37,4 @@
     /// <param name="snapping">Snaps the interpolated value to the nearest whole number.</param>
     /// <returns>The interpolated value between the start and end value.</returns>
     public delegate T Interpolater<T>(T a, T b, float t, bool snapping);
-
 }

Runtime/Extensions/Audio/AudioChorusFilterTweens.cs

@@ -5,40 +5,32 @@ namespace Zigurous.Tweening
     public static class AudioChorusFilterTweens
     {
         public static Tween TweenDelay(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.delay,
-                        setter: delay => filter.delay = delay,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.delay, (source, value) => source.delay = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenRate(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.rate,
-                        setter: rate => filter.rate = rate,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.rate, (source, value) => source.rate = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDepth(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.depth,
-                        setter: depth => filter.depth = depth,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.depth, (source, value) => source.depth = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDryMix(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.dryMix,
-                        setter: dryMix => filter.dryMix = dryMix,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.dryMix, (source, value) => source.dryMix = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenWetMix1(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.wetMix1,
-                        setter: wetMix1 => filter.wetMix1 = wetMix1,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.wetMix1, (source, value) => source.wetMix1 = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenWetMix2(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.wetMix2,
-                        setter: wetMix2 => filter.wetMix2 = wetMix2,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.wetMix2, (source, value) => source.wetMix2 = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenWetMix3(this AudioChorusFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.wetMix3,
-                        setter: wetMix3 => filter.wetMix3 = wetMix3,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.wetMix3, (source, value) => source.wetMix3 = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }

Runtime/Extensions/Audio/AudioDistortionFilterTweens.cs

@@ -5,10 +5,8 @@ namespace Zigurous.Tweening
     public static class AudioDistortionFilterTweens
     {
         public static Tween TweenDistortionLevel(this AudioDistortionFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.distortionLevel,
-                        setter: distortionLevel => filter.distortionLevel = distortionLevel,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.distortionLevel, (source, value) => source.distortionLevel = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }

Runtime/Extensions/Audio/AudioEchoFilterTweens.cs

@@ -5,25 +5,20 @@ namespace Zigurous.Tweening
     public static class AudioEchoFilterTweens
     {
         public static Tween TweenDelay(this AudioEchoFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.delay,
-                        setter: delay => filter.delay = delay,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.delay, (source, value) => source.delay = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDecayRatio(this AudioEchoFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.decayRatio,
-                        setter: decayRatio => filter.decayRatio = decayRatio,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.decayRatio, (source, value) => source.decayRatio = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDryMix(this AudioEchoFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.dryMix,
-                        setter: dryMix => filter.dryMix = dryMix,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.dryMix, (source, value) => source.dryMix = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenWetMix(this AudioEchoFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.wetMix,
-                        setter: wetMix => filter.wetMix = wetMix,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.wetMix, (source, value) => source.wetMix = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }

Runtime/Extensions/Audio/AudioHighPassFilterTweens.cs

@@ -5,15 +5,12 @@ namespace Zigurous.Tweening
     public static class AudioHighPassFilterTweens
     {
         public static Tween TweenCutoffFrequency(this AudioHighPassFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.cutoffFrequency,
-                        setter: cutoffFrequency => filter.cutoffFrequency = cutoffFrequency,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.cutoffFrequency, (source, value) => source.cutoffFrequency = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenHighpassResonanceQ(this AudioHighPassFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.highpassResonanceQ,
-                        setter: highpassResonanceQ => filter.highpassResonanceQ = highpassResonanceQ,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.highpassResonanceQ, (source, value) => source.highpassResonanceQ = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }

Runtime/Extensions/Audio/AudioListenerTweens.cs

@@ -5,10 +5,8 @@ namespace Zigurous.Tweening
     public static class AudioListenerTweens
     {
         public static Tween TweenVolume(this AudioListener listener, float to, float duration) =>
-            Tweening.To(getter: () => AudioListener.volume,
-                        setter: volume => AudioListener.volume = volume,
-                        to, duration).SetTarget(listener);
-
+            Tweening.To(listener, (source) => AudioListener.volume, (source, value) => AudioListener.volume = value, to, duration)
+                    .SetTarget(listener);
     }
 
 }

Runtime/Extensions/Audio/AudioLowPassFilterTweens.cs

@@ -5,15 +5,12 @@ namespace Zigurous.Tweening
     public static class AudioLowPassFilterTweens
     {
         public static Tween TweenCutoffFrequency(this AudioLowPassFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.cutoffFrequency,
-                        setter: cutoffFrequency => filter.cutoffFrequency = cutoffFrequency,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.cutoffFrequency, (source, value) => source.cutoffFrequency = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenLowpassResonanceQ(this AudioLowPassFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.lowpassResonanceQ,
-                        setter: lowpassResonanceQ => filter.lowpassResonanceQ = lowpassResonanceQ,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.lowpassResonanceQ, (source, value) => source.lowpassResonanceQ = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }

Runtime/Extensions/Audio/AudioReverbFilterTweens.cs

@@ -5,75 +5,60 @@ namespace Zigurous.Tweening
     public static class AudioReverbFilterTweens
     {
         public static Tween TweenDensity(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.density,
-                        setter: density => filter.density = density,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.density, (source, value) => source.density = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDiffusion(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.diffusion,
-                        setter: diffusion => filter.diffusion = diffusion,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.diffusion, (source, value) => source.diffusion = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenReverbDelay(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.reverbDelay,
-                        setter: reverbDelay => filter.reverbDelay = reverbDelay,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.reverbDelay, (source, value) => source.reverbDelay = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenReverbLevel(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.reverbLevel,
-                        setter: reverbLevel => filter.reverbLevel = reverbLevel,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.reverbLevel, (source, value) => source.reverbLevel = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenReflectionsDelay(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.reflectionsDelay,
-                        setter: reflectionsDelay => filter.reflectionsDelay = reflectionsDelay,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.reflectionsDelay, (source, value) => source.reflectionsDelay = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenReflectionsLevel(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.reflectionsLevel,
-                        setter: reflectionsLevel => filter.reflectionsLevel = reflectionsLevel,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.reflectionsLevel, (source, value) => source.reflectionsLevel = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDecayHFRatio(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.decayHFRatio,
-                        setter: decayHFRatio => filter.decayHFRatio = decayHFRatio,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.decayHFRatio, (source, value) => source.decayHFRatio = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDecayTime(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.decayTime,
-                        setter: decayTime => filter.decayTime = decayTime,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.decayTime, (source, value) => source.decayTime = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenRoom(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.room,
-                        setter: room => filter.room = room,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.room, (source, value) => source.room = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenRoomHF(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.roomHF,
-                        setter: roomHF => filter.roomHF = roomHF,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.roomHF, (source, value) => source.roomHF = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenRoomLF(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.roomLF,
-                        setter: roomLF => filter.roomLF = roomLF,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.roomLF, (source, value) => source.roomLF = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenDryLevel(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.dryLevel,
-                        setter: dryLevel => filter.dryLevel = dryLevel,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.dryLevel, (source, value) => source.dryLevel = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenHFReference(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.hfReference,
-                        setter: hfReference => filter.hfReference = hfReference,
-                        to, duration).SetTarget(filter);
+            Tweening.To(filter, (source) => source.hfReference, (source, value) => source.hfReference = value, to, duration)
+                    .SetTarget(filter);
 
         public static Tween TweenLFReference(this AudioReverbFilter filter, float to, float duration) =>
-            Tweening.To(getter: () => filter.lfReference,
-                        setter: lfReference => filter.lfReference = lfReference,
-                        to, duration).SetTarget(filter);
-
+            Tweening.To(filter, (source) => source.lfReference, (source, value) => source.lfReference = value, to, duration)
+                    .SetTarget(filter);
     }
 
 }