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

improve auto smooth

Browse Source
This commit is contained in:
Ruan Lucas
2023-07-24 22:34:48 -04:00
parent 7b0e9b9e06
commit ea48a89e00
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
View File

@@ -75,7 +75,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
/// <inheritdoc/>
public override void OnSetMode(Spline spline, int index)
{
if (IsLinearTangentMode(spline, index))
if (IsLinearTangentMode(spline, index) || IsSmoothInTangentMode(spline, index) || IsSmoothOutTangentMode(spline, index))
{
SetPointSmooth(spline, index);
}
@@ -428,8 +428,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
private void SetEditButtonsEnabled()
{
_linearTangentButton.Button.Enabled = CanEditTangent();
_freeTangentButton.Button.Enabled = CanSetTangentFree();
_alignedTangentButton.Button.Enabled = CanSetTangentAligned();
_freeTangentButton.Button.Enabled = CanEditTangent();
_alignedTangentButton.Button.Enabled = CanEditTangent();
_smoothInTangentButton.Button.Enabled = CanSetTangentSmoothIn();
_smoothOutTangentButton.Button.Enabled = CanSetTangentSmoothOut();
_setLinearAllTangentsButton.Button.Enabled = CanSetAllTangentsLinear();
@@ -453,18 +453,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
return _lastPointSelected.Index < _selectedSpline.SplinePointsCount - 1;
}
private bool CanSetTangentFree()
{
if (!CanEditTangent()) return false;
return _lastPointSelected.Index < _selectedSpline.SplinePointsCount - 1 && _lastPointSelected.Index != 0;
}
private bool CanSetTangentAligned()
{
if (!CanEditTangent()) return false;
return _lastPointSelected.Index < _selectedSpline.SplinePointsCount - 1 && _lastPointSelected.Index != 0;
}
private bool CanSetAllTangentsSmooth()
{
return _selectedSpline != null;
@@ -759,17 +747,23 @@ namespace FlaxEditor.CustomEditors.Dedicated
var isFirstKeyframe = index <= 0;
// force smooth it's linear point
if (tangentInSize == 0f && !isFirstKeyframe) tangentInSize = 100;
if (tangentOutSize == 0f && !isLastKeyframe) tangentOutSize = 100;
if (tangentInSize == 0f) tangentInSize = 100;
if (tangentOutSize == 0f) tangentOutSize = 100;
// try get next / last keyframe
var nextKeyframe = !isLastKeyframe ? spline.GetSplineKeyframe(index + 1) : keyframe;
var previousKeyframe = !isFirstKeyframe ? spline.GetSplineKeyframe(index - 1) : keyframe;
// calc form from Spline.cpp -> SetTangentsSmooth
var slop = (keyframe.Value.Translation - previousKeyframe.Value.Translation + nextKeyframe.Value.Translation - keyframe.Value.Translation).Normalized;
// get tangent direction
var tangentDirection = (keyframe.Value.Translation - previousKeyframe.Value.Translation + nextKeyframe.Value.Translation - keyframe.Value.Translation).Normalized;
keyframe.TangentIn.Translation = -tangentDirection;
keyframe.TangentOut.Translation = tangentDirection;
keyframe.TangentIn.Translation *= tangentInSize;
keyframe.TangentOut.Translation *= tangentOutSize;
keyframe.TangentIn.Translation = -slop * tangentInSize;
keyframe.TangentOut.Translation = slop * tangentOutSize;
spline.SetSplineKeyframe(index, keyframe);
spline.UpdateSpline();
}