Skip to content

Commit ceb6d2d

Browse files
committed
GH-854 Add Monotonic Angle SVG
1 parent 5e80b14 commit ceb6d2d

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

doc/classes/Animation.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,9 @@
730730
<constant name="INTERPOLATION_CUBIC" value="2" enum="InterpolationType">
731731
Cubic interpolation. This looks smoother than linear interpolation, but is more expensive to interpolate. Stick to [constant INTERPOLATION_LINEAR] for complex 3D animations imported from external software, even if it requires using a higher animation framerate in return.
732732
</constant>
733+
<constant name="INTERPOLATION_CUBIC_MONOTONIC" value="5" enum="InterpolationType">
734+
Monotonic Cubic interpolation. This is an alternate version of [constant INTERPOLATION_CUBIC] that ensures no overshooting of key points.
735+
</constant>
733736
<constant name="INTERPOLATION_LINEAR_ANGLE" value="3" enum="InterpolationType">
734737
Linear interpolation with shortest path rotation.
735738
[b]Note:[/b] The result value is always normalized and may not match the key value.
@@ -738,9 +741,6 @@
738741
Cubic interpolation with shortest path rotation.
739742
[b]Note:[/b] The result value is always normalized and may not match the key value.
740743
</constant>
741-
<constant name="INTERPOLATION_CUBIC_MONOTONIC" value="5" enum="InterpolationType">
742-
Monotonic Cubic interpolation. This is an alternate version of [constant INTERPOLATION_CUBIC] that ensures no overshooting of key points.
743-
</constant>
744744
<constant name="INTERPOLATION_CUBIC_MONOTONIC_ANGLE" value="6" enum="InterpolationType">
745745
Monotonic Cubic interpolation with shortest path rotation.
746746
</constant>

editor/animation/animation_track_editor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3114,7 +3114,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
31143114
if (is_angle) {
31153115
menu->add_icon_item(get_editor_theme_icon(SNAME("InterpLinearAngle")), TTR("Linear Angle"), MENU_INTERPOLATION_LINEAR_ANGLE);
31163116
menu->add_icon_item(get_editor_theme_icon(SNAME("InterpCubicAngle")), TTR("Cubic Angle"), MENU_INTERPOLATION_CUBIC_ANGLE);
3117-
menu->add_icon_item(get_editor_theme_icon(SNAME("InterpMonotonic")), TTR("Monotonic Cubic Angle"), MENU_INTERPOLATION_CUBIC_MONOTONIC_ANGLE);
3117+
menu->add_icon_item(get_editor_theme_icon(SNAME("InterpMonotonicAngle")), TTR("Monotonic Cubic Angle"), MENU_INTERPOLATION_CUBIC_MONOTONIC_ANGLE);
31183118
}
31193119
}
31203120
}
Lines changed: 2 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)