tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 15:34:43 -04:00
Code Issues Projects Releases Wiki Activity

Added pattern offset - Closes #130

Browse source
This commit is contained in:
OverloadedOrama 2020-04-25 02:09:34 +03:00
parent 768a1e7b8f
commit 7bac0ff8f4
7 changed files with 168 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Scripts/Canvas.gd
View file

@ -340,12 +340,15 @@ func _input(event : InputEvent) -> void:
if can_handle:
var fill_with := 0
var pattern_image : Image
var pattern_offset : Vector2
if current_mouse_button == "left_mouse":
fill_with = Global.left_fill_with
pattern_image = Global.pattern_left_image
pattern_offset = Global.left_fill_pattern_offset
elif current_mouse_button == "right_mouse":
fill_with = Global.right_fill_with
pattern_image = Global.pattern_right_image
pattern_offset = Global.right_fill_pattern_offset
if fill_area == 0: # Paint the specific area of the same color
var horizontal_mirror := false
@ -360,16 +363,16 @@ func _input(event : InputEvent) -> void:
vertical_mirror = Global.right_vertical_mirror
if fill_with == 1: # Pattern fill
pattern_fill(sprite, mouse_pos, pattern_image, sprite.get_pixelv(mouse_pos))
pattern_fill(sprite, mouse_pos, pattern_image, sprite.get_pixelv(mouse_pos), pattern_offset)
if horizontal_mirror:
var pos := Vector2(mirror_x, mouse_pos.y)
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos))
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos), pattern_offset)
if vertical_mirror:
var pos := Vector2(mouse_pos.x, mirror_y)
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos))
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos), pattern_offset)
if horizontal_mirror && vertical_mirror:
var pos := Vector2(mirror_x, mirror_y)
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos))
pattern_fill(sprite, pos, pattern_image, sprite.get_pixelv(mouse_pos), pattern_offset)
else: # Flood fill
flood_fill(sprite, mouse_pos, sprite.get_pixelv(mouse_pos), current_color)
if horizontal_mirror:
@ -391,8 +394,8 @@ func _input(event : InputEvent) -> void:
if fill_with == 1: # Pattern fill
pattern_image.lock()
var pattern_size := pattern_image.get_size()
var xxx : int = int(xx) % int(pattern_size.x)
var yyy : int = int(yy) % int(pattern_size.y)
var xxx : int = int(xx + pattern_offset.x) % int(pattern_size.x)
var yyy : int = int(yy + pattern_offset.y) % int(pattern_size.y)
var pattern_color : Color = pattern_image.get_pixel(xxx, yyy)
sprite.set_pixel(xx, yy, pattern_color)
pattern_image.unlock()
@ -889,7 +892,7 @@ func flood_fill(sprite : Image, pos : Vector2, target_color : Color, replace_col
sprite_changed_this_frame = true
func pattern_fill(sprite : Image, pos : Vector2, pattern : Image, target_color : Color) -> void:
func pattern_fill(sprite : Image, pos : Vector2, pattern : Image, target_color : Color, var offset : Vector2) -> void:
pos = pos.floor()
if !point_in_rectangle(pos, Vector2(west_limit - 1, north_limit - 1), Vector2(east_limit, south_limit)):
return
@ -908,8 +911,8 @@ func pattern_fill(sprite : Image, pos : Vector2, pattern : Image, target_color :
for px in range(west.x + 1, east.x):
var p := Vector2(px, n.y)
var xx : int = int(px) % int(pattern_size.x)
var yy : int = int(n.y) % int(pattern_size.y)
var xx : int = int(px + offset.x) % int(pattern_size.x)
var yy : int = int(n.y + offset.y) % int(pattern_size.y)
var pattern_color : Color = pattern.get_pixel(xx, yy)
if pattern_color == target_color:
continue

3
Scripts/Global.gd
View file

@ -83,6 +83,9 @@ var right_fill_area := 0
var left_fill_with := 0
var right_fill_with := 0
var left_fill_pattern_offset := Vector2.ZERO
var right_fill_pattern_offset := Vector2.ZERO
# 0 for lighten, 1 for darken
var left_ld := 0
var right_ld := 0

23
Scripts/Import.gd
View file

@ -245,15 +245,22 @@ func import_patterns(priority_ordered_search_path: Array) -> void:
pattern_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
Global.patterns_popup.get_node("ScrollContainer/PatternContainer").add_child(pattern_button)
Global.pattern_left_image = Global.patterns[0]
var pattern_left_tex := ImageTexture.new()
pattern_left_tex.create_from_image(Global.pattern_left_image, 0)
Global.left_fill_pattern_container.get_child(0).get_child(0).texture = pattern_left_tex
if Global.patterns.size() > 0:
var image_size = Global.patterns[0].get_size()
Global.pattern_right_image = Global.patterns[0]
var pattern_right_tex := ImageTexture.new()
pattern_right_tex.create_from_image(Global.pattern_right_image, 0)
Global.right_fill_pattern_container.get_child(0).get_child(0).texture = pattern_right_tex
Global.pattern_left_image = Global.patterns[0]
var pattern_left_tex := ImageTexture.new()
pattern_left_tex.create_from_image(Global.pattern_left_image, 0)
Global.left_fill_pattern_container.get_child(0).get_child(0).texture = pattern_left_tex
Global.left_fill_pattern_container.get_child(2).get_child(1).max_value = image_size.x - 1
Global.left_fill_pattern_container.get_child(3).get_child(1).max_value = image_size.y - 1
Global.pattern_right_image = Global.patterns[0]
var pattern_right_tex := ImageTexture.new()
pattern_right_tex.create_from_image(Global.pattern_right_image, 0)
Global.right_fill_pattern_container.get_child(0).get_child(0).texture = pattern_right_tex
Global.right_fill_pattern_container.get_child(2).get_child(1).max_value = image_size.x - 1
Global.right_fill_pattern_container.get_child(3).get_child(1).max_value = image_size.y - 1
func import_gpl(path : String) -> Palette:

16
Scripts/Main.gd
View file

@ -657,6 +657,22 @@ func _on_LeftPatternTypeButton_pressed() -> void:
Global.patterns_popup.popup(Rect2(Global.left_brush_type_button.rect_global_position, Vector2(226, 72)))
func _on_LeftPatternOffsetX_value_changed(value : float) -> void:
Global.left_fill_pattern_offset.x = value
func _on_LeftPatternOffsetY_value_changed(value : float) -> void:
Global.left_fill_pattern_offset.y = value
func _on_RightPatternOffsetX_value_changed(value : float) -> void:
Global.right_fill_pattern_offset.x = value
func _on_RightPatternOffsetY_value_changed(value : float) -> void:
Global.right_fill_pattern_offset.y = value
func _on_RightFillAreaOptions_item_selected(ID : int) -> void:
Global.right_fill_area = ID