godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display for no-length audio stream keys

This commit is contained in:
Silc Renew 2023-02-15 17:00:31 +09:00
parent 93d1cfe525
commit d5e662af73
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/animation_track_editor_plugins.cpp
View File

@ -847,9 +847,14 @@ bool AnimationTrackEditTypeAudio::is_key_selectable_by_distance() const {
void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) { void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) {
Ref<AudioStream> stream = get_animation()->audio_track_get_key_stream(get_track(), p_index); Ref<AudioStream> stream = get_animation()->audio_track_get_key_stream(get_track(), p_index);
if (!stream.is_valid()) { if (!stream.is_valid()) {
AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right); AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right); // Draw diamond.
return;
}
float len = stream->get_length();
if (len == 0) {
AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right); // Draw diamond.
return; return;
} }
@ -871,16 +876,10 @@ void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int
int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label")); int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label"));
float fh = int(font->get_height(font_size) * 1.5); float fh = int(font->get_height(font_size) * 1.5);
float len = stream->get_length();
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream); Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_len = preview->get_length(); float preview_len = preview->get_length();
if (len == 0) {
len = preview_len;
}
int pixel_total_len = len * p_pixels_sec; int pixel_total_len = len * p_pixels_sec;
len -= end_ofs; len -= end_ofs;
@ -1044,16 +1043,13 @@ void AnimationTrackEditTypeAudio::gui_input(const Ref<InputEvent> &p_event) {
continue; continue;
} }
float start_ofs = get_animation()->audio_track_get_key_start_offset(get_track(), i);
float end_ofs = get_animation()->audio_track_get_key_end_offset(get_track(), i);
float len = stream->get_length(); float len = stream->get_length();
if (len == 0) { if (len == 0) {
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream); continue;
float preview_len = preview->get_length();
len = preview_len;
} }
float start_ofs = get_animation()->audio_track_get_key_start_offset(get_track(), i);
float end_ofs = get_animation()->audio_track_get_key_end_offset(get_track(), i);
len -= end_ofs; len -= end_ofs;
len -= start_ofs; len -= start_ofs;