GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'quaternion-fix-down' of https://github.com/Zode/FlaxEngine into Zode-quaternion-fix-down

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-18 12:40:00 +02:00
parent 4a6f2f8821 e1cf41b94b
commit 5259c41b40
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Core/Math/Quaternion.cpp
View File

@@ -294,6 +294,10 @@ Quaternion Quaternion::FromDirection(const Float3& direction)
{ {
RotationAxis(Float3::Left, PI_OVER_2, orientation); RotationAxis(Float3::Left, PI_OVER_2, orientation);
} }
else if (Float3::Dot(direction, Float3::Down) >= 0.999f)
{
RotationAxis(Float3::Right, PI_OVER_2, orientation);
}
else else
{ {
Float3 right, up; Float3 right, up;

4
Source/Engine/Core/Math/Quaternion.cs
View File

@@ -654,6 +654,10 @@ namespace FlaxEngine
{ {
orientation = RotationAxis(Float3.Left, Mathf.PiOverTwo); orientation = RotationAxis(Float3.Left, Mathf.PiOverTwo);
} }
else if (Float3.Dot(direction, Float3.Down) >= 0.999f)
{
orientation = RotationAxis(Float3.Right, Mathf.PiOverTwo);
}
else else
{ {
var right = Float3.Cross(direction, Float3.Up); var right = Float3.Cross(direction, Float3.Up);