Skip to content

New: Add easing functions to FunctionScript #1371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adfriz wants to merge 2 commits into
base: master
Choose a base branch
from
+879 −0
Open

New: Add easing functions to FunctionScript #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c261077
New: Add easing functions to FunctionScript
adfriz Aug 1, 2026
e0817b0
Add slerp
adfriz Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions source/ObjectViewer/FunctionScripts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,105 @@ internal static void ExecuteFunctionScript(FunctionScript Function, TrainBase Tr
case Instructions.MathPi:
Function.Stack[s] = Math.PI;
s++; break;
case Instructions.MathLerp:
Function.Stack[s - 3] = Easing.Lerp(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathSmoothstep:
Function.Stack[s - 3] = Easing.Smoothstep(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathSlerp:
Function.Stack[s - 3] = Easing.Slerp(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathEaseInSine:
Function.Stack[s - 1] = Easing.EaseInSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutSine:
Function.Stack[s - 1] = Easing.EaseOutSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutSine:
Function.Stack[s - 1] = Easing.EaseInOutSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuad:
Function.Stack[s - 1] = Easing.EaseInQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuad:
Function.Stack[s - 1] = Easing.EaseOutQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuad:
Function.Stack[s - 1] = Easing.EaseInOutQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInCubic:
Function.Stack[s - 1] = Easing.EaseInCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutCubic:
Function.Stack[s - 1] = Easing.EaseOutCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutCubic:
Function.Stack[s - 1] = Easing.EaseInOutCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuart:
Function.Stack[s - 1] = Easing.EaseInQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuart:
Function.Stack[s - 1] = Easing.EaseOutQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuart:
Function.Stack[s - 1] = Easing.EaseInOutQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuint:
Function.Stack[s - 1] = Easing.EaseInQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuint:
Function.Stack[s - 1] = Easing.EaseOutQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuint:
Function.Stack[s - 1] = Easing.EaseInOutQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInExpo:
Function.Stack[s - 1] = Easing.EaseInExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutExpo:
Function.Stack[s - 1] = Easing.EaseOutExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutExpo:
Function.Stack[s - 1] = Easing.EaseInOutExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInCirc:
Function.Stack[s - 1] = Easing.EaseInCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutCirc:
Function.Stack[s - 1] = Easing.EaseOutCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutCirc:
Function.Stack[s - 1] = Easing.EaseInOutCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInBack:
Function.Stack[s - 1] = Easing.EaseInBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutBack:
Function.Stack[s - 1] = Easing.EaseOutBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutBack:
Function.Stack[s - 1] = Easing.EaseInOutBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInElastic:
Function.Stack[s - 1] = Easing.EaseInElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutElastic:
Function.Stack[s - 1] = Easing.EaseOutElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutElastic:
Function.Stack[s - 1] = Easing.EaseInOutElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInBounce:
Function.Stack[s - 1] = Easing.EaseInBounce(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutBounce:
Function.Stack[s - 1] = Easing.EaseOutBounce(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutBounce:
Function.Stack[s - 1] = Easing.EaseInOutBounce(Function.Stack[s - 1]);
break;
// comparisons
case Instructions.CompareEqual:
Function.Stack[s - 2] = Function.Stack[s - 2] == Function.Stack[s - 1] ? 1.0 : 0.0;
Expand Down
99 changes: 99 additions & 0 deletions source/OpenBVE/Game/ObjectManager/AnimatedObjects/FunctionScripts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,105 @@ internal static void ExecuteFunctionScript(FunctionScript Function, TrainBase Tr
case Instructions.MathPi:
Function.Stack[s] = Math.PI;
s++; break;
case Instructions.MathLerp:
Function.Stack[s - 3] = Easing.Lerp(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathSmoothstep:
Function.Stack[s - 3] = Easing.Smoothstep(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathSlerp:
Function.Stack[s - 3] = Easing.Slerp(Function.Stack[s - 3], Function.Stack[s - 2], Function.Stack[s - 1]);
s -= 2; break;
case Instructions.MathEaseInSine:
Function.Stack[s - 1] = Easing.EaseInSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutSine:
Function.Stack[s - 1] = Easing.EaseOutSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutSine:
Function.Stack[s - 1] = Easing.EaseInOutSine(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuad:
Function.Stack[s - 1] = Easing.EaseInQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuad:
Function.Stack[s - 1] = Easing.EaseOutQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuad:
Function.Stack[s - 1] = Easing.EaseInOutQuad(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInCubic:
Function.Stack[s - 1] = Easing.EaseInCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutCubic:
Function.Stack[s - 1] = Easing.EaseOutCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutCubic:
Function.Stack[s - 1] = Easing.EaseInOutCubic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuart:
Function.Stack[s - 1] = Easing.EaseInQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuart:
Function.Stack[s - 1] = Easing.EaseOutQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuart:
Function.Stack[s - 1] = Easing.EaseInOutQuart(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInQuint:
Function.Stack[s - 1] = Easing.EaseInQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutQuint:
Function.Stack[s - 1] = Easing.EaseOutQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutQuint:
Function.Stack[s - 1] = Easing.EaseInOutQuint(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInExpo:
Function.Stack[s - 1] = Easing.EaseInExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutExpo:
Function.Stack[s - 1] = Easing.EaseOutExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutExpo:
Function.Stack[s - 1] = Easing.EaseInOutExpo(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInCirc:
Function.Stack[s - 1] = Easing.EaseInCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutCirc:
Function.Stack[s - 1] = Easing.EaseOutCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutCirc:
Function.Stack[s - 1] = Easing.EaseInOutCirc(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInBack:
Function.Stack[s - 1] = Easing.EaseInBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutBack:
Function.Stack[s - 1] = Easing.EaseOutBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutBack:
Function.Stack[s - 1] = Easing.EaseInOutBack(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInElastic:
Function.Stack[s - 1] = Easing.EaseInElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutElastic:
Function.Stack[s - 1] = Easing.EaseOutElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutElastic:
Function.Stack[s - 1] = Easing.EaseInOutElastic(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInBounce:
Function.Stack[s - 1] = Easing.EaseInBounce(Function.Stack[s - 1]);
break;
case Instructions.MathEaseOutBounce:
Function.Stack[s - 1] = Easing.EaseOutBounce(Function.Stack[s - 1]);
break;
case Instructions.MathEaseInOutBounce:
Function.Stack[s - 1] = Easing.EaseInOutBounce(Function.Stack[s - 1]);
break;
// comparisons
case Instructions.CompareEqual:
Function.Stack[s - 2] = Function.Stack[s - 2] == Function.Stack[s - 1] ? 1.0 : 0.0;
Expand Down
37 changes: 37 additions & 0 deletions source/OpenBveApi/FunctionScripts/FunctionScript.Notation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,13 @@ public static string GetPostfixNotationFromFunctionNotation(string Expression) {
return a[0] + " " + a[1] + " " + f;
}
throw new System.IO.InvalidDataException(f + " is expected to have 2 arguments in " + Expression);
case "lerp":
case "smoothstep":
case "slerp":
if (n == 3) {
return a[0] + " " + a[1] + " " + a[2] + " " + f;
}
throw new System.IO.InvalidDataException(f + " is expected to have 3 arguments in " + Expression);
case "minus":
case "reciprocal":
case "floor":
Expand All @@ -217,6 +224,36 @@ public static string GetPostfixNotationFromFunctionNotation(string Expression) {
case "cos":
case "tan":
case "arctan":
case "easeinsine":
case "easeoutsine":
case "easeinoutsine":
case "easeinquad":
case "easeoutquad":
case "easeinoutquad":
case "easeincubic":
case "easeoutcubic":
case "easeinoutcubic":
case "easeinquart":
case "easeoutquart":
case "easeinoutquart":
case "easeinquint":
case "easeoutquint":
case "easeinoutquint":
case "easeinexpo":
case "easeoutexpo":
case "easeinoutexpo":
case "easeincirc":
case "easeoutcirc":
case "easeinoutcirc":
case "easeinback":
case "easeoutback":
case "easeinoutback":
case "easeinelastic":
case "easeoutelastic":
case "easeinoutelastic":
case "easeinbounce":
case "easeoutbounce":
case "easeinoutbounce":
if (n == 1) {
return a[0] + " " + f;
}
Expand Down
Loading