Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix (slightly) wrong color being drawn when selected from palette #729

Merged
merged 3 commits into from
Jul 29, 2022
Merged

Fix (slightly) wrong color being drawn when selected from palette #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e45c8c
fixed the bug for simle and pixel perfect
Variable-ind Jul 29, 2022
e9a1816
fix wrong color drawn for bucket tool
Variable-ind Jul 29, 2022
119aacd
fixed an accidental change
Variable-ind Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Classes/Drawers.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ class ColorOp:
class SimpleDrawer:
func set_pixel(image: Image, position: Vector2, color: Color, op: ColorOp) -> void:
var color_old := image.get_pixelv(position)
var color_new := op.process(color, color_old)
var color_str = color.to_html()
var color_new := op.process(Color(color_str), color_old)
if not color_new.is_equal_approx(color_old):
image.set_pixelv(position, color_new)

Expand All @@ -40,8 +41,9 @@ class PixelPerfectDrawer:

func set_pixel(image: Image, position: Vector2, color: Color, op: ColorOp) -> void:
var color_old = image.get_pixelv(position)
var color_str = color.to_html()
last_pixels.push_back([position, color_old])
image.set_pixelv(position, op.process(color, color_old))
image.set_pixelv(position, op.process(Color(color_str), color_old))

var corner = last_pixels.pop_front()
var neighbour = last_pixels[0]
Expand Down
3 changes: 2 additions & 1 deletion src/Tools/Bucket.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,13 @@ func _compute_segments_for_image(

func _color_segments(image: Image) -> void:
if _fill_with == 0 or _pattern == null:
var color_str = tool_slot.color.to_html()
# short circuit for flat colors
for c in _allegro_image_segments.size():
var p = _allegro_image_segments[c]
for px in range(p.left_position, p.right_position + 1):
# We don't have to check again whether the point being processed is within the bounds
image.set_pixel(px, p.y, tool_slot.color)
image.set_pixel(px, p.y, Color(color_str))
else:
# shortcircuit tests for patternfills
var pattern_size = _pattern.image.get_size()
Expand Down