Added SymmetryGuides

Two special guides - one horizontal and one vertical - that let you change the axis of symmetry for mirroring. On the next commit(s) I will make them visible only if mirroring is toggled on. Almost solves #133
This commit is contained in:
OverloadedOrama 2020-07-16 04:25:59 +03:00
parent 7529e967e3
commit 9fa91ffd8e
7 changed files with 77 additions and 18 deletions

View file

@ -69,8 +69,8 @@ func set_pixel_perfect(value: bool) -> void:
func set_pixel(image: Image, position: Vector2, color: Color) -> void:
var project : Project = Global.current_project
var mirror_x = project.size.x - project.x_symmetry_point - position.x
var mirror_y = project.size.y - project.y_symmetry_point - position.y
var mirror_x = project.x_symmetry_point - position.x
var mirror_y = project.y_symmetry_point - position.y
var mirror_x_inside : bool = mirror_x >= project.x_min and mirror_x <= project.x_max - 1
var mirror_y_inside : bool = mirror_y >= project.y_min and mirror_y <= project.y_max - 1

View file

@ -16,8 +16,10 @@ var guides := [] # Array of Guides
var brushes := [] # Array of Images
var x_symmetry_point := -1
var y_symmetry_point := -1
var x_symmetry_point := size.x / 2 + 1
var y_symmetry_point := size.y / 2 + 1
var x_symmetry_axis : SymmetryGuide
var y_symmetry_axis : SymmetryGuide
var x_min := 0
var x_max := 64
var y_min := 0
@ -41,6 +43,22 @@ func _init(_frames := [], _name := tr("untitled")) -> void:
OpenSave.current_save_paths.append("")
OpenSave.backup_save_paths.append("")
if !x_symmetry_axis:
x_symmetry_axis = SymmetryGuide.new()
x_symmetry_axis.type = x_symmetry_axis.Types.HORIZONTAL
x_symmetry_axis.project = self
x_symmetry_axis.add_point(Vector2(-19999, y_symmetry_point))
x_symmetry_axis.add_point(Vector2(19999, y_symmetry_point))
Global.canvas.add_child(x_symmetry_axis)
if !y_symmetry_axis:
y_symmetry_axis = SymmetryGuide.new()
y_symmetry_axis.type = y_symmetry_axis.Types.VERTICAL
y_symmetry_axis.project = self
y_symmetry_axis.add_point(Vector2(x_symmetry_point, -19999))
y_symmetry_axis.add_point(Vector2(x_symmetry_point, 19999))
Global.canvas.add_child(y_symmetry_axis)
func _set_selected_rect(value : Rect2) -> void:
selected_rect = value
@ -167,6 +185,8 @@ func serialize() -> Dictionary:
var guide_data := []
for guide in guides:
if guide is SymmetryGuide:
continue
var coords = guide.points[0].x
if guide.type == Guide.Types.HORIZONTAL:
coords = guide.points[0].y
@ -200,6 +220,7 @@ func serialize() -> Dictionary:
"layers" : layer_data,
"tags" : tag_data,
"guides" : guide_data,
"symmetry_points" : [x_symmetry_point, y_symmetry_point],
"frames" : frame_data,
"brushes" : brush_data,
}
@ -250,6 +271,13 @@ func deserialize(dict : Dictionary) -> void:
guide.has_focus = false
Global.canvas.add_child(guide)
guides.append(guide)
if dict.has("symmetry_points"):
x_symmetry_point = dict.symmetry_points[0]
y_symmetry_point = dict.symmetry_points[1]
x_symmetry_axis.points[0].y = floor(y_symmetry_point / 2 + 1)
x_symmetry_axis.points[1].y = floor(y_symmetry_point / 2 + 1)
y_symmetry_axis.points[0].x = floor(x_symmetry_point / 2 + 1)
y_symmetry_axis.points[1].x = floor(x_symmetry_point / 2 + 1)
func name_changed(value : String) -> void: