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

Merge pull request #67947 from timothyqiu/spatial-gizmo-hide

Browse source 
[3.x] Fix spatial gizmo still active when node is deselected
This commit is contained in:
Rémi Verschelde 2022-10-31 14:00:43 +01:00
commit a7581ed718
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
editor/plugins/spatial_editor_plugin.cpp
View file

@ -6071,6 +6071,20 @@ bool SpatialEditor::is_any_freelook_active() const {
return false; return false;
} }
void SpatialEditor::_selection_changed() {
_refresh_menu_icons();
if (selected && editor_selection->get_selected_node_list().size() != 1) {
Ref<EditorSpatialGizmo> gizmo = selected->get_gizmo();
if (gizmo.is_valid()) {
gizmo->set_selected(false);
selected->update_gizmo();
}
selected = nullptr;
over_gizmo_handle = -1;
}
}
void SpatialEditor::_refresh_menu_icons() { void SpatialEditor::_refresh_menu_icons() {
bool all_locked = true; bool all_locked = true;
bool all_grouped = true; bool all_grouped = true;
@ -6295,7 +6309,7 @@ void SpatialEditor::_notification(int p_what) {
get_tree()->connect("node_removed", this, "_node_removed"); get_tree()->connect("node_removed", this, "_node_removed");
EditorNode::get_singleton()->get_scene_tree_dock()->get_tree_editor()->connect("node_changed", this, "_refresh_menu_icons"); EditorNode::get_singleton()->get_scene_tree_dock()->get_tree_editor()->connect("node_changed", this, "_refresh_menu_icons");
editor_selection->connect("selection_changed", this, "_refresh_menu_icons"); editor_selection->connect("selection_changed", this, "_selection_changed");
editor->connect("stop_pressed", this, "_update_camera_override_button", make_binds(false)); editor->connect("stop_pressed", this, "_update_camera_override_button", make_binds(false));
editor->connect("play_pressed", this, "_update_camera_override_button", make_binds(true)); editor->connect("play_pressed", this, "_update_camera_override_button", make_binds(true));
@ -6534,6 +6548,7 @@ void SpatialEditor::_bind_methods() {
ClassDB::bind_method("_get_editor_data", &SpatialEditor::_get_editor_data); ClassDB::bind_method("_get_editor_data", &SpatialEditor::_get_editor_data);
ClassDB::bind_method("_request_gizmo", &SpatialEditor::_request_gizmo); ClassDB::bind_method("_request_gizmo", &SpatialEditor::_request_gizmo);
ClassDB::bind_method("_toggle_maximize_view", &SpatialEditor::_toggle_maximize_view); ClassDB::bind_method("_toggle_maximize_view", &SpatialEditor::_toggle_maximize_view);
ClassDB::bind_method("_selection_changed", &SpatialEditor::_selection_changed);
ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons); ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons);
ClassDB::bind_method("_update_camera_override_button", &SpatialEditor::_update_camera_override_button); ClassDB::bind_method("_update_camera_override_button", &SpatialEditor::_update_camera_override_button);
ClassDB::bind_method("_update_camera_override_viewport", &SpatialEditor::_update_camera_override_viewport); ClassDB::bind_method("_update_camera_override_viewport", &SpatialEditor::_update_camera_override_viewport);
@ -6995,7 +7010,13 @@ void SpatialEditorPlugin::edit(Object *p_object) {
} }
bool SpatialEditorPlugin::handles(Object *p_object) const { bool SpatialEditorPlugin::handles(Object *p_object) const {
return p_object->is_class("Spatial"); if (p_object->is_class("Spatial")) {
return true;
} else {
// This ensures that gizmos are cleared when selecting a non-Spatial node.
const_cast<SpatialEditorPlugin *>(this)->edit((Object *)nullptr);
return false;
}
} }
Dictionary SpatialEditorPlugin::get_state() const { Dictionary SpatialEditorPlugin::get_state() const {

1
editor/plugins/spatial_editor_plugin.h
View file

@ -752,6 +752,7 @@ private:
bool is_any_freelook_active() const; bool is_any_freelook_active() const;
void _selection_changed();
void _refresh_menu_icons(); void _refresh_menu_icons();
protected: protected: