maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #43896 from RandomShaper/fix_rel_probe_vis

Browse source 
Put misc. 3D tool visible instances on their own layer
This commit is contained in:
Rémi Verschelde 2020-12-03 13:29:16 +01:00 committed by GitHub
parent 5861bac21e 4eb3286230
commit a84ad91280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -2955,11 +2955,11 @@ void Node3DEditorViewport::_menu_option(int p_option) {
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS); int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
bool current = view_menu->get_popup()->is_item_checked(idx); bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current; current = !current;
uint32_t layers = ((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + index)) | (1 << GIZMO_GRID_LAYER) | (1 << MISC_TOOL_LAYER);
if (current) { if (current) {
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER)); layers |= (1 << GIZMO_EDIT_LAYER);
} else {
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + index)) | (1 << GIZMO_GRID_LAYER));
} }
camera->set_cull_mask(layers);
view_menu->get_popup()->set_item_checked(idx, current); view_menu->get_popup()->set_item_checked(idx, current);
} break; } break;
@ -3880,7 +3880,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, Edito
surface->set_clip_contents(true); surface->set_clip_contents(true);
camera = memnew(Camera3D); camera = memnew(Camera3D);
camera->set_disable_gizmo(true); camera->set_disable_gizmo(true);
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + p_index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER)); camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + p_index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER) | (1 << MISC_TOOL_LAYER));
viewport->add_child(camera); viewport->add_child(camera);
camera->make_current(); camera->make_current();
surface->set_focus_mode(FOCUS_ALL); surface->set_focus_mode(FOCUS_ALL);
@ -4499,12 +4499,14 @@ Object *Node3DEditor::_get_editor_data(Object *p_what) {
RS::get_singleton()->instance_geometry_set_cast_shadows_setting( RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
si->sbox_instance, si->sbox_instance,
RS::SHADOW_CASTING_SETTING_OFF); RS::SHADOW_CASTING_SETTING_OFF);
RS::get_singleton()->instance_set_layer_mask(si->sbox_instance, 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
si->sbox_instance_xray = RenderingServer::get_singleton()->instance_create2( si->sbox_instance_xray = RenderingServer::get_singleton()->instance_create2(
selection_box_xray->get_rid(), selection_box_xray->get_rid(),
sp->get_world_3d()->get_scenario()); sp->get_world_3d()->get_scenario());
RS::get_singleton()->instance_geometry_set_cast_shadows_setting( RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
si->sbox_instance_xray, si->sbox_instance_xray,
RS::SHADOW_CASTING_SETTING_OFF); RS::SHADOW_CASTING_SETTING_OFF);
RS::get_singleton()->instance_set_layer_mask(si->sbox_instance_xray, 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
return si; return si;
} }

1
editor/plugins/node_3d_editor_plugin.h
View file

@ -229,6 +229,7 @@ public:
GIZMO_BASE_LAYER = 27, GIZMO_BASE_LAYER = 27,
GIZMO_EDIT_LAYER = 26, GIZMO_EDIT_LAYER = 26,
GIZMO_GRID_LAYER = 25, GIZMO_GRID_LAYER = 25,
MISC_TOOL_LAYER = 24,
FRAME_TIME_HISTORY = 20, FRAME_TIME_HISTORY = 20,
}; };

4
modules/gridmap/grid_map_editor_plugin.cpp
View file

@ -1030,11 +1030,15 @@ void GridMapEditor::_notification(int p_what) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
grid[i] = RS::get_singleton()->mesh_create(); grid[i] = RS::get_singleton()->mesh_create();
grid_instance[i] = RS::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world_3d()->get_scenario()); grid_instance[i] = RS::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world_3d()->get_scenario());
RenderingServer::get_singleton()->instance_set_layer_mask(grid_instance[i], 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
selection_level_instance[i] = RenderingServer::get_singleton()->instance_create2(selection_level_mesh[i], get_tree()->get_root()->get_world_3d()->get_scenario()); selection_level_instance[i] = RenderingServer::get_singleton()->instance_create2(selection_level_mesh[i], get_tree()->get_root()->get_world_3d()->get_scenario());
RenderingServer::get_singleton()->instance_set_layer_mask(selection_level_instance[i], 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
} }
selection_instance = RenderingServer::get_singleton()->instance_create2(selection_mesh, get_tree()->get_root()->get_world_3d()->get_scenario()); selection_instance = RenderingServer::get_singleton()->instance_create2(selection_mesh, get_tree()->get_root()->get_world_3d()->get_scenario());
RenderingServer::get_singleton()->instance_set_layer_mask(selection_instance, 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
paste_instance = RenderingServer::get_singleton()->instance_create2(paste_mesh, get_tree()->get_root()->get_world_3d()->get_scenario()); paste_instance = RenderingServer::get_singleton()->instance_create2(paste_mesh, get_tree()->get_root()->get_world_3d()->get_scenario());
RenderingServer::get_singleton()->instance_set_layer_mask(paste_instance, 1 << Node3DEditorViewport::MISC_TOOL_LAYER);
_update_selection_transform(); _update_selection_transform();
_update_paste_indicator(); _update_paste_indicator();