Merge branch 'master' into 1.1

# Conflicts: # .gitignore
2021-03-07 10:04:44 +01:00
parent 8f4d88d607 d7bf276deb
commit b8d03636dc
2 changed files with 30 additions and 5 deletions
--- a/Source/Engine/Visject/VisjectGraph.cpp
+++ b/Source/Engine/Visject/VisjectGraph.cpp
@@ -379,9 +379,8 @@ void VisjectExecutor::ProcessGroupMath(Box* box, Node* node, Value& value)
        const Vector2 rangeB = tryGetValue(node->GetBox(2), node->Values[2]).AsVector2();
        const bool clamp = tryGetValue(node->GetBox(3), node->Values[3]).AsBool;

-        auto mapFunc = rangeB.X + (inVal - rangeA.X) * (rangeB.Y - rangeB.X) / (rangeA.Y - rangeA.X);
+        auto mapFunc = Math::Remap(inVal, rangeA.X, rangeA.Y, rangeB.X, rangeB.Y);
        
-        // Clamp value?
        value = clamp ? Math::Clamp(mapFunc, rangeB.X, rangeB.Y) : mapFunc;
        break;
    }