godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Move grid snapping to an independent button

Browse Source
This commit is contained in:
Gilles Roudière
2019-10-10 19:41:45 +02:00
parent 781e4f8673
commit fff953ac8b
2 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -284,7 +284,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig
snap_target[0] = SNAP_TARGET_NONE; snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE; snap_target[1] = SNAP_TARGET_NONE;
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL); bool is_snap_active = smart_snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
// Smart snap using the canvas position // Smart snap using the canvas position
Vector2 output = p_target; Vector2 output = p_target;
@@ -384,7 +384,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig
} }
} }
if (((is_snap_active && snap_grid && (p_modes & SNAP_GRID)) || (p_forced_modes & SNAP_GRID)) && fmod(rotation, (real_t)360.0) == 0.0) { if (((grid_snap_active && (p_modes & SNAP_GRID)) || (p_forced_modes & SNAP_GRID)) && fmod(rotation, (real_t)360.0) == 0.0) {
// Grid // Grid
Point2 offset = grid_offset; Point2 offset = grid_offset;
if (snap_relative) { if (snap_relative) {
@@ -412,7 +412,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig
} }
float CanvasItemEditor::snap_angle(float p_target, float p_start) const { float CanvasItemEditor::snap_angle(float p_target, float p_start) const {
return (((snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL)) && snap_rotation_step != 0) ? Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset : p_target; return (((smart_snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL)) && snap_rotation_step != 0) ? Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset : p_target;
} }
void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
@@ -427,11 +427,11 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
} }
if (k->is_pressed() && !k->get_control() && !k->is_echo()) { if (k->is_pressed() && !k->get_control() && !k->is_echo()) {
if ((snap_grid || show_grid) && multiply_grid_step_shortcut.is_valid() && multiply_grid_step_shortcut->is_shortcut(p_ev)) { if ((grid_snap_active || show_grid) && multiply_grid_step_shortcut.is_valid() && multiply_grid_step_shortcut->is_shortcut(p_ev)) {
// Multiply the grid size // Multiply the grid size
grid_step_multiplier = MIN(grid_step_multiplier + 1, 12); grid_step_multiplier = MIN(grid_step_multiplier + 1, 12);
viewport->update(); viewport->update();
} else if ((snap_grid || show_grid) && divide_grid_step_shortcut.is_valid() && divide_grid_step_shortcut->is_shortcut(p_ev)) { } else if ((grid_snap_active || show_grid) && divide_grid_step_shortcut.is_valid() && divide_grid_step_shortcut->is_shortcut(p_ev)) {
// Divide the grid size // Divide the grid size
Point2 new_grid_step = grid_step * Math::pow(2.0, grid_step_multiplier - 1); Point2 new_grid_step = grid_step * Math::pow(2.0, grid_step_multiplier - 1);
if (new_grid_step.x >= 1.0 && new_grid_step.y >= 1.0) if (new_grid_step.x >= 1.0 && new_grid_step.y >= 1.0)
@@ -2287,7 +2287,7 @@ bool CanvasItemEditor::_gui_input_ruler_tool(const Ref<InputEvent> &p_event) {
return true; return true;
} }
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL); bool is_snap_active = smart_snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
if (m.is_valid() && (ruler_tool_active || (is_snap_active && previous_origin != ruler_tool_origin))) { if (m.is_valid() && (ruler_tool_active || (is_snap_active && previous_origin != ruler_tool_origin))) {
@@ -2558,11 +2558,10 @@ void CanvasItemEditor::_draw_rulers() {
Color font_color = get_color("font_color", "Editor"); Color font_color = get_color("font_color", "Editor");
font_color.a = 0.8; font_color.a = 0.8;
Ref<Font> font = get_font("rulers", "EditorFonts"); Ref<Font> font = get_font("rulers", "EditorFonts");
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
// The rule transform // The rule transform
Transform2D ruler_transform = Transform2D(); Transform2D ruler_transform = Transform2D();
if (show_grid || (is_snap_active && snap_grid)) { if (show_grid || grid_snap_active) {
List<CanvasItem *> selection = _get_edited_canvas_items(); List<CanvasItem *> selection = _get_edited_canvas_items();
if (snap_relative && selection.size() > 0) { if (snap_relative && selection.size() > 0) {
ruler_transform.translate(_get_encompassing_rect_from_list(selection).position); ruler_transform.translate(_get_encompassing_rect_from_list(selection).position);
@@ -2642,7 +2641,7 @@ void CanvasItemEditor::_draw_rulers() {
} }
void CanvasItemEditor::_draw_grid() { void CanvasItemEditor::_draw_grid() {
if (show_grid) { if (show_grid || grid_snap_active) {
//Draw the grid //Draw the grid
Size2 s = viewport->get_size(); Size2 s = viewport->get_size();
int last_cell = 0; int last_cell = 0;
@@ -2688,7 +2687,7 @@ void CanvasItemEditor::_draw_ruler_tool() {
if (tool != TOOL_RULER) if (tool != TOOL_RULER)
return; return;
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL); bool is_snap_active = smart_snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
if (ruler_tool_active) { if (ruler_tool_active) {
Color ruler_primary_color = get_color("accent_color", "Editor"); Color ruler_primary_color = get_color("accent_color", "Editor");
@@ -3697,7 +3696,8 @@ void CanvasItemEditor::_notification(int p_what) {
move_button->set_icon(get_icon("ToolMove", "EditorIcons")); move_button->set_icon(get_icon("ToolMove", "EditorIcons"));
scale_button->set_icon(get_icon("ToolScale", "EditorIcons")); scale_button->set_icon(get_icon("ToolScale", "EditorIcons"));
rotate_button->set_icon(get_icon("ToolRotate", "EditorIcons")); rotate_button->set_icon(get_icon("ToolRotate", "EditorIcons"));
snap_button->set_icon(get_icon("Snap", "EditorIcons")); smart_snap_button->set_icon(get_icon("Snap", "EditorIcons"));
grid_snap_button->set_icon(get_icon("SnapGrid", "EditorIcons"));
snap_config_menu->set_icon(get_icon("GuiTabMenu", "EditorIcons")); snap_config_menu->set_icon(get_icon("GuiTabMenu", "EditorIcons"));
skeleton_menu->set_icon(get_icon("Bone", "EditorIcons")); skeleton_menu->set_icon(get_icon("Bone", "EditorIcons"));
pan_button->set_icon(get_icon("ToolPan", "EditorIcons")); pan_button->set_icon(get_icon("ToolPan", "EditorIcons"));
@@ -4101,8 +4101,13 @@ void CanvasItemEditor::_button_zoom_plus() {
_zoom_on_position(zoom * Math_SQRT2, viewport_scrollable->get_size() / 2.0); _zoom_on_position(zoom * Math_SQRT2, viewport_scrollable->get_size() / 2.0);
} }
void CanvasItemEditor::_button_toggle_snap(bool p_status) { void CanvasItemEditor::_button_toggle_smart_snap(bool p_status) {
snap_active = p_status; smart_snap_active = p_status;
viewport->update();
}
void CanvasItemEditor::_button_toggle_grid_snap(bool p_status) {
grid_snap_active = p_status;
viewport->update(); viewport->update();
} }
@@ -4261,11 +4266,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_GUIDES); int idx = smartsnap_config_popup->get_item_index(SNAP_USE_GUIDES);
smartsnap_config_popup->set_item_checked(idx, snap_guides); smartsnap_config_popup->set_item_checked(idx, snap_guides);
} break; } break;
case SNAP_USE_GRID: {
snap_grid = !snap_grid;
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_GRID);
snap_config_menu->get_popup()->set_item_checked(idx, snap_grid);
} break;
case SNAP_USE_ROTATION: { case SNAP_USE_ROTATION: {
snap_rotation = !snap_rotation; snap_rotation = !snap_rotation;
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION); int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION);
@@ -4797,7 +4797,8 @@ void CanvasItemEditor::_bind_methods() {
ClassDB::bind_method("_button_zoom_minus", &CanvasItemEditor::_button_zoom_minus); ClassDB::bind_method("_button_zoom_minus", &CanvasItemEditor::_button_zoom_minus);
ClassDB::bind_method("_button_zoom_reset", &CanvasItemEditor::_button_zoom_reset); ClassDB::bind_method("_button_zoom_reset", &CanvasItemEditor::_button_zoom_reset);
ClassDB::bind_method("_button_zoom_plus", &CanvasItemEditor::_button_zoom_plus); ClassDB::bind_method("_button_zoom_plus", &CanvasItemEditor::_button_zoom_plus);
ClassDB::bind_method("_button_toggle_snap", &CanvasItemEditor::_button_toggle_snap); ClassDB::bind_method("_button_toggle_smart_snap", &CanvasItemEditor::_button_toggle_smart_snap);
ClassDB::bind_method("_button_toggle_grid_snap", &CanvasItemEditor::_button_toggle_grid_snap);
ClassDB::bind_method("_button_toggle_anchor_mode", &CanvasItemEditor::_button_toggle_anchor_mode); ClassDB::bind_method("_button_toggle_anchor_mode", &CanvasItemEditor::_button_toggle_anchor_mode);
ClassDB::bind_method("_update_scroll", &CanvasItemEditor::_update_scroll); ClassDB::bind_method("_update_scroll", &CanvasItemEditor::_update_scroll);
ClassDB::bind_method("_update_scrollbars", &CanvasItemEditor::_update_scrollbars); ClassDB::bind_method("_update_scrollbars", &CanvasItemEditor::_update_scrollbars);
@@ -4832,13 +4833,13 @@ Dictionary CanvasItemEditor::get_state() const {
state["grid_step"] = grid_step; state["grid_step"] = grid_step;
state["snap_rotation_offset"] = snap_rotation_offset; state["snap_rotation_offset"] = snap_rotation_offset;
state["snap_rotation_step"] = snap_rotation_step; state["snap_rotation_step"] = snap_rotation_step;
state["snap_active"] = snap_active; state["smart_snap_active"] = smart_snap_active;
state["grid_snap_active"] = grid_snap_active;
state["snap_node_parent"] = snap_node_parent; state["snap_node_parent"] = snap_node_parent;
state["snap_node_anchors"] = snap_node_anchors; state["snap_node_anchors"] = snap_node_anchors;
state["snap_node_sides"] = snap_node_sides; state["snap_node_sides"] = snap_node_sides;
state["snap_node_center"] = snap_node_center; state["snap_node_center"] = snap_node_center;
state["snap_other_nodes"] = snap_other_nodes; state["snap_other_nodes"] = snap_other_nodes;
state["snap_grid"] = snap_grid;
state["snap_guides"] = snap_guides; state["snap_guides"] = snap_guides;
state["show_grid"] = show_grid; state["show_grid"] = show_grid;
state["show_origin"] = show_origin; state["show_origin"] = show_origin;
@@ -4886,9 +4887,14 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
snap_rotation_offset = state["snap_rotation_offset"]; snap_rotation_offset = state["snap_rotation_offset"];
} }
if (state.has("snap_active")) { if (state.has("smart_snap_active")) {
snap_active = state["snap_active"]; smart_snap_active = state["smart_snap_active"];
snap_button->set_pressed(snap_active); smart_snap_button->set_pressed(smart_snap_active);
}
if (state.has("grid_snap_active")) {
grid_snap_active = state["grid_snap_active"];
grid_snap_button->set_pressed(smart_snap_active);
} }
if (state.has("snap_node_parent")) { if (state.has("snap_node_parent")) {
@@ -4927,12 +4933,6 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
smartsnap_config_popup->set_item_checked(idx, snap_guides); smartsnap_config_popup->set_item_checked(idx, snap_guides);
} }
if (state.has("snap_grid")) {
snap_grid = state["snap_grid"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_GRID);
snap_config_menu->get_popup()->set_item_checked(idx, snap_grid);
}
if (state.has("show_grid")) { if (state.has("show_grid")) {
show_grid = state["show_grid"]; show_grid = state["show_grid"];
int idx = view_menu->get_popup()->get_item_index(SHOW_GRID); int idx = view_menu->get_popup()->get_item_index(SHOW_GRID);
@@ -5071,13 +5071,13 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
grid_step_multiplier = 0; grid_step_multiplier = 0;
snap_rotation_offset = 0; snap_rotation_offset = 0;
snap_rotation_step = 15 / (180 / Math_PI); snap_rotation_step = 15 / (180 / Math_PI);
snap_active = false; smart_snap_active = false;
grid_snap_active = false;
snap_node_parent = true; snap_node_parent = true;
snap_node_anchors = true; snap_node_anchors = true;
snap_node_sides = true; snap_node_sides = true;
snap_node_center = true; snap_node_center = true;
snap_other_nodes = true; snap_other_nodes = true;
snap_grid = true;
snap_guides = true; snap_guides = true;
snap_rotation = false; snap_rotation = false;
snap_relative = false; snap_relative = false;
@@ -5269,12 +5269,19 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
hb->add_child(memnew(VSeparator)); hb->add_child(memnew(VSeparator));
snap_button = memnew(ToolButton); smart_snap_button = memnew(ToolButton);
hb->add_child(snap_button); hb->add_child(smart_snap_button);
snap_button->set_toggle_mode(true); smart_snap_button->set_toggle_mode(true);
snap_button->connect("toggled", this, "_button_toggle_snap"); smart_snap_button->connect("toggled", this, "_button_toggle_smart_snap");
snap_button->set_tooltip(TTR("Toggle snapping.")); smart_snap_button->set_tooltip(TTR("Toggle smart snapping."));
snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_MASK_SHIFT | KEY_S)); smart_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_smart_snap", TTR("Use Smart Snap"), KEY_MASK_SHIFT | KEY_S));
grid_snap_button = memnew(ToolButton);
hb->add_child(grid_snap_button);
grid_snap_button->set_toggle_mode(true);
grid_snap_button->connect("toggled", this, "_button_toggle_grid_snap");
grid_snap_button->set_tooltip(TTR("Toggle grid snapping."));
grid_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_grid_snap", TTR("Use Grid Snap"), KEY_MASK_SHIFT | KEY_G));
snap_config_menu = memnew(MenuButton); snap_config_menu = memnew(MenuButton);
hb->add_child(snap_config_menu); hb->add_child(snap_config_menu);
@@ -5285,7 +5292,6 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
PopupMenu *p = snap_config_menu->get_popup(); PopupMenu *p = snap_config_menu->get_popup();
p->connect("id_pressed", this, "_popup_callback"); p->connect("id_pressed", this, "_popup_callback");
p->set_hide_on_checkable_item_selection(false); p->set_hide_on_checkable_item_selection(false);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_grid", TTR("Snap to Grid")), SNAP_USE_GRID);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_rotation_snap", TTR("Use Rotation Snap")), SNAP_USE_ROTATION); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_rotation_snap", TTR("Use Rotation Snap")), SNAP_USE_ROTATION);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_relative", TTR("Snap Relative")), SNAP_RELATIVE); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_relative", TTR("Snap Relative")), SNAP_RELATIVE);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_pixel_snap", TTR("Use Pixel Snap")), SNAP_USE_PIXEL); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_pixel_snap", TTR("Use Pixel Snap")), SNAP_USE_PIXEL);
@@ -5357,7 +5363,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
p = view_menu->get_popup(); p = view_menu->get_popup();
p->set_hide_on_checkable_item_selection(false); p->set_hide_on_checkable_item_selection(false);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Show Grid"), KEY_G), SHOW_GRID); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Always Show Grid"), KEY_G), SHOW_GRID);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTR("Show Helpers"), KEY_H), SHOW_HELPERS); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTR("Show Helpers"), KEY_H), SHOW_HELPERS);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTR("Show Rulers")), SHOW_RULERS); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTR("Show Rulers")), SHOW_RULERS);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), KEY_Y), SHOW_GUIDES); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), KEY_Y), SHOW_GUIDES);

