godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94766 from Z0rb14n/fix-vector3-slerp 

C#: Fix Vector3 `Slerp` normalization error
This commit is contained in:
Rémi Verschelde 2024-08-16 23:45:34 +02:00
parent 0d0eb71694 0d6e9de0b9
commit 4bd33df11e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
View File

@ -692,10 +692,18 @@ namespace Godot
// Zero length vectors have no angle, so the best we can do is either lerp or throw an error. // Zero length vectors have no angle, so the best we can do is either lerp or throw an error.
return Lerp(to, weight); return Lerp(to, weight);
} }
Vector3 axis = Cross(to);
real_t axisLengthSquared = axis.LengthSquared();
if (axisLengthSquared == 0.0)
{
// Colinear vectors have no rotation axis or angle between them, so the best we can do is lerp.
return Lerp(to, weight);
}
axis /= Mathf.Sqrt(axisLengthSquared);
real_t startLength = Mathf.Sqrt(startLengthSquared); real_t startLength = Mathf.Sqrt(startLengthSquared);
real_t resultLength = Mathf.Lerp(startLength, Mathf.Sqrt(endLengthSquared), weight); real_t resultLength = Mathf.Lerp(startLength, Mathf.Sqrt(endLengthSquared), weight);
real_t angle = AngleTo(to); real_t angle = AngleTo(to);
return Rotated(Cross(to).Normalized(), angle * weight) * (resultLength / startLength); return Rotated(axis, angle * weight) * (resultLength / startLength);
} }
/// <summary> /// <summary>