mirror
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge a6dc792bbd into 1ea6b0ccff

This commit is contained in:
Kasper Arnklit Frandsen 2025-12-17 04:20:29 +01:00 committed by GitHub
parent 1ea6b0ccff a6dc792bbd
commit 916511f54b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
editor/animation/animation_track_editor.cpp
View File

@ -2335,36 +2335,37 @@ void AnimationTrackEdit::_notification(int p_what) {
{
float scale = timeline->get_zoom_scale();
// Pre-calculate the actual order of the keys. This is needed as a move might be happening
// which might cause the keys to be in a different order than their current indices.
Vector<Pair<float, int>> sorted_keys;
for (int i = 0; i < animation->track_get_key_count(track); i++) {
float offset = animation->track_get_key_time(track, i) - timeline->get_value();
float time_offset = animation->track_get_key_time(track, i) - timeline->get_value();
if (editor->is_key_selected(track, i) && editor->is_moving_selection()) {
offset = offset + editor->get_moving_selection_offset();
}
offset = offset * scale + limit;
if (i < animation->track_get_key_count(track) - 1) {
float offset_n = animation->track_get_key_time(track, i + 1) - timeline->get_value();
if (editor->is_key_selected(track, i + 1) && editor->is_moving_selection()) {
offset_n = offset_n + editor->get_moving_selection_offset();
}
offset_n = offset_n * scale + limit;
float offset_last = limit_end;
if (i < animation->track_get_key_count(track) - 2) {
offset_last = animation->track_get_key_time(track, i + 2) - timeline->get_value();
if (editor->is_key_selected(track, i + 2) && editor->is_moving_selection()) {
offset_last = offset_last + editor->get_moving_selection_offset();
}
offset_last = offset_last * scale + limit;
}
int limit_string = (editor->is_key_selected(track, i + 1) && editor->is_moving_selection()) ? int(offset_last) : int(offset_n);
if (editor->is_key_selected(track, i) && editor->is_moving_selection()) {
limit_string = int(MAX(limit_end, offset_last));
}
draw_key_link(i, scale, int(offset), int(offset_n), limit, limit_end);
draw_key(i, scale, int(offset), editor->is_key_selected(track, i), limit, limit_string);
continue;
time_offset += editor->get_moving_selection_offset();
}
draw_key(i, scale, int(offset), editor->is_key_selected(track, i), limit, limit_end);
float screen_pos = time_offset * scale + limit;
sorted_keys.push_back(Pair<float, int>(screen_pos, i));
}
sorted_keys.sort();
for (int i = 0; i < sorted_keys.size(); i++) {
float offset = sorted_keys[i].first;
int original_index = sorted_keys[i].second;
bool selected = editor->is_key_selected(track, original_index);
if (i < sorted_keys.size() - 1) {
float offset_n = sorted_keys[i + 1].first;
int next_original_index = sorted_keys[i + 1].second;
draw_key_link(original_index, next_original_index, scale, int(offset), int(offset_n), limit, limit_end);
draw_key(original_index, scale, int(offset), selected, limit, MIN(offset_n, limit_end));
} else {
draw_key(original_index, scale, int(offset), selected, limit, limit_end);
}
}
}
@ -2591,7 +2592,7 @@ bool AnimationTrackEdit::is_key_selectable_by_distance() const {
return true;
}
void AnimationTrackEdit::draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
void AnimationTrackEdit::draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
if (p_next_x < p_clip_left) {
return;
}
@ -2599,8 +2600,8 @@ void AnimationTrackEdit::draw_key_link(int p_index, float p_pixels_sec, int p_x,
return;
}
Variant current = animation->track_get_key_value(get_track(), p_index);
Variant next = animation->track_get_key_value(get_track(), p_index + 1);
Variant current = animation->track_get_key_value(get_track(), p_index_from);
Variant next = animation->track_get_key_value(get_track(), p_index_to);
if (current != next || animation->track_get_type(get_track()) == Animation::TrackType::TYPE_METHOD) {
return;
}
@ -2666,7 +2667,7 @@ void AnimationTrackEdit::draw_key(int p_index, float p_pixels_sec, int p_x, bool
}
text += ")";
int limit = ((p_selected && editor->is_moving_selection()) || editor->is_function_name_pressed()) ? 0 : MAX(0, p_clip_right - p_x - icon_to_draw->get_width() * 2);
int limit = editor->is_function_name_pressed() ? 0 : MAX(0, p_clip_right - p_x - icon_to_draw->get_width() * 2);
if (limit > 0) {
draw_string(font, Vector2(p_x + icon_to_draw->get_width(), int(get_size().height - font->get_height(font_size)) / 2 + font->get_ascent(font_size)), text, HORIZONTAL_ALIGNMENT_LEFT, limit, font_size, color);

2
editor/animation/animation_track_editor.h
View File

@ -522,7 +522,7 @@ public:
virtual int get_key_height() const;
virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
virtual bool is_key_selectable_by_distance() const;
virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right);
virtual void draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right);
virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
virtual void draw_bg(int p_clip_left, int p_clip_right);
virtual void draw_fg(int p_clip_left, int p_clip_right);