11
editor/plugins/canvas_item_editor_plugin.h
View File

@@ -259,13 +259,14 @@ private:
float snap_rotation_step; float snap_rotation_step;
float snap_rotation_offset; float snap_rotation_offset;
bool snap_active; bool smart_snap_active;
bool grid_snap_active;
bool snap_node_parent; bool snap_node_parent;
bool snap_node_anchors; bool snap_node_anchors;
bool snap_node_sides; bool snap_node_sides;
bool snap_node_center; bool snap_node_center;
bool snap_other_nodes; bool snap_other_nodes;
bool snap_grid;
bool snap_guides; bool snap_guides;
bool snap_rotation; bool snap_rotation;
bool snap_relative; bool snap_relative;
@@ -347,7 +348,8 @@ private:
ToolButton *ruler_button; ToolButton *ruler_button;
ToolButton *snap_button; ToolButton *smart_snap_button;
ToolButton *grid_snap_button;
MenuButton *snap_config_menu; MenuButton *snap_config_menu;
PopupMenu *smartsnap_config_popup; PopupMenu *smartsnap_config_popup;
@@ -529,7 +531,8 @@ private:
void _button_zoom_minus(); void _button_zoom_minus();
void _button_zoom_reset(); void _button_zoom_reset();
void _button_zoom_plus(); void _button_zoom_plus();
void _button_toggle_snap(bool p_status); void _button_toggle_smart_snap(bool p_status);
void _button_toggle_grid_snap(bool p_status);
void _button_tool_select(int p_index); void _button_tool_select(int p_index);
HSplitContainer *palette_split; HSplitContainer *palette_split;