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

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-19 00:32:54 +02:00
parent fe33f09f1d d879b8e064
commit b33c2b4f36
21 changed files with 347 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Core/Config/LayersAndTagsSettings.cs
View File

@@ -18,7 +18,7 @@ namespace FlaxEditor.Content.Settings
/// <summary>
/// The layers names.
/// </summary>
[EditorOrder(10), EditorDisplay("Layers", EditorDisplayAttribute.InlineStyle), Collection(CanResize = true, Display = CollectionAttribute.DisplayType.Inline)]
[EditorOrder(10), EditorDisplay("Layers", EditorDisplayAttribute.InlineStyle), Collection(CanResize = false, Display = CollectionAttribute.DisplayType.Inline)]
public string[] Layers = new string[32];
/// <summary>

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);
}
else if (Float3::Dot(direction, Float3::Down) >= 0.999f)
{
RotationAxis(Float3::Right, PI_OVER_2, orientation);
}
else
{
Float3 right, up;

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

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