huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Fix not being able to transform if the selection size is bigger than the project size

Browse source 
Also introduces a new `return_cropped_copy()` method in SelectionMap to avoid duplicate code.
This commit is contained in:
Emmanouil Papadeas 2023-11-25 00:18:44 +02:00
parent bc8a9de4db
commit 56264fda3b
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Classes/SelectionMap.gd
View file

@ -85,6 +85,15 @@ func invert() -> void:
self.convert(Image.FORMAT_LA8) self.convert(Image.FORMAT_LA8)
## Returns a copy of itself that is cropped to [param size].
## Used for when the selection map is bigger than the [Project] size.
func return_cropped_copy(size: Vector2i) -> SelectionMap:
var selection_map_copy := SelectionMap.new()
selection_map_copy.copy_from(self)
selection_map_copy.crop(size.x, size.y)
return selection_map_copy
func move_bitmap_values(project: Project, move_offset := true) -> void: func move_bitmap_values(project: Project, move_offset := true) -> void:
var size := project.size var size := project.size
var selection_node = Global.canvas.selection var selection_node = Global.canvas.selection

5
src/Tools/Bucket.gd
View file

@ -257,10 +257,7 @@ func fill_in_selection() -> void:
var filler := Image.create(project.size.x, project.size.y, false, Image.FORMAT_RGBA8) var filler := Image.create(project.size.x, project.size.y, false, Image.FORMAT_RGBA8)
filler.fill(tool_slot.color) filler.fill(tool_slot.color)
var rect: Rect2i = Global.canvas.selection.big_bounding_rectangle var rect: Rect2i = Global.canvas.selection.big_bounding_rectangle
var selection_map_copy := SelectionMap.new() var selection_map_copy := project.selection_map.return_cropped_copy(project.size)
selection_map_copy.copy_from(project.selection_map)
# In case the selection map is bigger than the canvas
selection_map_copy.crop(project.size.x, project.size.y)
for image in images: for image in images:
image.blit_rect_mask(filler, selection_map_copy, rect, rect.position) image.blit_rect_mask(filler, selection_map_copy, rect, rect.position)
else: else:

11
src/UI/Canvas/Selection.gd
View file

@ -813,10 +813,7 @@ func delete(selected_cels := true) -> void:
if project.has_selection: if project.has_selection:
var blank := Image.create(project.size.x, project.size.y, false, Image.FORMAT_RGBA8) var blank := Image.create(project.size.x, project.size.y, false, Image.FORMAT_RGBA8)
var selection_map_copy := SelectionMap.new() var selection_map_copy := project.selection_map.return_cropped_copy(project.size)
selection_map_copy.copy_from(project.selection_map)
# In case the selection map is bigger than the canvas
selection_map_copy.crop(project.size.x, project.size.y)
for image in images: for image in images:
image.blit_rect_mask( image.blit_rect_mask(
blank, selection_map_copy, big_bounding_rectangle, big_bounding_rectangle.position blank, selection_map_copy, big_bounding_rectangle, big_bounding_rectangle.position
@ -885,8 +882,9 @@ func _get_preview_image() -> void:
original_preview_image = Image.create( original_preview_image = Image.create(
big_bounding_rectangle.size.x, big_bounding_rectangle.size.y, false, Image.FORMAT_RGBA8 big_bounding_rectangle.size.x, big_bounding_rectangle.size.y, false, Image.FORMAT_RGBA8
) )
var selection_map_copy := project.selection_map.return_cropped_copy(project.size)
original_preview_image.blit_rect_mask( original_preview_image.blit_rect_mask(
blended_image, project.selection_map, big_bounding_rectangle, Vector2i.ZERO blended_image, selection_map_copy, big_bounding_rectangle, Vector2i.ZERO
) )
if original_preview_image.is_invisible(): if original_preview_image.is_invisible():
original_preview_image = Image.new() original_preview_image = Image.new()
@ -919,5 +917,6 @@ func _get_selected_image(cel_image: Image) -> Image:
var image := Image.create( var image := Image.create(
big_bounding_rectangle.size.x, big_bounding_rectangle.size.y, false, Image.FORMAT_RGBA8 big_bounding_rectangle.size.x, big_bounding_rectangle.size.y, false, Image.FORMAT_RGBA8
) )
image.blit_rect_mask(cel_image, project.selection_map, big_bounding_rectangle, Vector2i.ZERO) var selection_map_copy := project.selection_map.return_cropped_copy(project.size)
image.blit_rect_mask(cel_image, selection_map_copy, big_bounding_rectangle, Vector2i.ZERO)
return image return image