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

Merge pull request #87793 from ryevdokimov/hide-transform-gizmo 

Add ability to hide editor transform gizmo
This commit is contained in:
Rémi Verschelde 2024-08-28 00:10:32 +02:00
parent cf2782911f c9e9bd4a68
commit 48645f3d70
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -1828,7 +1828,9 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
{ {
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS); int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
int idx2 = view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
can_select_gizmos = can_select_gizmos && view_menu->get_popup()->is_item_checked(idx); can_select_gizmos = can_select_gizmos && view_menu->get_popup()->is_item_checked(idx);
transform_gizmo_visible = view_menu->get_popup()->is_item_checked(idx2);
} }
// Gizmo handles // Gizmo handles
@ -3575,6 +3577,15 @@ void Node3DEditorViewport::_menu_option(int p_option) {
view_menu->get_popup()->set_item_checked(idx, current); view_menu->get_popup()->set_item_checked(idx, current);
} break; } break;
case VIEW_TRANSFORM_GIZMO: {
int idx = view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
transform_gizmo_visible = current;
spatial_editor->update_transform_gizmo();
view_menu->get_popup()->set_item_checked(idx, current);
} break;
case VIEW_HALF_RESOLUTION: { case VIEW_HALF_RESOLUTION: {
int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION); int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
bool current = view_menu->get_popup()->is_item_checked(idx); bool current = view_menu->get_popup()->is_item_checked(idx);
@ -3939,7 +3950,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
return; return;
} }
bool show_gizmo = spatial_editor->is_gizmo_visible() && !_edit.instant; bool show_gizmo = spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Transform3D axis_angle; Transform3D axis_angle;
if (xform.basis.get_column(i).normalized().dot(xform.basis.get_column((i + 1) % 3).normalized()) < 1.0) { if (xform.basis.get_column(i).normalized().dot(xform.basis.get_column((i + 1) % 3).normalized()) < 1.0) {
@ -3970,7 +3981,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
xform.orthonormalize(); xform.orthonormalize();
xform.basis.scale(scale); xform.basis.scale(scale);
RenderingServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[3], xform); RenderingServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[3], xform);
RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)); RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && transform_gizmo_visible && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE));
} }
void Node3DEditorViewport::set_state(const Dictionary &p_state) { void Node3DEditorViewport::set_state(const Dictionary &p_state) {
@ -5366,6 +5377,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_separator();
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("View Environment")), VIEW_ENVIRONMENT); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("View Environment")), VIEW_ENVIRONMENT);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("View Gizmos")), VIEW_GIZMOS); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("View Gizmos")), VIEW_GIZMOS);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_transform_gizmo", TTR("View Transform Gizmo")), VIEW_TRANSFORM_GIZMO);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid_lines", TTR("View Grid")), VIEW_GRID); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid_lines", TTR("View Grid")), VIEW_GRID);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTR("View Information")), VIEW_INFORMATION); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTR("View Information")), VIEW_INFORMATION);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTR("View Frame Time")), VIEW_FRAME_TIME); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTR("View Frame Time")), VIEW_FRAME_TIME);
@ -5376,6 +5388,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTR("Audio Listener")), VIEW_AUDIO_LISTENER); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTR("Audio Listener")), VIEW_AUDIO_LISTENER);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_doppler", TTR("Enable Doppler")), VIEW_AUDIO_DOPPLER); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_doppler", TTR("Enable Doppler")), VIEW_AUDIO_DOPPLER);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS), true); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GRID), true); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GRID), true);
view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_separator();

2
editor/plugins/node_3d_editor_plugin.h
View File

@ -125,6 +125,7 @@ class Node3DEditorViewport : public Control {
VIEW_AUDIO_LISTENER, VIEW_AUDIO_LISTENER,
VIEW_AUDIO_DOPPLER, VIEW_AUDIO_DOPPLER,
VIEW_GIZMOS, VIEW_GIZMOS,
VIEW_TRANSFORM_GIZMO,
VIEW_GRID, VIEW_GRID,
VIEW_INFORMATION, VIEW_INFORMATION,
VIEW_FRAME_TIME, VIEW_FRAME_TIME,
@ -243,6 +244,7 @@ private:
bool orthogonal; bool orthogonal;
bool auto_orthogonal; bool auto_orthogonal;
bool lock_rotation; bool lock_rotation;
bool transform_gizmo_visible = true;
real_t gizmo_scale; real_t gizmo_scale;
bool freelook_active; bool freelook_active;