map range functions moved to common

Mionsz · Sep 16, 2019 · 32f6091 · 32f6091
1 parent 64c9f63
commit 32f6091
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/PyFlow/Core/Common.py b/PyFlow/Core/Common.py
@@ -80,6 +80,18 @@ def GetRangePct(MinValue, MaxValue, Value):
     """
     return (Value - MinValue) / (MaxValue - MinValue)
 
+def mapRangeClamped(Value, InRangeA, InRangeB, OutRangeA, OutRangeB):
+    """Returns Value mapped from one range into another where the Value is clamped to the Input Range.
+    (e.g. 0.5 normalized from the range 0->1 to 0->50 would result in 25)
+    """
+
+    ClampedPct = clamp(GetRangePct(InRangeA, InRangeB, Value), 0.0, 1.0)
+    return lerp(OutRangeA, OutRangeB, ClampedPct)
+
+def mapRangeUnclamped(Value, InRangeA, InRangeB, OutRangeA, OutRangeB):
+    """Returns Value mapped from one range into another where the Value is clamped to the Input Range.
+    (e.g. 0.5 normalized from the range 0->1 to 0->50 would result in 25)"""
+    return lerp(OutRangeA, OutRangeB, GetRangePct(InRangeA, InRangeB, Value))
 
 def sign(x):
     """Returns sign of x. -1 if x is negative, 1 if positive and zero if 0.

diff --git a/PyFlow/Packages/PyFlowBase/FunctionLibraries/MathAbstractLib.py b/PyFlow/Packages/PyFlowBase/FunctionLibraries/MathAbstractLib.py
@@ -107,8 +107,7 @@ def mapRangeClamped(Value=("FloatPin", 0.0),
                         OutRangeB=("FloatPin", 0.0)):
         """Returns Value mapped from one range into another where the Value is clamped to the Input Range.\
              (e.g. 0.5 normalized from the range 0->1 to 0->50 would result in 25)"""
-        ClampedPct = clamp(GetRangePct(InRangeA, InRangeB, Value), 0.0, 1.0)
-        return lerp(OutRangeA, OutRangeB, ClampedPct)
+        return mapRangeClamped(Value, InRangeA, InRangeB, OutRangeA, OutRangeB)
 
     @staticmethod
     @IMPLEMENT_NODE(returns=('FloatPin', 0.0), meta={NodeMeta.CATEGORY: 'Math|Basic', NodeMeta.KEYWORDS: []})
@@ -119,7 +118,7 @@ def mapRangeUnclamped(Value=("FloatPin", 0.0),
                           OutRangeB=("FloatPin", 0.0)):
         """Returns Value mapped from one range into another where the Value is clamped to the Input Range.\
              (e.g. 0.5 normalized from the range 0->1 to 0->50 would result in 25)"""
-        return lerp(OutRangeA, OutRangeB, GetRangePct(InRangeA, InRangeB, Value))
+        return mapRangeUnclamped(Value, InRangeA, InRangeB, OutRangeA, OutRangeB)
 
     @staticmethod
     @IMPLEMENT_NODE(returns=("FloatPin", 0.0), meta={NodeMeta.CATEGORY: 'Math|Basic', NodeMeta.KEYWORDS: ['clamp']})