Release 0.10.5

GameData/Waterfall/Versioning/Waterfall.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":10,
-        "PATCH":3,
+        "PATCH":5,
         "BUILD":0
     },
     "KSP_VERSION":

Source/Waterfall/EffectControllers/CustomPullController.cs

@@ -45,7 +45,7 @@ public override void Initialize(ModuleWaterfallFX host)
       engineController = host.GetComponents<ModuleEngines>().FirstOrDefault(x => x.engineID == engineID);
       if (engineController == null)
       {
-        Utils.Log($"[{nameof(CustomPullController)}]: Could not find engine ID {engineID}, using first module if available");
+        Utils.Log($"[{nameof(CustomPullController)}]: Could not find engine ID {engineID}, using first module if available", LogType.Effects);
         engineController = host.part.FindModuleImplementing<ModuleEngines>();
       }
 

Source/Waterfall/EffectControllers/EngineOnOffController.cs

@@ -0,0 +1,66 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using UnityEngine;
+
+namespace Waterfall
+{
+  [DisplayName("Engine On State")]
+  public class EngineOnOffController : WaterfallController
+  {
+    public float currentState = 0f;
+    [Persistent] public string engineID = String.Empty;
+    [Persistent] public float responseRateUp = 100f;
+    [Persistent] public float responseRateDown = 100f;
+    private ModuleEngines engineController;
+
+    public bool zeroOnFlameout = true;
+
+    public EngineOnOffController() : base() { }
+    public EngineOnOffController(ConfigNode node) : base(node) { }
+
+    public override void Initialize(ModuleWaterfallFX host)
+    {
+      base.Initialize(host);
+
+      values = new float[1];
+
+      engineController = host.GetComponents<ModuleEngines>().FirstOrDefault(x => x.engineID == engineID);
+      if (engineController == null)
+      {
+        Utils.Log($"[EngineOnOffController] Could not find engine ID {engineID}, using first module", LogType.Effects);
+        engineController = host.part.FindModuleImplementing<ModuleEngines>();
+      }
+      else
+      {
+        currentState = engineController.isOperational ? 1f : 0f;
+      }
+
+      if (engineController == null)
+        Utils.LogError("[EngineOnOffController] Could not find engine controller on Initialize");
+    }
+
+    protected override float UpdateSingleValue()
+    {
+      if (engineController == null)
+      {
+        Utils.LogWarning("[EngineOnOffController] Engine controller not assigned");
+        return 0f;
+      }
+      else if (zeroOnFlameout)
+      {
+        float targetThrottle = engineController.isOperational && !engineController.flameout ? 1f : 0f;
+
+        if (currentState != targetThrottle)
+        {
+          float rampRate = targetThrottle > currentState ? responseRateUp : responseRateDown;
+          currentState = Mathf.MoveTowards(currentState, targetThrottle, rampRate * TimeWarp.deltaTime);
+        }
+
+        return currentState;
+      }
+      return currentState;
+    }
+  }
+}
+

Source/Waterfall/EffectControllers/RemapController.cs

@@ -40,20 +40,28 @@ private IEnumerator FindSourceDelayed()
     {
       yield return new WaitForEndOfFrame();
       source = parentModule.FindController(sourceController);
-      values = new float[source.Get().Length];
+      if (source == null)
+      {
+        Utils.LogError($"[RemapController] Could not find source controller {sourceController}");
+      }
+      else
+      {
+        values = new float[source.Get().Length];
+      }
     }
 
     protected override bool UpdateInternal()
     {
-      if (source != null)
+      if (source == null) return false;
+
+      if (!source.awake) return false;
+
+      float[] sourceValues = source.Get();
+      for (int i = sourceValues.Length; i-- > 0;)
       {
-        float[] sourceValues = source.Get();
-        for (int i = 0; i < sourceValues.Length; ++i)
-        {
-          values[i] = mappingCurve.Evaluate(sourceValues[i]);
-        }
+        values[i] = mappingCurve.Evaluate(sourceValues[i]);
       }
-      return false;
-    }
+      return true;
+    } 
   }
-}
+}

Source/Waterfall/EffectControllers/ScalarModuleController.cs

