#66: add ramp rates to Remap controller

Author: JonnyOThan

CHANGELOG.md

@@ -4,6 +4,7 @@
 - CustomPullController can now read a field from any kind of module, not just ModuleEngines.
 - Added Conditional attribute to logging calls, to reduce performance overhead.  These will now only be emitted in a debug configuration.
 - Improved randomness of perlin noise controller.
+- Added response rate to Remap controller
 
 # v0.10.5
 

Source/Waterfall/EffectControllers/RemapController.cs

@@ -11,8 +11,11 @@ public class RemapController : WaterfallController
   {
     [Persistent] public string sourceController = "";
     public FastFloatCurve mappingCurve = new();
+    [Persistent] public float responseRateUp = 0;
+    [Persistent] public float responseRateDown = 0;
 
     private WaterfallController source;
+    private bool interpolating = false;
 
     public RemapController() : base() { }
     public RemapController(ConfigNode node) : base(node)
@@ -54,12 +57,23 @@ protected override bool UpdateInternal()
     {
       if (source == null) return false;
 
-      if (!source.awake) return false;
+      if (!source.awake && !interpolating) return false;
 
       float[] sourceValues = source.Get();
       for (int i = sourceValues.Length; i-- > 0;)
       {
-        values[i] = mappingCurve.Evaluate(sourceValues[i]);
+        float targetValue = mappingCurve.Evaluate(sourceValues[i]);
+        float rampRate = targetValue > values[i] ? responseRateUp : responseRateDown;
+
+        if (rampRate > 0)
+        {
+          values[i] = Mathf.MoveTowards(values[i], targetValue, rampRate * TimeWarp.deltaTime);
+          interpolating = interpolating || values[i] != targetValue;
+        }
+        else
+        {
+          values[i] = targetValue;
+        }
       }
       return true;
     } 

Source/Waterfall/UI/EffectControllersUI/CustomPullControllerUIOptions.cs

@@ -24,16 +24,6 @@ public CustomPullControllerUIOptions()
       LoadOptions(new()); // Initialize default values from dummy model instance
     }
 
-    private static float ParseOrZero(string str)
-    {
-      if (Single.TryParse(str, out float result))
-      {
-        return result;
-      }
-
-      return 0;
-    }
-
     public override void DrawOptions()
     {
       GUILayout.BeginVertical();

Source/Waterfall/UI/EffectControllersUI/IEffectControllerUIOptions.cs

@@ -62,5 +62,15 @@ protected virtual void LoadOptions(TController controller) { }
     ///   Must be overridden if controller type have UI options that have to be copied into newly created controller instance.
     /// </summary>
     protected virtual TController CreateControllerInternal() => new();
+
+    protected static float ParseOrZero(string str)
+    {
+      if (Single.TryParse(str, out float result))
+      {
+        return result;
+      }
+
+      return 0;
+    }
   }
 }

Source/Waterfall/UI/EffectControllersUI/RemapControllerUIOptions.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 namespace Waterfall.UI.EffectControllersUI
 {
@@ -12,6 +13,8 @@ public class RemapControllerUIOptions : DefaultEffectControllerUIOptions<RemapCo
     private string sourceController;
     private Texture2D miniCurve;
     private UICurveEditWindow curveEditor;
+    private string rampRateUp;
+    private string rampRateDown;
 
     public RemapControllerUIOptions()
     {
@@ -29,6 +32,16 @@ public override void DrawOptions()
       sourceController = GUILayout.TextArea(sourceController);
       GUILayout.EndHorizontal();
 
+      GUILayout.BeginHorizontal();
+      GUILayout.Label("Ramp Rate Up", UIResources.GetStyle("data_header"), GUILayout.MaxWidth(160f));
+      rampRateUp = GUILayout.TextArea(rampRateUp, GUILayout.MaxWidth(60f));
+      GUILayout.EndHorizontal();
+
+      GUILayout.BeginHorizontal();
+      GUILayout.Label("Ramp Rate Down", UIResources.GetStyle("data_header"), GUILayout.MaxWidth(160f));
+      rampRateDown = GUILayout.TextArea(rampRateDown, GUILayout.MaxWidth(60f));
+      GUILayout.EndHorizontal();
+
       var buttonRect = GUILayoutUtility.GetRect(curveButtonDims.x, curveButtonDims.y);
       var imageRect = new Rect(buttonRect.xMin + 10f, buttonRect.yMin + 10, buttonRect.width - 20, buttonRect.height - 20);
       if (GUI.Button(buttonRect, ""))
@@ -43,6 +56,8 @@ protected override void LoadOptions(RemapController controller)
     {
       mappingCurve = controller.mappingCurve;
       sourceController = controller.sourceController;
+      rampRateUp = controller.responseRateUp.ToString();
+      rampRateDown = controller.responseRateDown.ToString();
 
       GenerateCurveThumbs();
     }
@@ -52,6 +67,8 @@ protected override RemapController CreateControllerInternal() =>
       {
         sourceController = sourceController,
         mappingCurve = mappingCurve,
+        responseRateUp = ParseOrZero(rampRateUp),
+        responseRateDown = ParseOrZero(rampRateDown),
       };
 
     private void EditCurve(FastFloatCurve toEdit, CurveUpdateFunction function)