tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 08:34:43 -04:00
Code Issues Projects Releases Wiki Activity

On merge layer, linked cels on the bottom layer will become unlinked if the top cels have content

Browse source 
Works with UndoRedo too
This commit is contained in:
OverloadedOrama 2020-04-22 16:56:03 +03:00
parent 198fdfb606
commit f7b9d22991
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Scripts/AnimationTimeline.gd
View file

@ -363,6 +363,7 @@ func _on_RemoveLayer_pressed() -> void:
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas]) Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas])
Global.undo_redo.commit_action() Global.undo_redo.commit_action()
func change_layer_order(rate : int) -> void: func change_layer_order(rate : int) -> void:
var change = Global.current_layer + rate var change = Global.current_layer + rate
@ -388,14 +389,14 @@ func change_layer_order(rate : int) -> void:
Global.undo_redo.add_do_method(Global, "redo", [Global.canvas]) Global.undo_redo.add_do_method(Global, "redo", [Global.canvas])
Global.undo_redo.commit_action() Global.undo_redo.commit_action()
func _on_MergeDownLayer_pressed() -> void: func _on_MergeDownLayer_pressed() -> void:
var new_layers : Array = Global.layers.duplicate() var new_layers : Array = Global.layers.duplicate(true)
new_layers.remove(Global.current_layer)
Global.undos += 1 Global.undos += 1
Global.undo_redo.create_action("Merge Layer") Global.undo_redo.create_action("Merge Layer")
for c in Global.canvases: for c in Global.canvases:
var new_layers_canvas : Array = c.layers.duplicate() var new_layers_canvas : Array = c.layers.duplicate(true)
var selected_layer := Image.new() var selected_layer := Image.new()
selected_layer.copy_from(new_layers_canvas[Global.current_layer][0]) selected_layer.copy_from(new_layers_canvas[Global.current_layer][0])
selected_layer.lock() selected_layer.lock()
@ -412,12 +413,20 @@ func _on_MergeDownLayer_pressed() -> void:
new_layer.lock() new_layer.lock()
c.blend_rect(new_layer, selected_layer, Rect2(c.position, c.size), Vector2.ZERO) c.blend_rect(new_layer, selected_layer, Rect2(c.position, c.size), Vector2.ZERO)
new_layers_canvas.remove(Global.current_layer) new_layers_canvas.remove(Global.current_layer)
if !selected_layer.is_invisible() and Global.layers[Global.current_layer - 1][5].size() > 1 and (c in Global.layers[Global.current_layer - 1][5]):
Global.undo_redo.add_do_property(c, "layers", new_layers_canvas) new_layers[Global.current_layer - 1][5].erase(c)
var tex := ImageTexture.new()
tex.create_from_image(new_layer, 0)
new_layers_canvas[Global.current_layer - 1][0] = new_layer
new_layers_canvas[Global.current_layer - 1][1] = tex
else:
Global.undo_redo.add_do_property(c.layers[Global.current_layer - 1][0], "data", new_layer.data) Global.undo_redo.add_do_property(c.layers[Global.current_layer - 1][0], "data", new_layer.data)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Global.undo_redo.add_undo_property(c.layers[Global.current_layer - 1][0], "data", c.layers[Global.current_layer - 1][0].data) Global.undo_redo.add_undo_property(c.layers[Global.current_layer - 1][0], "data", c.layers[Global.current_layer - 1][0].data)
Global.undo_redo.add_do_property(c, "layers", new_layers_canvas)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
new_layers.remove(Global.current_layer)
Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer - 1) Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer - 1)
Global.undo_redo.add_do_property(Global, "layers", new_layers) Global.undo_redo.add_do_property(Global, "layers", new_layers)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers) Global.undo_redo.add_undo_property(Global, "layers", Global.layers)