diff options
| author | Xpertice <henryjones@programmer.net> | 2022-10-21 14:59:27 -0400 |
|---|---|---|
| committer | HenryClones <30604707+HenryClones@users.noreply.github.com> | 2022-11-22 22:37:22 -0500 |
| commit | 3e36cc7c7342213628a462c5d0ee2f330c283b4c (patch) | |
| tree | c4a06f906e29644661813a05c46f8549078996a9 | |
| parent | e73ff0e961da2b57f4ff63185c0929cc222c7372 (diff) | |
Add case for Variant::INT in lerp variant switch
| -rw-r--r-- | core/variant/variant_utility.cpp | 3 | ||||
| -rw-r--r-- | doc/classes/@GlobalScope.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp index 3843c32bcc..f274b80729 100644 --- a/core/variant/variant_utility.cpp +++ b/core/variant/variant_utility.cpp @@ -335,6 +335,9 @@ struct VariantUtilityFunctions { } switch (from.get_type()) { + case Variant::INT: { + return lerpf(VariantInternalAccessor<int64_t>::get(&from), to, weight); + } break; case Variant::FLOAT: { return lerpf(VariantInternalAccessor<double>::get(&from), to, weight); } break; diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index a81c601910..8e77a1e170 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -527,7 +527,7 @@ <param index="2" name="weight" type="Variant" /> <description> Linearly interpolates between two values by the factor defined in [param weight]. To perform interpolation, [param weight] should be between [code]0.0[/code] and [code]1.0[/code] (inclusive). However, values outside this range are allowed and can be used to perform [i]extrapolation[/i]. If this is not desired, use [method clamp] on the result of this function. - Both [param from] and [param to] must be the same type. Supported types: [float], [Vector2], [Vector3], [Vector4], [Color], [Quaternion], [Basis]. + Both [param from] and [param to] must be the same type. Supported types: [int], [float], [Vector2], [Vector3], [Vector4], [Color], [Quaternion], [Basis]. [codeblock] lerp(0, 4, 0.75) # Returns 3.0 [/codeblock] |