@@ -0,0 +1,48 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+
+namespace Waterfall
+{
+  /// <summary>
+  ///   A controller that pulls from RCS throttle
+  /// </summary>
+  [Serializable]
+  [DisplayName("Scalar Module (AnimateGeneric)")]
+  public class ScalarModuleController : WaterfallController
+  {
+    private IScalarModule scalarController;
+    [Persistent] public string moduleID = String.Empty;
+
+    public ScalarModuleController() : base() { }
+    public ScalarModuleController(ConfigNode node) : base(node) { }
+
+    public override void Initialize(ModuleWaterfallFX host)
+    {
+      base.Initialize(host);
+
+      values = new float[1];
+
+      scalarController = host.part.FindModulesImplementing<IScalarModule>().FirstOrDefault(x => x.ScalarModuleID == moduleID);
+      if (scalarController == null)
+      {
+        Utils.LogError($"[ScalarModuleController] Could not find a compatible module with ID {moduleID} on Initialize");
+        values = new float[0];
+        return;
+      }
+    }
+
+    protected override float UpdateSingleValue()
+    {
+      if (scalarController == null)
+      {
+        Utils.LogWarning("[ScalarModuleController] Scalar module not assigned");
+        return 0;
+      }
+      else 
+      {
+        return scalarController.GetScalar;
+      }
+    }
+  }
+}

Source/Waterfall/EffectControllers/ThrottleController.cs

@@ -32,7 +32,7 @@ public override void Initialize(ModuleWaterfallFX host)
       engineController = host.GetComponents<ModuleEngines>().FirstOrDefault(x => x.engineID == engineID);
       if (engineController == null)
       {
-        Utils.Log($"[ThrottleController] Could not find engine ID {engineID}, using first module");
+        Utils.Log($"[ThrottleController] Could not find engine ID {engineID}, using first module", LogType.Effects);
         engineController = host.part.FindModuleImplementing<ModuleEngines>();
       }
 

Source/Waterfall/EffectControllers/ThrustController.cs

@@ -29,7 +29,7 @@ public override void Initialize(ModuleWaterfallFX host)
       engineController = host.GetComponents<ModuleEngines>().FirstOrDefault(x => x.engineID == engineID);
       if (engineController == null)
       {
-        Utils.Log($"[ThrustController] Could not find engine ID {engineID}, using first module");
+        Utils.Log($"[ThrustController] Could not find engine ID {engineID}, using first module", LogType.Effects);
         engineController = host.part.FindModuleImplementing<ModuleEngines>();
       }
 

Source/Waterfall/Modules/ModuleWaterfallFX.cs