18
editor/animation/animation_track_editor_plugins.cpp
View File

@ -97,7 +97,7 @@ bool AnimationTrackEditColor::is_key_selectable_by_distance() const {
return false;
}
void AnimationTrackEditColor::draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
void AnimationTrackEditColor::draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
int fh = (font->get_height(font_size) * 0.8);
@ -116,15 +116,15 @@ void AnimationTrackEditColor::draw_key_link(int p_index, float p_pixels_sec, int
}
Vector<Color> color_samples;
color_samples.append(get_animation()->track_get_key_value(get_track(), p_index));
color_samples.append(get_animation()->track_get_key_value(get_track(), p_index_from));
if (get_animation()->track_get_type(get_track()) == Animation::TYPE_VALUE) {
if (get_animation()->track_get_interpolation_type(get_track()) != Animation::INTERPOLATION_NEAREST &&
(get_animation()->value_track_get_update_mode(get_track()) == Animation::UPDATE_CONTINUOUS ||
get_animation()->value_track_get_update_mode(get_track()) == Animation::UPDATE_CAPTURE) &&
!Math::is_zero_approx(get_animation()->track_get_key_transition(get_track(), p_index))) {
float start_time = get_animation()->track_get_key_time(get_track(), p_index);
float end_time = get_animation()->track_get_key_time(get_track(), p_index + 1);
!Math::is_zero_approx(get_animation()->track_get_key_transition(get_track(), p_index_from))) {
float start_time = get_animation()->track_get_key_time(get_track(), p_index_from);
float end_time = get_animation()->track_get_key_time(get_track(), p_index_to);
Color color_next = get_animation()->value_track_interpolate(get_track(), end_time);
@ -142,7 +142,7 @@ void AnimationTrackEditColor::draw_key_link(int p_index, float p_pixels_sec, int
color_samples.append(color_samples[0]);
}
} else {
color_samples.append(get_animation()->track_get_key_value(get_track(), p_index + 1));
color_samples.append(get_animation()->track_get_key_value(get_track(), p_index_to));
}
for (int i = 0; i < color_samples.size() - 1; i++) {
@ -747,13 +747,13 @@ void AnimationTrackEditVolumeDB::draw_fg(int p_clip_left, int p_clip_right) {
draw_line(Vector2(p_clip_left, db0), Vector2(p_clip_right, db0), Color(1, 1, 1, 0.3));
}
void AnimationTrackEditVolumeDB::draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
void AnimationTrackEditVolumeDB::draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) {
if (p_x > p_clip_right || p_next_x < p_clip_left) {
return;
}
float db = get_animation()->track_get_key_value(get_track(), p_index);
float db_n = get_animation()->track_get_key_value(get_track(), p_index + 1);
float db = get_animation()->track_get_key_value(get_track(), p_index_from);
float db_n = get_animation()->track_get_key_value(get_track(), p_index_to);
db = CLAMP(db, -60, 24);
db_n = CLAMP(db_n, -60, 24);

4
editor/animation/animation_track_editor_plugins.h
View File

@ -50,7 +50,7 @@ public:
virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
virtual bool is_key_selectable_by_distance() const override;
virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
virtual void draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
};
class AnimationTrackEditAudio : public AnimationTrackEdit {
@ -150,7 +150,7 @@ public:
virtual void draw_bg(int p_clip_left, int p_clip_right) override;
virtual void draw_fg(int p_clip_left, int p_clip_right) override;
virtual int get_key_height() const override;
virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
virtual void draw_key_link(int p_index_from, int p_index_to, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
};
class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {