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

Fix invalid image error when using the bucket tool to replace colors

Browse source
This commit is contained in:
Emmanouil Papadeas 2022-09-18 15:56:36 +03:00
parent 4af802005b
commit 698c7c4a08
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Tools/Bucket.gd
View file

@ -1,6 +1,6 @@
extends BaseTool extends BaseTool
const ColorReplaceShader := preload("res://src/Shaders/ColorReplace.shader") const COLOR_REPLACE_SHADER := preload("res://src/Shaders/ColorReplace.shader")
var _prev_mode := 0 var _prev_mode := 0
var _pattern: Patterns.Pattern var _pattern: Patterns.Pattern
@ -174,9 +174,16 @@ func fill_in_color(position: Vector2) -> void:
var color: Color = _get_draw_image().get_pixelv(position) var color: Color = _get_draw_image().get_pixelv(position)
var images := _get_selected_draw_images() var images := _get_selected_draw_images()
for image in images: for image in images:
var pattern_image: Image
if _fill_with == 0 or _pattern == null: if _fill_with == 0 or _pattern == null:
if tool_slot.color.is_equal_approx(color): if tool_slot.color.is_equal_approx(color):
return return
else:
# End early if we are filling with an empty pattern
pattern_image = _pattern.image
var pattern_size := pattern_image.get_size()
if pattern_size.x == 0 or pattern_size.y == 0:
return
var selection: Image var selection: Image
var selection_tex := ImageTexture.new() var selection_tex := ImageTexture.new()
@ -190,8 +197,8 @@ func fill_in_color(position: Vector2) -> void:
selection_tex.create_from_image(selection) selection_tex.create_from_image(selection)
var pattern_tex := ImageTexture.new() var pattern_tex := ImageTexture.new()
if _pattern: if _pattern and pattern_image:
pattern_tex.create_from_image(_pattern.image) pattern_tex.create_from_image(pattern_image)
var params := { var params := {
"size": project.size, "size": project.size,
@ -207,7 +214,7 @@ func fill_in_color(position: Vector2) -> void:
"has_pattern": true if _fill_with == 1 else false "has_pattern": true if _fill_with == 1 else false
} }
var gen := ShaderImageEffect.new() var gen := ShaderImageEffect.new()
gen.generate_image(image, ColorReplaceShader, params, project.size) gen.generate_image(image, COLOR_REPLACE_SHADER, params, project.size)
func fill_in_area(position: Vector2) -> void: func fill_in_area(position: Vector2) -> void:
@ -342,7 +349,7 @@ func _flood_fill(position: Vector2) -> void:
return return
else: else:
# end early if we are filling with an empty pattern # end early if we are filling with an empty pattern
var pattern_size = _pattern.image.get_size() var pattern_size := _pattern.image.get_size()
if pattern_size.x == 0 or pattern_size.y == 0: if pattern_size.x == 0 or pattern_size.y == 0:
return return
# init flood data structures # init flood data structures