@@ -661,7 +661,7 @@ protected void InitializeEffects()
       activeFX.Clear();
       foreach (var fx in allFX)
       {
-        Utils.Log($"[ModuleWaterfallFX]: Initializing effect {fx.name}");
+        Utils.Log($"[ModuleWaterfallFX]: Initializing effect {fx.name}", LogType.Modules);
         if (fx.InitializeEffect(this, false, useRelativeScaling))
         {
           activeFX.Add(fx);

Source/Waterfall/UI/EditWindows/UICurveEditWindow.cs

@@ -18,7 +18,7 @@ public class UICurveEditWindow : UIPopupWindow
 
     public UICurveEditWindow(FastFloatCurve curveToEdit, bool show) : base(show)
     {
-      Utils.Log($"Started editing curve {curveToEdit}");
+      Utils.Log($"[UICurveEditWindow] Started editing curve {curveToEdit}", LogType.UI);
 
 
       if (!showWindow)
@@ -32,7 +32,7 @@ public UICurveEditWindow(FastFloatCurve curveToEdit, bool show) : base(show)
     public UICurveEditWindow(FastFloatCurve curveToEdit, CurveUpdateFunction curveFun, bool show) : base(show)
     {
       curveUpdateFun = curveFun;
-      Utils.Log($"Started editing curve {curveToEdit}");
+      Utils.Log($"[UICurveEditWindow]: Started editing curve {curveToEdit}", LogType.UI);
 
       if (!showWindow)
         WindowPosition = new(Screen.width / 2, Screen.height / 2, 678, 600);
@@ -46,7 +46,7 @@ public UICurveEditWindow(FastFloatCurve curveToEdit, UIModifierWindow modWin, st
     {
       modifier    = modWin;
       modifierTag = tag;
-      Utils.Log($"Started editing curve {curveToEdit}", LogType.UI);
+      Utils.Log($"[UICurveEditWindow]: Started editing curve {curveToEdit}", LogType.UI);
 
       if (!showWindow)
         WindowPosition = new(Screen.width / 2, Screen.height / 2, 678, 600);
@@ -58,7 +58,7 @@ public UICurveEditWindow(FastFloatCurve curveToEdit, UIModifierWindow modWin, st
 
     public void ChangeCurve(FastFloatCurve curveToEdit)
     {
-      Utils.Log($"Started editing curve {curveToEdit}", LogType.UI);
+      Utils.Log($"[UICurveEditWindow]: Started editing curve {curveToEdit}", LogType.UI);
       curve  = curveToEdit;
       points = GraphUtils.FastFloatCurveToPoints(curveToEdit);
       UpdateCurve(out curve);
@@ -69,7 +69,7 @@ public void ChangeCurve(FastFloatCurve curveToEdit)
     public void ChangeCurve(FastFloatCurve curveToEdit, CurveUpdateFunction curveFun)
     {
       curveUpdateFun = curveFun;
-      Utils.Log($"Started editing curve {curveToEdit}", LogType.UI);
+      Utils.Log($"[UICurveEditWindow]: Started editing curve {curveToEdit}", LogType.UI);
       curve  = curveToEdit;
       points = GraphUtils.FastFloatCurveToPoints(curveToEdit);
       UpdateCurve(out curve);
@@ -81,7 +81,7 @@ public void ChangeCurve(FastFloatCurve curveToEdit, UIModifierWindow modWin, str
     {
       modifier    = modWin;
       modifierTag = tag;
-      Utils.Log($"Started editing curve {curveToEdit}", LogType.UI);
+      Utils.Log($"[UICurveEditWindow]: Started editing curve {curveToEdit}", LogType.UI);
       curve  = curveToEdit;
       points = GraphUtils.FastFloatCurveToPoints(curveToEdit);
       UpdateCurve(out curve);
@@ -100,13 +100,10 @@ public void UpdateCurve(out FastFloatCurve theCurve)
       theCurve.FindMinMax(out float minTime, out minY, out float maxTime, out maxY);
       curve = theCurve;
       curveUpdateFun(curve);
-      //WaterfallUI.Instance.UpdateCurve(curve);
       textVersion  = GraphUtils.PointsToString(points);
       graphTexture = GraphUtils.GenerateCurveTexture(texWidth, texHeight, curve, Color.green);
     }
 
-
-    //
     public bool Compare(FastFloatCurve toCompare)
     {
       if (GraphUtils.FastFloatCurveToPoints(toCompare) != points)

Source/Waterfall/UI/EditWindows/UIGradientEditWindow.cs

@@ -307,7 +307,6 @@ protected void AddAlphaKey(float selTime)
     }
     public void DeleteAlphaKey(UIGradientAlphaKey selKey)
     {
-      Utils.Log("Delete Alpha key");
       deleteAlphaList.Add(selKey);
       if (selectedKey == selKey)
       {
@@ -336,15 +335,13 @@ public void SelectAlphaKey(UIGradientAlphaKey selKey)
     }
     public void StopAlphaKeyDrag()
     {
-      Utils.Log("Stopped dragging alpha key");
       keyDrag = false;
       SelectAlphaKey(selectedKey);
       RegenerateGradient();
     }
     bool keyDrag = false;
     public void StartKeyDrag()
     {
-      Utils.Log("Started key drag");
       keyDrag = true;
     }
 
@@ -415,7 +412,6 @@ protected void DrawColorKeys(Rect rect)
 
     protected void AddColorKey(float selTime)
     {
-      Utils.Log("Add Color key");
       UIGradientColorKey newKey = new UIGradientColorKey(selTime,
         new Color(
           gradient.Evaluate(selTime).r,
@@ -428,7 +424,6 @@ protected void AddColorKey(float selTime)
     }
     public void DeleteColorKey(UIGradientColorKey selKey)
     {
-      Utils.Log("Delete Color key");
       deleteColorList.Add(selKey);
       if (selectedColorKey == selKey)
       {
@@ -463,7 +458,6 @@ public void SelectColorKey(UIGradientColorKey selKey)
     }
     public void StopColorKeyDrag()
     {
-      Utils.Log("Stopped dragging color key");
       keyDrag = false;
       SelectColorKey(selectedColorKey);
       RegenerateGradient();