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.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-01 13:17:41 +02:00
parent a001a5fbdc 6d92d0b58f
commit dd21020297
58 changed files with 786 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Level/Actor.cs
View File

@@ -364,13 +364,20 @@ namespace FlaxEngine
/// <param name="point">The point (world-space).</param>
/// <param name="axis">The axis (normalized).</param>
/// <param name="angle">The angle (in degrees).</param>
public void RotateAround(Vector3 point, Vector3 axis, float angle)
/// /// <param name="orientActor">Whether to orient the actor the same amount as rotation.</param>
public void RotateAround(Vector3 point, Vector3 axis, float angle, bool orientActor = true)
{
var transform = Transform;
var q = Quaternion.RotationAxis(axis, angle * Mathf.DegreesToRadians);
var dif = (transform.Translation - point) * q;
transform.Translation = point + dif;
transform.Orientation = q;
if (Vector3.NearEqual(point, transform.Translation) && orientActor)
transform.Orientation *= q;
else
{
var dif = (transform.Translation - point) * q;
transform.Translation = point + dif;
if (orientActor)
transform.Orientation *= q;
}
Transform = transform;
}