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

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-10 23:29:22 +02:00
parent 8cf10bf71d 3bbfe9de8a
commit f552dd0c28
21 changed files with 438 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Editor/SceneGraph/Actors/SplineNode.cs
View File

@@ -146,7 +146,18 @@ namespace FlaxEditor.SceneGraph.Actors
Time = newTime,
Value = actor.GetSplineLocalTransform(Index),
};
var oldkeyframe = actor.GetSplineKeyframe(Index);
var newKeyframe = new BezierCurve<Transform>.Keyframe();
// copy old curve point data to new curve point
newKeyframe.Value = oldkeyframe.Value;
newKeyframe.TangentIn = oldkeyframe.TangentIn;
newKeyframe.TangentOut = oldkeyframe.TangentOut;
actor.InsertSplineLocalPoint(newIndex, newTime, action.Value);
actor.SetSplineKeyframe(newIndex, newKeyframe);
undoAction = action;
var splineNode = (SplineNode)SceneGraphFactory.FindNode(action.SplineId);
splineNode.OnUpdate();
@@ -317,6 +328,20 @@ namespace FlaxEditor.SceneGraph.Actors
var spline = (Spline)Actor;
spline.AddSplineLocalPoint(Vector3.Zero, false);
spline.AddSplineLocalPoint(new Vector3(0, 0, 100.0f));
spline.SetSplineKeyframe(0, new BezierCurve<Transform>.Keyframe()
{
Value = new Transform(Vector3.Zero, Quaternion.Identity, Vector3.One),
TangentIn = new Transform(Vector3.Backward * 100, Quaternion.Identity, Vector3.One),
TangentOut = new Transform(Vector3.Forward * 100, Quaternion.Identity, Vector3.One),
});
spline.SetSplineKeyframe(1, new BezierCurve<Transform>.Keyframe()
{
Value = new Transform(Vector3.Forward * 100, Quaternion.Identity, Vector3.One),
TangentIn = new Transform(Vector3.Backward * 100, Quaternion.Identity, Vector3.One),
TangentOut = new Transform(Vector3.Forward * 100, Quaternion.Identity, Vector3.One),
});
}
/// <inheritdoc />