Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-22 21:21:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge f026df1ff2 into 533c616cb8

Browse Source
This commit is contained in:
Tomek 2024-10-22 22:10:36 +02:00 committed by GitHub
commit 40b9f8bfe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@ -492,6 +492,9 @@
If [code]true[/code], display a confirmation dialog when adding a new track to an animation by pressing the "key" icon next to a property. Holding Shift will bypass the dialog.
If [code]false[/code], the behavior is reversed, i.e. the dialog only appears when Shift is held.
</member>
<member name="editors/animation/default_animation_step" type="float" setter="" getter="">
Default step used when creating new [Animation] in Animation tab. Only affects the first animation in [AnimationPlayer], subsequent animations will use step from the previous ones.
</member>
<member name="editors/animation/default_create_bezier_tracks" type="bool" setter="" getter="">
If [code]true[/code], create a Bezier track instead of a standard track when pressing the "key" icon next to a property. Bezier tracks provide more control over animation curves, but are more difficult to adjust quickly.
</member>

2
editor/editor_settings.cpp
View File

@ -54,6 +54,7 @@
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
#include "scene/main/window.h"
#include "scene/resources/animation.h"
// PRIVATE METHODS
@ -882,6 +883,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/polygon_editor/auto_bake_delay", 1.5, "-1.0,10.0,0.01");
// Animation
_initial_set("editors/animation/default_animation_step", Animation::DEFAULT_STEP);
_initial_set("editors/animation/autorename_animation_tracks", true);
_initial_set("editors/animation/confirm_insert_track", true, true);
_initial_set("editors/animation/default_create_bezier_tracks", false, true);

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -655,6 +655,8 @@ void AnimationPlayerEditor::_animation_name_edited() {
if (current_anim.is_valid()) {
new_anim->set_step(current_anim->get_step());
}
} else {
new_anim->set_step(EDITOR_GET("editors/animation/default_animation_step"));
}
String library_name;

3
scene/resources/animation.h
View File

@ -44,6 +44,7 @@ public:
typedef uint32_t TypeHash;
static inline String PARAMETERS_BASE_PATH = "parameters/";
static inline constexpr real_t DEFAULT_STEP = 1.0 / 30;
enum TrackType : uint8_t {
TYPE_VALUE, // Set a value in a property, can be interpolated.
@ -284,7 +285,7 @@ private:
_FORCE_INLINE_ void _track_get_key_indices_in_range(const Vector<T> &p_array, double from_time, double to_time, List<int> *p_indices, bool p_is_backward) const;
double length = 1.0;
real_t step = 1.0 / 30;
real_t step = DEFAULT_STEP;
LoopMode loop_mode = LOOP_NONE;
bool capture_included = false;
void _check_capture_included();