huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Rewrite the crop image method

Browse source 
Should be a bit faster, but I still get weird bugs at random
This commit is contained in:
Manolis Papadeas 2021-07-20 21:30:27 +03:00
parent d0433bed6f
commit 28b8e000f9
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Autoload/DrawingAlgos.gd
View file

@ -256,24 +256,21 @@ func centralize() -> void:
general_undo_centralize() general_undo_centralize()
func crop_image(image : Image) -> void: func crop_image() -> void:
Global.canvas.selection.transform_content_confirm() Global.canvas.selection.transform_content_confirm()
# Use first cel as a starting rectangle # Use first cel as a starting rectangle
var used_rect : Rect2 = image.get_used_rect() var used_rect : Rect2 = Global.current_project.frames[0].cels[0].image.get_used_rect()
for f in Global.current_project.frames: for f in Global.current_project.frames:
# However, if first cel is empty, loop through all cels until we find one that isn't
for cel in f.cels: for cel in f.cels:
if used_rect != Rect2(0, 0, 0, 0): var cel_used_rect : Rect2 = cel.image.get_used_rect()
break if cel_used_rect == Rect2(0, 0, 0, 0): # If the cel has no content
else: continue
if cel.image.get_used_rect() != Rect2(0, 0, 0, 0):
used_rect = cel.image.get_used_rect()
# Merge all layers with content if used_rect == Rect2(0, 0, 0, 0): # If we still haven't found the first cel with content
for cel in f.cels: used_rect = cel_used_rect
if cel.image.get_used_rect() != Rect2(0, 0, 0, 0): else:
used_rect = used_rect.merge(cel.image.get_used_rect()) used_rect = used_rect.merge(cel_used_rect)
# If no layer has any content, just return # If no layer has any content, just return
if used_rect == Rect2(0, 0, 0, 0): if used_rect == Rect2(0, 0, 0, 0):
@ -282,12 +279,12 @@ func crop_image(image : Image) -> void:
var width := used_rect.size.x var width := used_rect.size.x
var height := used_rect.size.y var height := used_rect.size.y
general_do_scale(width, height) general_do_scale(width, height)
# Loop through all the cels to crop them
for f in Global.current_project.frames: for f in Global.current_project.frames:
# Loop through all the layers to crop them for cel in f.cels:
for j in range(Global.current_project.layers.size() - 1, -1, -1): var sprite : Image = cel.image.get_rect(used_rect)
var sprite : Image = f.cels[j].image.get_rect(used_rect) Global.current_project.undo_redo.add_do_property(cel.image, "data", sprite.data)
Global.current_project.undo_redo.add_do_property(f.cels[j].image, "data", sprite.data) Global.current_project.undo_redo.add_undo_property(cel.image, "data", cel.image.data)
Global.current_project.undo_redo.add_undo_property(f.cels[j].image, "data", f.cels[j].image.data)
general_undo_scale() general_undo_scale()

3
src/UI/TopMenuContainer.gd
View file

@ -445,7 +445,6 @@ func toggle_fullscreen() -> void:
func image_menu_id_pressed(id : int) -> void: func image_menu_id_pressed(id : int) -> void:
var image : Image = Global.current_project.frames[Global.current_project.current_frame].cels[Global.current_project.current_layer].image
match id: match id:
ImageMenuId.SCALE_IMAGE: ImageMenuId.SCALE_IMAGE:
show_scale_image_popup() show_scale_image_popup()
@ -454,7 +453,7 @@ func image_menu_id_pressed(id : int) -> void:
DrawingAlgos.centralize() DrawingAlgos.centralize()
ImageMenuId.CROP_IMAGE: ImageMenuId.CROP_IMAGE:
DrawingAlgos.crop_image(image) DrawingAlgos.crop_image()
ImageMenuId.RESIZE_CANVAS: ImageMenuId.RESIZE_CANVAS:
show_resize_canvas_popup() show_resize_canvas_popup()