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

Fix issues when picking color with the bucket tool

Browse source 
1) The bucket tool now picks colors from the top-most layer, like the rest of the drawing tools.
2) Using the tool while moving the cursor and also holding the color picker shortcut (Alt by default), now picks colors instead of using the bucket tool.
This commit is contained in:
Emmanouil Papadeas 2024-10-17 02:34:27 +03:00
parent d894e9db86
commit 4dc55e538e
3 changed files with 33 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Tools/BaseDraw.gd
View file

@ -720,35 +720,6 @@ func _get_undo_data() -> Dictionary:
return data return data
func _pick_color(pos: Vector2i) -> void:
var project := Global.current_project
pos = project.tiles.get_canon_position(pos)
if pos.x < 0 or pos.y < 0:
return
var image := Image.new()
image.copy_from(_get_draw_image())
if pos.x > image.get_width() - 1 or pos.y > image.get_height() - 1:
return
var color := Color(0, 0, 0, 0)
var curr_frame: Frame = project.frames[project.current_frame]
for layer in project.layers.size():
var idx := (project.layers.size() - 1) - layer
if project.layers[idx].is_visible_in_hierarchy():
image = curr_frame.cels[idx].get_image()
color = image.get_pixelv(pos)
if not is_zero_approx(color.a):
break
var button := (
MOUSE_BUTTON_LEFT
if Tools._slots[MOUSE_BUTTON_LEFT].tool_node == self
else MOUSE_BUTTON_RIGHT
)
Tools.assign_color(color, button, false)
func _on_flip_x_toggled(button_pressed: bool) -> void: func _on_flip_x_toggled(button_pressed: bool) -> void:
_brush_flip_x = button_pressed _brush_flip_x = button_pressed
update_brush() update_brush()

24
src/Tools/BaseTool.gd
View file

@ -315,6 +315,30 @@ func _get_selected_draw_images() -> Array[Image]:
return images return images
func _pick_color(pos: Vector2i) -> void:
var project := Global.current_project
pos = project.tiles.get_canon_position(pos)
if pos.x < 0 or pos.y < 0:
return
var image := Image.new()
image.copy_from(_get_draw_image())
if pos.x > image.get_width() - 1 or pos.y > image.get_height() - 1:
return
var color := Color(0, 0, 0, 0)
var curr_frame: Frame = project.frames[project.current_frame]
for layer in project.layers.size():
var idx := (project.layers.size() - 1) - layer
if project.layers[idx].is_visible_in_hierarchy():
image = curr_frame.cels[idx].get_image()
color = image.get_pixelv(pos)
if not is_zero_approx(color.a):
break
Tools.assign_color(color, tool_slot.button, false)
func _flip_rect(rect: Rect2, rect_size: Vector2, horiz: bool, vert: bool) -> Rect2: func _flip_rect(rect: Rect2, rect_size: Vector2, horiz: bool, vert: bool) -> Rect2:
var result := rect var result := rect
if horiz: if horiz:

30
src/Tools/DesignTools/Bucket.gd
View file

@ -7,6 +7,7 @@ const COLOR_REPLACE_SHADER := preload("res://src/Shaders/ColorReplace.gdshader")
const PATTERN_FILL_SHADER := preload("res://src/Shaders/PatternFill.gdshader") const PATTERN_FILL_SHADER := preload("res://src/Shaders/PatternFill.gdshader")
var _undo_data := {} var _undo_data := {}
var _picking_color := false
var _prev_mode := 0 var _prev_mode := 0
var _pattern: Patterns.Pattern var _pattern: Patterns.Pattern
var _tolerance := 0.003 var _tolerance := 0.003
@ -152,8 +153,10 @@ func update_pattern() -> void:
func draw_start(pos: Vector2i) -> void: func draw_start(pos: Vector2i) -> void:
super.draw_start(pos) super.draw_start(pos)
if Input.is_action_pressed(&"draw_color_picker", true): if Input.is_action_pressed(&"draw_color_picker", true):
_picking_color = true
_pick_color(pos) _pick_color(pos)
return return
_picking_color = false
_undo_data = _get_undo_data() _undo_data = _get_undo_data()
if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn(): if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn():
return return
@ -164,6 +167,10 @@ func draw_start(pos: Vector2i) -> void:
func draw_move(pos: Vector2i) -> void: func draw_move(pos: Vector2i) -> void:
super.draw_move(pos) super.draw_move(pos)
if _picking_color: # Still return even if we released Alt
if Input.is_action_pressed(&"draw_color_picker", true):
_pick_color(pos)
return
Global.canvas.selection.transform_content_confirm() Global.canvas.selection.transform_content_confirm()
if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn(): if !Global.current_project.layers[Global.current_project.current_layer].can_layer_get_drawn():
return return
@ -174,6 +181,8 @@ func draw_move(pos: Vector2i) -> void:
func draw_end(pos: Vector2i) -> void: func draw_end(pos: Vector2i) -> void:
super.draw_end(pos) super.draw_end(pos)
if _picking_color:
return
commit_undo() commit_undo()
@ -514,24 +523,3 @@ func _get_undo_data() -> Dictionary:
var image := cel.get_image() var image := cel.get_image()
data[image] = image.data data[image] = image.data
return data return data
func _pick_color(pos: Vector2i) -> void:
var project := Global.current_project
pos = project.tiles.get_canon_position(pos)
if pos.x < 0 or pos.y < 0:
return
var image := Image.new()
image.copy_from(_get_draw_image())
if pos.x > image.get_width() - 1 or pos.y > image.get_height() - 1:
return
var color := image.get_pixelv(pos)
var button := (
MOUSE_BUTTON_LEFT
if Tools._slots[MOUSE_BUTTON_LEFT].tool_node == self
else MOUSE_BUTTON_RIGHT
)
Tools.assign_color(color, button, false)