Skip to content

Add tree filtering to Advanced Import Settings #76485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeronimo-schreyer wants to merge 1 commit into from
Closed

Add tree filtering to Advanced Import Settings #76485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 67 additions & 4 deletions editor/import/scene_import_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ void SceneImportSettingsDialog::_fill_scene(Node *p_node, TreeItem *p_parent_ite

Ref<Texture2D> icon = get_editor_theme_icon(type);

current_tree = scene_tree;
tree_filter_edit->clear();
TreeItem *item = scene_tree->create_item(p_parent_item);
item->set_text(0, p_node->get_name());

Expand Down Expand Up @@ -1066,6 +1068,55 @@ void SceneImportSettingsDialog::_viewport_input(const Ref<InputEvent> &p_input)
}
}

void SceneImportSettingsDialog::_tree_filter_edit_changed(const String &p_filter) {
tree_filter = p_filter;
_update_tree_filter(nullptr, true);
}

void SceneImportSettingsDialog::_tree_tab_changed(int p_tab_id) {
current_tree = static_cast<Tree *>(data_mode->get_tab_control(p_tab_id));
_update_tree_filter(nullptr, true);
}

bool SceneImportSettingsDialog::_update_tree_filter(TreeItem *p_parent, bool p_scroll_to_selected) {
if (!p_parent) {
p_parent = current_tree->get_root();
}

if (!p_parent) {
// Tree is empty, nothing to do here.
return false;
}

bool keep_for_children = false;
for (TreeItem *child = p_parent->get_first_child(); child; child = child->get_next()) {
// Always keep if at least one of the children are kept.
keep_for_children = _update_tree_filter(child, p_scroll_to_selected) || keep_for_children;
}

// Now find other reasons to keep this Node, too.
PackedStringArray terms = tree_filter.to_lower().split_spaces();
bool keep = _item_matches_all_terms(p_parent, terms);
p_parent->set_visible(keep_for_children || keep);

return keep || keep_for_children;
}

bool SceneImportSettingsDialog::_item_matches_all_terms(TreeItem *p_item, PackedStringArray p_terms) {
if (p_terms.is_empty()) {
return true;
}

for (int i = 0; i < p_terms.size(); i++) {
String term = p_terms[i];
if (!p_item->get_text(0).to_lower().contains(term)) {
return false;
}
}

return true;
}

void SceneImportSettingsDialog::_re_import() {
HashMap<StringName, Variant> main_settings;

Expand Down Expand Up @@ -1467,15 +1518,27 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
main_vb->add_child(tree_split);
tree_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);

data_mode = memnew(TabContainer);
tree_split->add_child(data_mode);
data_mode->set_custom_minimum_size(Size2(300 * EDSCALE, 0));
data_mode->set_theme_type_variation("TabContainerOdd");
VBoxContainer *data_mode_vbc = memnew(VBoxContainer);
data_mode_vbc->add_theme_constant_override("separate", 0);
tree_split->add_child(data_mode_vbc);

property_split = memnew(HSplitContainer);
tree_split->add_child(property_split);
property_split->set_h_size_flags(Control::SIZE_EXPAND_FILL);

tree_filter_edit = memnew(LineEdit);
tree_filter_edit->set_placeholder(TTR("Filter Nodes"));
tree_filter_edit->add_theme_constant_override("minimum_character_width", 0);
data_mode_vbc->add_child(tree_filter_edit);
tree_filter_edit->connect("text_changed", callable_mp(this, &SceneImportSettingsDialog::_tree_filter_edit_changed));

data_mode = memnew(TabContainer);
data_mode_vbc->add_child(data_mode);
data_mode->set_v_size_flags(Control::SIZE_EXPAND_FILL);
data_mode->set_custom_minimum_size(Size2(300 * EDSCALE, 0));
data_mode->set_theme_type_variation("TabContainerOdd");
data_mode->connect("tab_changed", callable_mp(this, &SceneImportSettingsDialog::_tree_tab_changed));

scene_tree = memnew(Tree);
scene_tree->set_name(TTR("Scene"));
data_mode->add_child(scene_tree);
Expand Down
10 changes: 10 additions & 0 deletions editor/import/scene_import_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class SceneImportSettingsDialog : public ConfirmationDialog {

HSplitContainer *tree_split = nullptr;
HSplitContainer *property_split = nullptr;
LineEdit *tree_filter_edit = nullptr;
TabContainer *data_mode = nullptr;
Tree *scene_tree = nullptr;
Tree *mesh_tree = nullptr;
Expand Down Expand Up @@ -157,6 +158,9 @@ class SceneImportSettingsDialog : public ConfirmationDialog {

String selected_type;
String selected_id;
String tree_filter;

Tree *current_tree = nullptr;

bool selecting = false;

Expand All @@ -177,6 +181,12 @@ class SceneImportSettingsDialog : public ConfirmationDialog {

void _viewport_input(const Ref<InputEvent> &p_input);

void _tree_filter_edit_changed(const String &p_filter);
void _tree_tab_changed(int p_tab_id);
bool _update_tree_filter(TreeItem *p_parent, bool p_scroll_to_selected);

bool _item_matches_all_terms(TreeItem *p_item, PackedStringArray p_terms);

HashMap<StringName, Variant> defaults;

SceneImportSettingsData *scene_import_settings_data = nullptr;
Expand Down