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

Minor fixes to Node3DEditorPlugin

Browse Source 
* Change EditorNode3D::update_all_gizmos() to start at the edited scene
  root instead of the whole editor root.
* Call update_all_gizmos() only once at start instead of evrey time a
  gizmo plugin is added.
* Add missing null check.
This commit is contained in:
jfons 2021-07-27 17:43:12 +02:00
parent f32c042f3e
commit 49361034f9
1 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -690,53 +690,55 @@ void Node3DEditorViewport::_select_region() {
Node3D *single_selected = spatial_editor->get_single_selected_node(); Node3D *single_selected = spatial_editor->get_single_selected_node();
Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(single_selected); Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(single_selected);
Ref<EditorNode3DGizmo> old_gizmo; if (se) {
if (!clicked_wants_append) { Ref<EditorNode3DGizmo> old_gizmo;
se->subgizmos.clear(); if (!clicked_wants_append) {
old_gizmo = se->gizmo; se->subgizmos.clear();
se->gizmo.unref(); old_gizmo = se->gizmo;
} se->gizmo.unref();
bool found_subgizmos = false;
Vector<Ref<Node3DGizmo>> gizmos = single_selected->get_gizmos();
for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
if (!seg.is_valid()) {
continue;
} }
if (se->gizmo.is_valid() && se->gizmo != seg) { bool found_subgizmos = false;
continue; Vector<Ref<Node3DGizmo>> gizmos = single_selected->get_gizmos();
} for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
Vector<int> subgizmos = seg->subgizmos_intersect_frustum(camera, frustum); if (!seg.is_valid()) {
if (!subgizmos.is_empty()) { continue;
se->gizmo = seg;
for (int i = 0; i < subgizmos.size(); i++) {
int subgizmo_id = subgizmos[i];
if (!se->subgizmos.has(subgizmo_id)) {
se->subgizmos.insert(subgizmo_id, se->gizmo->get_subgizmo_transform(subgizmo_id));
}
} }
found_subgizmos = true;
break;
}
}
if (!clicked_wants_append || found_subgizmos) { if (se->gizmo.is_valid() && se->gizmo != seg) {
if (se->gizmo.is_valid()) { continue;
se->gizmo->redraw(); }
Vector<int> subgizmos = seg->subgizmos_intersect_frustum(camera, frustum);
if (!subgizmos.is_empty()) {
se->gizmo = seg;
for (int i = 0; i < subgizmos.size(); i++) {
int subgizmo_id = subgizmos[i];
if (!se->subgizmos.has(subgizmo_id)) {
se->subgizmos.insert(subgizmo_id, se->gizmo->get_subgizmo_transform(subgizmo_id));
}
}
found_subgizmos = true;
break;
}
} }
if (old_gizmo != se->gizmo && old_gizmo.is_valid()) { if (!clicked_wants_append || found_subgizmos) {
old_gizmo->redraw(); if (se->gizmo.is_valid()) {
se->gizmo->redraw();
}
if (old_gizmo != se->gizmo && old_gizmo.is_valid()) {
old_gizmo->redraw();
}
spatial_editor->update_transform_gizmo();
} }
spatial_editor->update_transform_gizmo(); if (found_subgizmos) {
} return;
}
if (found_subgizmos) {
return;
} }
} }
@ -4776,13 +4778,13 @@ void _update_all_gizmos(Node *p_node) {
} }
void Node3DEditor::update_all_gizmos(Node *p_node) { void Node3DEditor::update_all_gizmos(Node *p_node) {
if (!p_node && get_tree()) {
p_node = get_tree()->get_edited_scene_root();
}
if (!p_node) { if (!p_node) {
if (SceneTree::get_singleton()) { // No edited scene, so nothing to update.
p_node = SceneTree::get_singleton()->get_root(); return;
} else {
// No scene tree, so nothing to update.
return;
}
} }
_update_all_gizmos(p_node); _update_all_gizmos(p_node);
} }
@ -6591,6 +6593,7 @@ void Node3DEditor::_notification(int p_what) {
_register_all_gizmos(); _register_all_gizmos();
_update_gizmos_menu(); _update_gizmos_menu();
_init_indicators(); _init_indicators();
update_all_gizmos();
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
_finish_indicators(); _finish_indicators();
@ -7724,7 +7727,6 @@ void Node3DEditor::add_gizmo_plugin(Ref<EditorNode3DGizmoPlugin> p_plugin) {
gizmo_plugins_by_name.sort_custom<_GizmoPluginNameComparator>(); gizmo_plugins_by_name.sort_custom<_GizmoPluginNameComparator>();
_update_gizmos_menu(); _update_gizmos_menu();
Node3DEditor::get_singleton()->update_all_gizmos();
} }
void Node3DEditor::remove_gizmo_plugin(Ref<EditorNode3DGizmoPlugin> p_plugin) { void Node3DEditor::remove_gizmo_plugin(Ref<EditorNode3DGizmoPlugin> p_plugin) {