From a9df687db6294679a7f61382a66d53d5df2c9370 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Tue, 18 May 2021 23:38:22 +0200 Subject: [PATCH] Increase the TileSet editor's snap step to 1024 This also tweaks the autotile bitmaks mode property hint string. --- editor/plugins/tile_set_editor_plugin.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index f9d57bc83169..17ab99d28879 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -2340,20 +2340,20 @@ void TileSetEditor::_set_edited_collision_shape(const Ref &p_shape) { } void TileSetEditor::_set_snap_step(Vector2 p_val) { - snap_step.x = CLAMP(p_val.x, 1, 256); - snap_step.y = CLAMP(p_val.y, 1, 256); + snap_step.x = CLAMP(p_val.x, 1, 1024); + snap_step.y = CLAMP(p_val.y, 1, 1024); workspace->update(); } void TileSetEditor::_set_snap_off(Vector2 p_val) { - snap_offset.x = CLAMP(p_val.x, 0, 256 + WORKSPACE_MARGIN.x); - snap_offset.y = CLAMP(p_val.y, 0, 256 + WORKSPACE_MARGIN.y); + snap_offset.x = CLAMP(p_val.x, 0, 1024 + WORKSPACE_MARGIN.x); + snap_offset.y = CLAMP(p_val.y, 0, 1024 + WORKSPACE_MARGIN.y); workspace->update(); } void TileSetEditor::_set_snap_sep(Vector2 p_val) { - snap_separation.x = CLAMP(p_val.x, 0, 256); - snap_separation.y = CLAMP(p_val.y, 0, 256); + snap_separation.x = CLAMP(p_val.x, 0, 1024); + snap_separation.y = CLAMP(p_val.y, 0, 1024); workspace->update(); } @@ -3548,12 +3548,12 @@ void TilesetEditorContext::_get_property_list(List *p_list) const p_list->push_back(PropertyInfo(Variant::COLOR, "tile_modulate")); p_list->push_back(PropertyInfo(Variant::INT, "tile_tile_mode", PROPERTY_HINT_ENUM, "SINGLE_TILE,AUTO_TILE,ATLAS_TILE")); if (tileset->tile_get_tile_mode(id) == TileSet::AUTO_TILE) { - p_list->push_back(PropertyInfo(Variant::INT, "tile_autotile_bitmask_mode", PROPERTY_HINT_ENUM, "2X2,3X3 (minimal),3X3")); + p_list->push_back(PropertyInfo(Variant::INT, "tile_autotile_bitmask_mode", PROPERTY_HINT_ENUM, "2x2,3x3 (minimal),3x3")); p_list->push_back(PropertyInfo(Variant::VECTOR2, "tile_subtile_size")); - p_list->push_back(PropertyInfo(Variant::INT, "tile_subtile_spacing", PROPERTY_HINT_RANGE, "0, 256, 1")); + p_list->push_back(PropertyInfo(Variant::INT, "tile_subtile_spacing", PROPERTY_HINT_RANGE, "0, 1024, 1")); } else if (tileset->tile_get_tile_mode(id) == TileSet::ATLAS_TILE) { p_list->push_back(PropertyInfo(Variant::VECTOR2, "tile_subtile_size")); - p_list->push_back(PropertyInfo(Variant::INT, "tile_subtile_spacing", PROPERTY_HINT_RANGE, "0, 256, 1")); + p_list->push_back(PropertyInfo(Variant::INT, "tile_subtile_spacing", PROPERTY_HINT_RANGE, "0, 1024, 1")); } p_list->push_back(PropertyInfo(Variant::VECTOR2, "tile_occluder_offset")); p_list->push_back(PropertyInfo(Variant::VECTOR2, "tile_navigation_offset"));