|
@@ -3729,10 +3729,10 @@ void Node3DEditorViewport::_set_auto_orthogonal() {
|
|
}
|
|
}
|
|
|
|
|
|
void Node3DEditorViewport::_preview_exited_scene() {
|
|
void Node3DEditorViewport::_preview_exited_scene() {
|
|
- preview_camera->disconnect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
|
|
|
|
+ preview_camera->disconnect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
preview_camera->set_pressed(false);
|
|
preview_camera->set_pressed(false);
|
|
_toggle_camera_preview(false);
|
|
_toggle_camera_preview(false);
|
|
- preview_camera->connect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
|
|
|
|
+ preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
view_menu->show();
|
|
view_menu->show();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -4104,8 +4104,8 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
|
|
view_menu->get_popup()->set_item_checked(idx, previewing_cinema);
|
|
view_menu->get_popup()->set_item_checked(idx, previewing_cinema);
|
|
}
|
|
}
|
|
|
|
|
|
- if (preview_camera->is_connected("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview))) {
|
|
|
|
- preview_camera->disconnect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
|
|
|
|
+ if (preview_camera->is_connected(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview))) {
|
|
|
|
+ preview_camera->disconnect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
}
|
|
}
|
|
if (p_state.has("previewing")) {
|
|
if (p_state.has("previewing")) {
|
|
Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
|
|
Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
|
|
@@ -4118,7 +4118,7 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
|
|
preview_camera->show();
|
|
preview_camera->show();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- preview_camera->connect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
|
|
|
|
+ preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
}
|
|
}
|
|
|
|
|
|
Dictionary Node3DEditorViewport::get_state() const {
|
|
Dictionary Node3DEditorViewport::get_state() const {
|
|
@@ -5466,7 +5466,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
|
|
vbox->add_child(preview_camera);
|
|
vbox->add_child(preview_camera);
|
|
preview_camera->set_h_size_flags(0);
|
|
preview_camera->set_h_size_flags(0);
|
|
preview_camera->hide();
|
|
preview_camera->hide();
|
|
- preview_camera->connect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
|
|
|
|
+ preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
|
|
previewing = nullptr;
|
|
previewing = nullptr;
|
|
gizmo_scale = 1.0;
|
|
gizmo_scale = 1.0;
|
|
|
|
|
|
@@ -8681,7 +8681,7 @@ Node3DEditor::Node3DEditor() {
|
|
main_menu_hbox->add_child(tool_option_button[TOOL_OPT_LOCAL_COORDS]);
|
|
main_menu_hbox->add_child(tool_option_button[TOOL_OPT_LOCAL_COORDS]);
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_theme_type_variation("FlatButton");
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_theme_type_variation("FlatButton");
|
|
- tool_option_button[TOOL_OPT_LOCAL_COORDS]->connect("toggled", callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_LOCAL_COORDS));
|
|
|
|
|
|
+ tool_option_button[TOOL_OPT_LOCAL_COORDS]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_LOCAL_COORDS));
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut(ED_SHORTCUT("spatial_editor/local_coords", TTR("Use Local Space"), Key::T));
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut(ED_SHORTCUT("spatial_editor/local_coords", TTR("Use Local Space"), Key::T));
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut_context(this);
|
|
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut_context(this);
|
|
|
|
|
|
@@ -8689,7 +8689,7 @@ Node3DEditor::Node3DEditor() {
|
|
main_menu_hbox->add_child(tool_option_button[TOOL_OPT_USE_SNAP]);
|
|
main_menu_hbox->add_child(tool_option_button[TOOL_OPT_USE_SNAP]);
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_theme_type_variation("FlatButton");
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_theme_type_variation("FlatButton");
|
|
- tool_option_button[TOOL_OPT_USE_SNAP]->connect("toggled", callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_USE_SNAP));
|
|
|
|
|
|
+ tool_option_button[TOOL_OPT_USE_SNAP]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_USE_SNAP));
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut(ED_SHORTCUT("spatial_editor/snap", TTR("Use Snap"), Key::Y));
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut(ED_SHORTCUT("spatial_editor/snap", TTR("Use Snap"), Key::Y));
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut_context(this);
|
|
tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut_context(this);
|
|
|
|
|
|
@@ -8700,7 +8700,7 @@ Node3DEditor::Node3DEditor() {
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_toggle_mode(true);
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_theme_type_variation("FlatButton");
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_theme_type_variation("FlatButton");
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_disabled(true);
|
|
tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_disabled(true);
|
|
- tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->connect("toggled", callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_OVERRIDE_CAMERA));
|
|
|
|
|
|
+ tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_OVERRIDE_CAMERA));
|
|
_update_camera_override_button(false);
|
|
_update_camera_override_button(false);
|
|
|
|
|
|
main_menu_hbox->add_child(memnew(VSeparator));
|
|
main_menu_hbox->add_child(memnew(VSeparator));
|