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

Update snap setting only with OK 

restore previous values with cancel

(cherry picked from commit 667a981d4d)
This commit is contained in:
volzhs 2020-03-09 04:31:11 +09:00 committed by Rémi Verschelde
parent 5798c8135f
commit 644d49b156
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
editor/plugins/spatial_editor_plugin.cpp
View File

@ -4504,13 +4504,15 @@ void SpatialEditor::set_state(const Dictionary &p_state) {
} }
if (d.has("translate_snap")) if (d.has("translate_snap"))
snap_translate->set_text(d["translate_snap"]); snap_translate_value = d["translate_snap"];
if (d.has("rotate_snap")) if (d.has("rotate_snap"))
snap_rotate->set_text(d["rotate_snap"]); snap_rotate_value = d["rotate_snap"];
if (d.has("scale_snap")) if (d.has("scale_snap"))
snap_scale->set_text(d["scale_snap"]); snap_scale_value = d["scale_snap"];
_snap_update();
if (d.has("local_coords")) { if (d.has("local_coords")) {
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["local_coords"]); tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["local_coords"]);
@ -4617,6 +4619,20 @@ void SpatialEditor::edit(Spatial *p_spatial) {
} }
} }
void SpatialEditor::_snap_changed() {
snap_translate_value = snap_translate->get_text().to_double();
snap_rotate_value = snap_rotate->get_text().to_double();
snap_scale_value = snap_scale->get_text().to_double();
}
void SpatialEditor::_snap_update() {
snap_translate->set_text(String::num(snap_translate_value));
snap_rotate->set_text(String::num(snap_rotate_value));
snap_scale->set_text(String::num(snap_scale_value));
}
void SpatialEditor::_xform_dialog_action() { void SpatialEditor::_xform_dialog_action() {
Transform t; Transform t;
@ -5848,6 +5864,8 @@ void SpatialEditor::_bind_methods() {
ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons); ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons);
ClassDB::bind_method("_update_camera_override_button", &SpatialEditor::_update_camera_override_button); ClassDB::bind_method("_update_camera_override_button", &SpatialEditor::_update_camera_override_button);
ClassDB::bind_method("_update_camera_override_viewport", &SpatialEditor::_update_camera_override_viewport); ClassDB::bind_method("_update_camera_override_viewport", &SpatialEditor::_update_camera_override_viewport);
ClassDB::bind_method("_snap_changed", &SpatialEditor::_snap_changed);
ClassDB::bind_method("_snap_update", &SpatialEditor::_snap_update);
ADD_SIGNAL(MethodInfo("transform_key_request")); ADD_SIGNAL(MethodInfo("transform_key_request"));
ADD_SIGNAL(MethodInfo("item_lock_status_changed")); ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
@ -6106,25 +6124,30 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
/* SNAP DIALOG */ /* SNAP DIALOG */
snap_translate_value = 1;
snap_rotate_value = 15;
snap_scale_value = 10;
snap_dialog = memnew(ConfirmationDialog); snap_dialog = memnew(ConfirmationDialog);
snap_dialog->set_title(TTR("Snap Settings")); snap_dialog->set_title(TTR("Snap Settings"));
add_child(snap_dialog); add_child(snap_dialog);
snap_dialog->connect("confirmed", this, "_snap_changed");
snap_dialog->get_cancel()->connect("pressed", this, "_snap_update");
VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer); VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer);
snap_dialog->add_child(snap_dialog_vbc); snap_dialog->add_child(snap_dialog_vbc);
snap_translate = memnew(LineEdit); snap_translate = memnew(LineEdit);
snap_translate->set_text("1");
snap_dialog_vbc->add_margin_child(TTR("Translate Snap:"), snap_translate); snap_dialog_vbc->add_margin_child(TTR("Translate Snap:"), snap_translate);
snap_rotate = memnew(LineEdit); snap_rotate = memnew(LineEdit);
snap_rotate->set_text("15");
snap_dialog_vbc->add_margin_child(TTR("Rotate Snap (deg.):"), snap_rotate); snap_dialog_vbc->add_margin_child(TTR("Rotate Snap (deg.):"), snap_rotate);
snap_scale = memnew(LineEdit); snap_scale = memnew(LineEdit);
snap_scale->set_text("10");
snap_dialog_vbc->add_margin_child(TTR("Scale Snap (%):"), snap_scale); snap_dialog_vbc->add_margin_child(TTR("Scale Snap (%):"), snap_scale);
_snap_update();
/* SETTINGS DIALOG */ /* SETTINGS DIALOG */
settings_dialog = memnew(ConfirmationDialog); settings_dialog = memnew(ConfirmationDialog);

5
editor/plugins/spatial_editor_plugin.h
View File

@ -579,6 +579,9 @@ private:
Ref<SpatialMaterial> plane_gizmo_color_hl[3]; Ref<SpatialMaterial> plane_gizmo_color_hl[3];
int over_gizmo_handle; int over_gizmo_handle;
float snap_translate_value;
float snap_rotate_value;
float snap_scale_value;
Ref<ArrayMesh> selection_box; Ref<ArrayMesh> selection_box;
RID indicators; RID indicators;
@ -658,6 +661,8 @@ private:
SpinBox *settings_znear; SpinBox *settings_znear;
SpinBox *settings_zfar; SpinBox *settings_zfar;
void _snap_changed();
void _snap_update();
void _xform_dialog_action(); void _xform_dialog_action();
void _menu_item_pressed(int p_option); void _menu_item_pressed(int p_option);
void _menu_item_toggled(bool pressed, int p_option); void _menu_item_toggled(bool pressed, int p_option);