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

Merge pull request #108549 from ryevdokimov/transform-gizmo-opacity-no-restart

Browse Source 
Do not require editor restart when changing manipulator gizmo opacity setting
This commit is contained in:
Thaddeus Crews
2025-09-22 21:00:52 -05:00
parent c178b063c6 728934f43e
commit 38188881ce
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
editor/scene/3d/node_3d_editor_plugin.cpp
View File

@ -8070,6 +8070,38 @@ void Node3DEditor::_finish_grid() {
}
}
void Node3DEditor::update_gizmo_opacity() {
if (!origin_instance.is_valid()) {
return;
}
const float opacity = EDITOR_GET("editors/3d/manipulator_gizmo_opacity");
for (int i = 0; i < 3; i++) {
Color col = gizmo_color[i]->get_albedo();
col.a = opacity;
gizmo_color[i]->set_albedo(col);
col = gizmo_color_hl[i]->get_albedo();
col.a = 1.0;
gizmo_color_hl[i]->set_albedo(col);
col = plane_gizmo_color[i]->get_albedo();
col.a = opacity;
plane_gizmo_color[i]->set_albedo(col);
col = plane_gizmo_color_hl[i]->get_albedo();
col.a = 1.0;
plane_gizmo_color_hl[i]->set_albedo(col);
}
}
void Node3DEditor::_on_editor_settings_changed() {
if (EditorSettings::get_singleton()->get_changed_settings().has("editors/3d/manipulator_gizmo_opacity")) {
update_gizmo_opacity();
}
}
void Node3DEditor::update_grid() {
const Camera3D::ProjectionType current_projection = viewports[0]->camera->get_projection();
@ -8523,6 +8555,7 @@ void Node3DEditor::_notification(int p_what) {
environ_state->set_custom_minimum_size(environ_vb->get_combined_minimum_size());
ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::update_all_gizmos).bind(Variant()));
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::_on_editor_settings_changed));
} break;
case NOTIFICATION_ACCESSIBILITY_UPDATE: {
@ -8543,6 +8576,7 @@ void Node3DEditor::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: {
_finish_indicators();
EditorSettings::get_singleton()->disconnect("settings_changed", callable_mp(this, &Node3DEditor::_on_editor_settings_changed));
} break;
case NOTIFICATION_THEME_CHANGED: {

2
editor/scene/3d/node_3d_editor_plugin.h
View File

@ -807,6 +807,7 @@ private:
HashMap<Control *, VSeparator *> context_toolbar_separators;
void _update_context_toolbar();
void _on_editor_settings_changed();
void _generate_selection_boxes();
@ -973,6 +974,7 @@ public:
void update_grid();
void update_transform_gizmo();
void update_all_gizmos(Node *p_node = nullptr);
void update_gizmo_opacity();
void snap_selected_nodes_to_floor();
void select_gizmo_highlight_axis(int p_axis);
void set_custom_camera(Node *p_camera) { custom_camera = p_camera; }

2
editor/settings/editor_settings.cpp
View File

@ -948,7 +948,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// 3D: Manipulator
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "editors/3d/manipulator_gizmo_size", 80, "16,160,1");
EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/manipulator_gizmo_opacity", 0.9, "0,1,0.01", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/manipulator_gizmo_opacity", 0.9, "0,1,0.01")
// 2D
_initial_set("editors/2d/grid_color", Color(1.0, 1.0, 1.0, 0.07), true);