godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #102176 from ryevdokimov/fix-local-space-gizmo-basis

Browse Source 
Add "active" state to one of the multiple selected Node3Ds to determine basis in Local mode
This commit is contained in:
Thaddeus Crews
2025-03-11 16:54:00 -05:00
parent 69529ff0aa 5878b880ae
commit 37fed7790e
4 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -791,8 +791,12 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
if (p_allow_locked || (selected != nullptr && !_is_node_locked(selected))) {
if (clicked_wants_append) {
Node *active_node = editor_selection->get_selected_node_list().is_empty() ? nullptr : editor_selection->get_selected_node_list().back()->get();
if (editor_selection->is_selected(selected)) {
editor_selection->remove_node(selected);
if (selected != active_node) {
editor_selection->add_node(selected);
}
} else {
editor_selection->add_node(selected);
}
@@ -6242,7 +6246,7 @@ void Node3DEditor::update_transform_gizmo() {
for (const KeyValue<int, Transform3D> &E : se->subgizmos) {
Transform3D xf = se->sp->get_global_transform() * se->gizmo->get_subgizmo_transform(E.key);
gizmo_center += xf.origin;
if (count == 0 && local_gizmo_coords) {
if ((unsigned int)count == se->subgizmos.size() - 1 && local_gizmo_coords) {
gizmo_basis = xf.basis;
}
count++;
@@ -6266,7 +6270,7 @@ void Node3DEditor::update_transform_gizmo() {
Transform3D xf = sel_item->sp->get_global_transform();
gizmo_center += xf.origin;
if (count == 0 && local_gizmo_coords) {
if (count == selection.size() - 1 && local_gizmo_coords) {
gizmo_basis = xf.basis;
}
count++;
@@ -6275,7 +6279,7 @@ void Node3DEditor::update_transform_gizmo() {
gizmo.visible = count > 0;
gizmo.transform.origin = (count > 0) ? gizmo_center / count : Vector3();
gizmo.transform.basis = (count == 1) ? gizmo_basis : Basis();
gizmo.transform.basis = gizmo_basis;
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
viewports[i]->update_transform_gizmo_view();
@@ -6367,23 +6371,33 @@ void Node3DEditor::_generate_selection_boxes() {
// This lets the user see where the selection is while still having a sense of depth.
Ref<SurfaceTool> st = memnew(SurfaceTool);
Ref<SurfaceTool> st_xray = memnew(SurfaceTool);
Ref<SurfaceTool> active_st = memnew(SurfaceTool);
Ref<SurfaceTool> active_st_xray = memnew(SurfaceTool);
st->begin(Mesh::PRIMITIVE_LINES);
st_xray->begin(Mesh::PRIMITIVE_LINES);
active_st->begin(Mesh::PRIMITIVE_LINES);
active_st_xray->begin(Mesh::PRIMITIVE_LINES);
for (int i = 0; i < 12; i++) {
Vector3 a, b;
aabb.get_edge(i, a, b);
st->add_vertex(a);
st->add_vertex(b);
active_st->add_vertex(a);
active_st->add_vertex(b);
st_xray->add_vertex(a);
st_xray->add_vertex(b);
active_st_xray->add_vertex(a);
active_st_xray->add_vertex(b);
}
const Color selection_box_color = EDITOR_GET("editors/3d/selection_box_color");
const Color active_selection_box_color = EDITOR_GET("editors/3d/active_selection_box_color");
Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
const Color selection_box_color = EDITOR_GET("editors/3d/selection_box_color");
mat->set_albedo(selection_box_color);
mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
st->set_material(mat);
@@ -6397,6 +6411,23 @@ void Node3DEditor::_generate_selection_boxes() {
mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
st_xray->set_material(mat_xray);
selection_box_xray = st_xray->commit();
Ref<StandardMaterial3D> active_mat = memnew(StandardMaterial3D);
active_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
active_mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
active_mat->set_albedo(active_selection_box_color);
active_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
active_st->set_material(active_mat);
active_selection_box = active_st->commit();
Ref<StandardMaterial3D> active_mat_xray = memnew(StandardMaterial3D);
active_mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
active_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
active_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
active_mat_xray->set_albedo(active_selection_box_color * Color(1, 1, 1, 0.15));
active_mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
active_st_xray->set_material(active_mat_xray);
active_selection_box_xray = active_st_xray->commit();
}
Dictionary Node3DEditor::get_state() const {
@@ -7831,6 +7862,33 @@ void Node3DEditor::update_grid() {
void Node3DEditor::_selection_changed() {
_refresh_menu_icons();
const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
for (const KeyValue<Node *, Object *> &E : selection) {
Node3D *sp = Object::cast_to<Node3D>(E.key);
if (!sp) {
continue;
}
Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(sp);
if (!se) {
continue;
}
if (sp == editor_selection->get_selected_node_list().back()->get()) {
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance, active_selection_box->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray, active_selection_box_xray->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_offset, active_selection_box->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray_offset, active_selection_box_xray->get_rid());
} else {
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance, selection_box->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray, selection_box_xray->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_offset, selection_box->get_rid());
RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray_offset, selection_box_xray->get_rid());
}
}
if (selected && editor_selection->get_selected_node_list().size() != 1) {
Vector<Ref<Node3DGizmo>> gizmos = selected->get_gizmos();
for (int i = 0; i < gizmos.size(); i++) {