asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enhancements for the audio bus editor

Browse source
This commit is contained in:
Michael Alexsander Silva Dias 2019-06-08 02:26:39 -03:00
parent abbbde87e2
commit bb1c5f5525
3 changed files with 263 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/animation_track_editor.cpp
View file

@ -1214,7 +1214,7 @@ void AnimationTrackEdit::_notification(int p_what) {
Color accent = get_color("accent_color", "Editor"); Color accent = get_color("accent_color", "Editor");
accent.a *= 0.7; accent.a *= 0.7;
// Offside so the horizontal sides aren't cutoff. // Offside so the horizontal sides aren't cutoff.
draw_rect(Rect2(Point2(1, 0), get_size() - Size2(1, 0)), accent, false); draw_rect(Rect2(Point2(1 * EDSCALE, 0), get_size() - Size2(1 * EDSCALE, 0)), accent, false);
} }
Ref<Font> font = get_font("font", "Label"); Ref<Font> font = get_font("font", "Label");

213
editor/editor_audio_buses.cpp
View file

@ -63,7 +63,8 @@ void EditorAudioBus::_update_visible_channels() {
void EditorAudioBus::_notification(int p_what) { void EditorAudioBus::_notification(int p_what) {
if (p_what == NOTIFICATION_READY) { switch (p_what) {
case NOTIFICATION_READY: {
for (int i = 0; i < CHANNELS_MAX; i++) { for (int i = 0; i < CHANNELS_MAX; i++) {
channel[i].vu_l->set_under_texture(get_icon("BusVuEmpty", "EditorIcons")); channel[i].vu_l->set_under_texture(get_icon("BusVuEmpty", "EditorIcons"));
@ -90,18 +91,24 @@ void EditorAudioBus::_notification(int p_what) {
update_bus(); update_bus();
set_process(true); set_process(true);
} } break;
case NOTIFICATION_DRAW: {
if (p_what == NOTIFICATION_DRAW) { if (is_master) {
if (has_focus()) {
draw_style_box(get_stylebox("focus", "Button"), Rect2(Vector2(), get_size()));
} else if (is_master) {
draw_style_box(get_stylebox("disabled", "Button"), Rect2(Vector2(), get_size())); draw_style_box(get_stylebox("disabled", "Button"), Rect2(Vector2(), get_size()));
} } else if (has_focus()) {
draw_style_box(get_stylebox("focus", "Button"), Rect2(Vector2(), get_size()));
} else {
draw_style_box(get_stylebox("panel", "TabContainer"), Rect2(Vector2(), get_size()));
} }
if (p_what == NOTIFICATION_PROCESS) { if (get_index() != 0 && hovering_drop) {
Color accent = get_color("accent_color", "Editor");
accent.a *= 0.7;
draw_rect(Rect2(Point2(), get_size()), accent, false);
}
} break;
case NOTIFICATION_PROCESS: {
if (cc != AudioServer::get_singleton()->get_bus_channels(get_index())) { if (cc != AudioServer::get_singleton()->get_bus_channels(get_index())) {
cc = AudioServer::get_singleton()->get_bus_channels(get_index()); cc = AudioServer::get_singleton()->get_bus_channels(get_index());
@ -145,9 +152,8 @@ void EditorAudioBus::_notification(int p_what) {
channel[i].prev_active = activity_found; channel[i].prev_active = activity_found;
} }
} }
} } break;
case NOTIFICATION_VISIBILITY_CHANGED: {
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
for (int i = 0; i < CHANNELS_MAX; i++) { for (int i = 0; i < CHANNELS_MAX; i++) {
channel[i].peak_l = -100; channel[i].peak_l = -100;
@ -156,9 +162,8 @@ void EditorAudioBus::_notification(int p_what) {
} }
set_process(is_visible_in_tree()); set_process(is_visible_in_tree());
} } break;
case NOTIFICATION_THEME_CHANGED: {
if (p_what == NOTIFICATION_THEME_CHANGED) {
for (int i = 0; i < CHANNELS_MAX; i++) { for (int i = 0; i < CHANNELS_MAX; i++) {
channel[i].vu_l->set_under_texture(get_icon("BusVuEmpty", "EditorIcons")); channel[i].vu_l->set_under_texture(get_icon("BusVuEmpty", "EditorIcons"));
@ -175,6 +180,15 @@ void EditorAudioBus::_notification(int p_what) {
bypass->set_icon(get_icon("AudioBusBypass", "EditorIcons")); bypass->set_icon(get_icon("AudioBusBypass", "EditorIcons"));
bus_options->set_icon(get_icon("GuiMiniTabMenu", "EditorIcons")); bus_options->set_icon(get_icon("GuiMiniTabMenu", "EditorIcons"));
} break;
case NOTIFICATION_MOUSE_EXIT:
case NOTIFICATION_DRAG_END: {
if (hovering_drop) {
hovering_drop = false;
update();
}
} break;
} }
} }
@ -553,6 +567,7 @@ Variant EditorAudioBus::get_drag_data(const Point2 &p_point) {
Control *c = memnew(Control); Control *c = memnew(Control);
Panel *p = memnew(Panel); Panel *p = memnew(Panel);
c->add_child(p); c->add_child(p);
p->set_modulate(Color(1, 1, 1, 0.7));
p->add_style_override("panel", get_stylebox("focus", "Button")); p->add_style_override("panel", get_stylebox("focus", "Button"));
p->set_size(get_size()); p->set_size(get_size());
p->set_position(-p_point); p->set_position(-p_point);
@ -560,21 +575,29 @@ Variant EditorAudioBus::get_drag_data(const Point2 &p_point) {
Dictionary d; Dictionary d;
d["type"] = "move_audio_bus"; d["type"] = "move_audio_bus";
d["index"] = get_index(); d["index"] = get_index();
if (get_index() < AudioServer::get_singleton()->get_bus_count() - 1) {
emit_signal("drop_end_request"); emit_signal("drop_end_request");
}
return d; return d;
} }
bool EditorAudioBus::can_drop_data(const Point2 &p_point, const Variant &p_data) const { bool EditorAudioBus::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
if (get_index() == 0) if (get_index() == 0) {
return false; return false;
}
Dictionary d = p_data; Dictionary d = p_data;
if (d.has("type") && String(d["type"]) == "move_audio_bus") { if (d.has("type") && String(d["type"]) == "move_audio_bus" && (int)d["index"] != get_index()) {
hovering_drop = true;
return true; return true;
} }
return false; return false;
} }
void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) { void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) {
Dictionary d = p_data; Dictionary d = p_data;
@ -589,7 +612,6 @@ Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from)
} }
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() == Variant::INT) { if (md.get_type() == Variant::INT) {
Dictionary fxd; Dictionary fxd;
fxd["type"] = "audio_bus_effect"; fxd["type"] = "audio_bus_effect";
@ -749,6 +771,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
buses = p_buses; buses = p_buses;
updating_bus = false; updating_bus = false;
is_master = p_is_master; is_master = p_is_master;
hovering_drop = false;
set_tooltip(TTR("Audio Bus, Drag and Drop to rearrange.")); set_tooltip(TTR("Audio Bus, Drag and Drop to rearrange."));
@ -756,7 +779,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
add_child(vb); add_child(vb);
set_v_size_flags(SIZE_EXPAND_FILL); set_v_size_flags(SIZE_EXPAND_FILL);
set_custom_minimum_size(Size2(110, 0) * EDSCALE);
track_name = memnew(LineEdit); track_name = memnew(LineEdit);
track_name->connect("text_entered", this, "_name_changed"); track_name->connect("text_entered", this, "_name_changed");
@ -800,7 +822,9 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
child->add_style_override("pressed", sbempty); child->add_style_override("pressed", sbempty);
} }
vb->add_child(memnew(HSeparator)); HSeparator *separator = memnew(HSeparator);
separator->set_mouse_filter(MOUSE_FILTER_PASS);
vb->add_child(separator);
HBoxContainer *hb = memnew(HBoxContainer); HBoxContainer *hb = memnew(HBoxContainer);
vb->add_child(hb); vb->add_child(hb);
@ -811,7 +835,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
slider->set_clip_contents(false); slider->set_clip_contents(false);
audio_value_preview_box = memnew(Panel); audio_value_preview_box = memnew(Panel);
{
HBoxContainer *audioprev_hbc = memnew(HBoxContainer); HBoxContainer *audioprev_hbc = memnew(HBoxContainer);
audioprev_hbc->set_v_size_flags(SIZE_EXPAND_FILL); audioprev_hbc->set_v_size_flags(SIZE_EXPAND_FILL);
audioprev_hbc->set_h_size_flags(SIZE_EXPAND_FILL); audioprev_hbc->set_h_size_flags(SIZE_EXPAND_FILL);
@ -824,7 +847,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
audio_value_preview_label->set_mouse_filter(MOUSE_FILTER_PASS); audio_value_preview_label->set_mouse_filter(MOUSE_FILTER_PASS);
audioprev_hbc->add_child(audio_value_preview_label); audioprev_hbc->add_child(audio_value_preview_label);
}
slider->add_child(audio_value_preview_box); slider->add_child(audio_value_preview_box);
audio_value_preview_box->set_as_toplevel(true); audio_value_preview_box->set_as_toplevel(true);
Ref<StyleBoxFlat> panel_style = memnew(StyleBoxFlat); Ref<StyleBoxFlat> panel_style = memnew(StyleBoxFlat);
@ -863,17 +886,18 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
channel[i].peak_r = 0.0f; channel[i].peak_r = 0.0f;
} }
scale = memnew(EditorAudioMeterNotches); EditorAudioMeterNotches *scale = memnew(EditorAudioMeterNotches);
for (float db = 6.0f; db >= -80.0f; db -= 6.0f) { for (float db = 6.0f; db >= -80.0f; db -= 6.0f) {
bool renderNotch = (db >= -6.0f || db == -24.0f || db == -72.0f); bool renderNotch = (db >= -6.0f || db == -24.0f || db == -72.0f);
scale->add_notch(_scaled_db_to_normalized_volume(db), db, renderNotch); scale->add_notch(_scaled_db_to_normalized_volume(db), db, renderNotch);
} }
scale->set_mouse_filter(MOUSE_FILTER_PASS);
hb->add_child(scale); hb->add_child(scale);
effects = memnew(Tree); effects = memnew(Tree);
effects->set_hide_root(true); effects->set_hide_root(true);
effects->set_custom_minimum_size(Size2(0, 100) * EDSCALE); effects->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
effects->set_hide_folding(true); effects->set_hide_folding(true);
effects->set_v_size_flags(SIZE_EXPAND_FILL); effects->set_v_size_flags(SIZE_EXPAND_FILL);
vb->add_child(effects); vb->add_child(effects);
@ -923,6 +947,36 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
delete_effect_popup->connect("index_pressed", this, "_delete_effect_pressed"); delete_effect_popup->connect("index_pressed", this, "_delete_effect_pressed");
} }
void EditorAudioBusDrop::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_DRAW: {
draw_style_box(get_stylebox("normal", "Button"), Rect2(Vector2(), get_size()));
if (hovering_drop) {
Color accent = get_color("accent_color", "Editor");
accent.a *= 0.7;
draw_rect(Rect2(Point2(), get_size()), accent, false);
}
} break;
case NOTIFICATION_MOUSE_ENTER: {
if (!hovering_drop) {
hovering_drop = true;
update();
}
} break;
case NOTIFICATION_MOUSE_EXIT:
case NOTIFICATION_DRAG_END: {
if (hovering_drop) {
hovering_drop = false;
update();
}
} break;
}
}
bool EditorAudioBusDrop::can_drop_data(const Point2 &p_point, const Variant &p_data) const { bool EditorAudioBusDrop::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
Dictionary d = p_data; Dictionary d = p_data;
@ -932,10 +986,11 @@ bool EditorAudioBusDrop::can_drop_data(const Point2 &p_point, const Variant &p_d
return false; return false;
} }
void EditorAudioBusDrop::drop_data(const Point2 &p_point, const Variant &p_data) { void EditorAudioBusDrop::drop_data(const Point2 &p_point, const Variant &p_data) {
Dictionary d = p_data; Dictionary d = p_data;
emit_signal("dropped", d["index"], -1); emit_signal("dropped", d["index"], AudioServer::get_singleton()->get_bus_count());
} }
void EditorAudioBusDrop::_bind_methods() { void EditorAudioBusDrop::_bind_methods() {
@ -944,6 +999,8 @@ void EditorAudioBusDrop::_bind_methods() {
} }
EditorAudioBusDrop::EditorAudioBusDrop() { EditorAudioBusDrop::EditorAudioBusDrop() {
hovering_drop = false;
} }
void EditorAudioBuses::_update_buses() { void EditorAudioBuses::_update_buses() {
@ -976,20 +1033,26 @@ EditorAudioBuses *EditorAudioBuses::register_editor() {
void EditorAudioBuses::_notification(int p_what) { void EditorAudioBuses::_notification(int p_what) {
if (p_what == NOTIFICATION_READY) { switch (p_what) {
_update_buses(); case NOTIFICATION_ENTER_TREE:
} case NOTIFICATION_THEME_CHANGED: {
bus_scroll->add_style_override("bg", get_stylebox("bg", "Tree"));
} break;
case NOTIFICATION_READY: {
_update_buses();
} break;
case NOTIFICATION_DRAG_END: {
if (p_what == NOTIFICATION_DRAG_END) {
if (drop_end) { if (drop_end) {
drop_end->queue_delete(); drop_end->queue_delete();
drop_end = NULL; drop_end = NULL;
} }
} } break;
case NOTIFICATION_PROCESS: {
if (p_what == NOTIFICATION_PROCESS) { // Check if anything was edited.
//check if anything was edited
bool edited = AudioServer::get_singleton()->is_edited(); bool edited = AudioServer::get_singleton()->is_edited();
for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) { for (int i = 0; i < AudioServer::get_singleton()->get_bus_count(); i++) {
for (int j = 0; j < AudioServer::get_singleton()->get_bus_effect_count(i); j++) { for (int j = 0; j < AudioServer::get_singleton()->get_bus_effect_count(i); j++) {
@ -1004,9 +1067,9 @@ void EditorAudioBuses::_notification(int p_what) {
AudioServer::get_singleton()->set_edited(false); AudioServer::get_singleton()->set_edited(false);
if (edited) { if (edited) {
save_timer->start(); save_timer->start();
} }
} break;
} }
} }
@ -1014,7 +1077,6 @@ void EditorAudioBuses::_add_bus() {
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
//need to simulate new name, so we can undi :(
ur->create_action(TTR("Add Audio Bus")); ur->create_action(TTR("Add Audio Bus"));
ur->add_do_method(AudioServer::get_singleton(), "set_bus_count", AudioServer::get_singleton()->get_bus_count() + 1); ur->add_do_method(AudioServer::get_singleton(), "set_bus_count", AudioServer::get_singleton()->get_bus_count() + 1);
ur->add_undo_method(AudioServer::get_singleton(), "set_bus_count", AudioServer::get_singleton()->get_bus_count()); ur->add_undo_method(AudioServer::get_singleton(), "set_bus_count", AudioServer::get_singleton()->get_bus_count());
@ -1119,21 +1181,12 @@ void EditorAudioBuses::_request_drop_end() {
void EditorAudioBuses::_drop_at_index(int p_bus, int p_index) { void EditorAudioBuses::_drop_at_index(int p_bus, int p_index) {
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
//need to simulate new name, so we can undi :(
ur->create_action(TTR("Move Audio Bus")); ur->create_action(TTR("Move Audio Bus"));
ur->add_do_method(AudioServer::get_singleton(), "move_bus", p_bus, p_index); ur->add_do_method(AudioServer::get_singleton(), "move_bus", p_bus, p_index);
int final_pos; int real_bus = p_index > p_bus ? p_bus : p_bus + 1;
if (p_index == p_bus) { int real_index = p_index > p_bus ? p_index - 1 : p_index;
final_pos = p_bus; ur->add_undo_method(AudioServer::get_singleton(), "move_bus", real_index, real_bus);
} else if (p_index == -1) {
final_pos = AudioServer::get_singleton()->get_bus_count() - 1;
} else if (p_index < p_bus) {
final_pos = p_index;
} else {
final_pos = p_index - 1;
}
ur->add_undo_method(AudioServer::get_singleton(), "move_bus", final_pos, p_bus);
ur->add_do_method(this, "_update_buses"); ur->add_do_method(this, "_update_buses");
ur->add_undo_method(this, "_update_buses"); ur->add_undo_method(this, "_update_buses");
@ -1189,7 +1242,7 @@ void EditorAudioBuses::_load_default_layout() {
} }
edited_path = layout_path; edited_path = layout_path;
file->set_text(layout_path.get_file()); file->set_text(String(TTR("Layout")) + ": " + layout_path.get_file());
AudioServer::get_singleton()->set_bus_layout(state); AudioServer::get_singleton()->set_bus_layout(state);
_update_buses(); _update_buses();
EditorNode::get_singleton()->get_undo_redo()->clear_history(); EditorNode::get_singleton()->get_undo_redo()->clear_history();
@ -1206,7 +1259,7 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
} }
edited_path = p_string; edited_path = p_string;
file->set_text(p_string.get_file()); file->set_text(String(TTR("Layout")) + ": " + p_string.get_file());
AudioServer::get_singleton()->set_bus_layout(state); AudioServer::get_singleton()->set_bus_layout(state);
_update_buses(); _update_buses();
EditorNode::get_singleton()->get_undo_redo()->clear_history(); EditorNode::get_singleton()->get_undo_redo()->clear_history();
@ -1228,7 +1281,7 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
} }
edited_path = p_string; edited_path = p_string;
file->set_text(p_string.get_file()); file->set_text(String(TTR("Layout")) + ": " + p_string.get_file());
_update_buses(); _update_buses();
EditorNode::get_singleton()->get_undo_redo()->clear_history(); EditorNode::get_singleton()->get_undo_redo()->clear_history();
call_deferred("_select_layout"); call_deferred("_select_layout");
@ -1262,19 +1315,20 @@ EditorAudioBuses::EditorAudioBuses() {
top_hb = memnew(HBoxContainer); top_hb = memnew(HBoxContainer);
add_child(top_hb); add_child(top_hb);
file = memnew(ToolButton); file = memnew(Label);
file->set_text("default_bus_layout.tres"); file->set_text(String(TTR("Layout")) + ": " + "default_bus_layout.tres");
file->set_clip_text(true);
file->set_h_size_flags(SIZE_EXPAND_FILL);
top_hb->add_child(file); top_hb->add_child(file);
file->connect("pressed", this, "_select_layout");
add = memnew(Button); add = memnew(Button);
top_hb->add_child(add); top_hb->add_child(add);
add->set_text(TTR("Add Bus")); add->set_text(TTR("Add Bus"));
add->set_tooltip(TTR("Add a new Audio Bus to this layout.")); add->set_tooltip(TTR("Add a new Audio Bus to this layout."));
add->connect("pressed", this, "_add_bus"); add->connect("pressed", this, "_add_bus");
top_hb->add_spacer(); VSeparator *separator = memnew(VSeparator);
top_hb->add_child(separator);
load = memnew(Button); load = memnew(Button);
load->set_text(TTR("Load")); load->set_text(TTR("Load"));
@ -1301,7 +1355,6 @@ EditorAudioBuses::EditorAudioBuses() {
_new->connect("pressed", this, "_new_layout"); _new->connect("pressed", this, "_new_layout");
bus_scroll = memnew(ScrollContainer); bus_scroll = memnew(ScrollContainer);
bus_scroll->add_style_override("panel", memnew(StyleBoxEmpty));
bus_scroll->set_v_size_flags(SIZE_EXPAND_FILL); bus_scroll->set_v_size_flags(SIZE_EXPAND_FILL);
bus_scroll->set_enable_h_scroll(true); bus_scroll->set_enable_h_scroll(true);
bus_scroll->set_enable_v_scroll(false); bus_scroll->set_enable_v_scroll(false);
@ -1377,38 +1430,65 @@ AudioBusesEditorPlugin::AudioBusesEditorPlugin(EditorAudioBuses *p_node) {
AudioBusesEditorPlugin::~AudioBusesEditorPlugin() { AudioBusesEditorPlugin::~AudioBusesEditorPlugin() {
} }
void EditorAudioMeterNotches::add_notch(float normalized_offset, float db_value, bool render_value) { void EditorAudioMeterNotches::add_notch(float p_normalized_offset, float p_db_value, bool p_render_value) {
notches.push_back(AudioNotch(normalized_offset, db_value, render_value));
notches.push_back(AudioNotch(p_normalized_offset, p_db_value, p_render_value));
}
Size2 EditorAudioMeterNotches::get_minimum_size() const {
Ref<Font> font = get_font("font", "Label");
float font_height = font->get_height();
float width = 0;
float height = top_padding + btm_padding;
for (uint8_t i = 0; i < notches.size(); i++) {
if (notches[i].render_db_value) {
width = MAX(width, font->get_string_size(String::num(Math::abs(notches[i].db_value)) + "dB").x);
height += font_height;
}
}
width += line_length + label_space;
return Size2(width, height);
} }
void EditorAudioMeterNotches::_bind_methods() { void EditorAudioMeterNotches::_bind_methods() {
ClassDB::bind_method("add_notch", &EditorAudioMeterNotches::add_notch); ClassDB::bind_method("add_notch", &EditorAudioMeterNotches::add_notch);
ClassDB::bind_method("_draw_audio_notches", &EditorAudioMeterNotches::_draw_audio_notches); ClassDB::bind_method("_draw_audio_notches", &EditorAudioMeterNotches::_draw_audio_notches);
} }
void EditorAudioMeterNotches::_notification(int p_what) { void EditorAudioMeterNotches::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) {
notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1.0f, 1.0f, 1.0f, 0.8f) : Color(0.0f, 0.0f, 0.0f, 0.8f); switch (p_what) {
case NOTIFICATION_THEME_CHANGED: {
notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1, 1, 1) : Color(0, 0, 0);
} break;
case NOTIFICATION_DRAW: {
_draw_audio_notches(); _draw_audio_notches();
} break;
} }
} }
void EditorAudioMeterNotches::_draw_audio_notches() { void EditorAudioMeterNotches::_draw_audio_notches() {
Ref<Font> font = get_font("font", "Label"); Ref<Font> font = get_font("font", "Label");
float font_height = font->get_height(); float font_height = font->get_height();
for (uint8_t i = 0; i < notches.size(); i++) { for (uint8_t i = 0; i < notches.size(); i++) {
AudioNotch n = notches[i]; AudioNotch n = notches[i];
draw_line(Vector2(0.0f, (1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + top_padding), draw_line(Vector2(0, (1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + top_padding),
Vector2(line_length, (1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + top_padding), Vector2(line_length, (1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + top_padding),
notch_color, notch_color,
1.0f); 1);
if (n.render_db_value) { if (n.render_db_value) {
draw_string(font, draw_string(font,
Vector2(line_length + label_space, Vector2(line_length + label_space,
(1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + (font_height / 4) + top_padding), (1.0f - n.relative_position) * (get_size().y - btm_padding - top_padding) + (font_height / 4) + top_padding),
String("{0}dB").format(varray(Math::abs(n.db_value))), String::num(Math::abs(n.db_value)) + "dB",
notch_color); notch_color);
} }
} }
@ -1419,7 +1499,6 @@ EditorAudioMeterNotches::EditorAudioMeterNotches() :
label_space(2.0f), label_space(2.0f),
btm_padding(9.0f), btm_padding(9.0f),
top_padding(5.0f) { top_padding(5.0f) {
this->set_v_size_flags(SIZE_EXPAND_FILL);
this->set_h_size_flags(SIZE_EXPAND_FILL); notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1, 1, 1) : Color(0, 0, 0);
notch_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1.0f, 1.0f, 1.0f, 0.8f) : Color(0.0f, 0.0f, 0.0f, 0.8f);
} }

18
editor/editor_audio_buses.h
View file

@ -72,7 +72,6 @@ class EditorAudioBus : public PanelContainer {
TextureProgress *vu_r; TextureProgress *vu_r;
} channel[CHANNELS_MAX]; } channel[CHANNELS_MAX];
class EditorAudioMeterNotches *scale;
OptionButton *send; OptionButton *send;
PopupMenu *effect_options; PopupMenu *effect_options;
@ -90,8 +89,8 @@ class EditorAudioBus : public PanelContainer {
Tree *effects; Tree *effects;
bool updating_bus; bool updating_bus;
bool is_master; bool is_master;
mutable bool hovering_drop;
void _gui_input(const Ref<InputEvent> &p_event); void _gui_input(const Ref<InputEvent> &p_event);
void _bus_popup_pressed(int p_option); void _bus_popup_pressed(int p_option);
@ -137,15 +136,18 @@ public:
EditorAudioBus(EditorAudioBuses *p_buses = NULL, bool p_is_master = false); EditorAudioBus(EditorAudioBuses *p_buses = NULL, bool p_is_master = false);
}; };
class EditorAudioBusDrop : public Panel { class EditorAudioBusDrop : public Control {
GDCLASS(EditorAudioBusDrop, Panel); GDCLASS(EditorAudioBusDrop, Control);
virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const; virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
virtual void drop_data(const Point2 &p_point, const Variant &p_data); virtual void drop_data(const Point2 &p_point, const Variant &p_data);
mutable bool hovering_drop;
protected: protected:
static void _bind_methods(); static void _bind_methods();
void _notification(int p_what);
public: public:
EditorAudioBusDrop(); EditorAudioBusDrop();
@ -157,13 +159,14 @@ class EditorAudioBuses : public VBoxContainer {
HBoxContainer *top_hb; HBoxContainer *top_hb;
Button *add;
ScrollContainer *bus_scroll; ScrollContainer *bus_scroll;
HBoxContainer *bus_hb; HBoxContainer *bus_hb;
EditorAudioBusDrop *drop_end; EditorAudioBusDrop *drop_end;
Button *file; Label *file;
Button *add;
Button *load; Button *load;
Button *save_as; Button *save_as;
Button *_default; Button *_default;
@ -242,7 +245,8 @@ public:
float top_padding; float top_padding;
Color notch_color; Color notch_color;
void add_notch(float normalized_offset, float db_value, bool render_value = false); void add_notch(float p_normalized_offset, float p_db_value, bool p_render_value = false);
Size2 get_minimum_size() const;
private: private:
static void _bind_methods(); static void _bind_methods();