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

v0.3 - Custom brushes, rectangle selection and .pxo!

Browse source 
v0.3 of Pixelorama is out! Check https://functionoverload590613498.wordpress.com/2019/10/22/pixelorama-v0-3-is-out/ for the full changelog.
This commit is contained in:
OverloadedOrama 2019-10-22 14:27:07 +03:00
parent 420ec63aeb
commit e18389d8c4
6 changed files with 141 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Scripts/Canvas.gd
View file

@ -366,8 +366,8 @@ func draw_pixel(pos : Vector2, color : Color, brush_size : int, brush_type : int
var dst := rectangle_center(pos, custom_brush_size)
var src_rect := Rect2(Vector2.ZERO, custom_brush_size + Vector2.ONE)
#Rectangle with the same size as the brush, but at cursor's position
var pos_rect_position := rectangle_center(pos, custom_brush_size)
var pos_rect := Rect2(pos_rect_position, custom_brush_size + Vector2.ONE)
#var pos_rect_position := rectangle_center(pos, custom_brush_size)
var pos_rect := Rect2(dst, custom_brush_size + Vector2.ONE)
#The selection rectangle
#If there's no rectangle, the whole canvas is considered a selection
@ -380,19 +380,16 @@ func draw_pixel(pos : Vector2, color : Color, brush_size : int, brush_type : int
if pos_rect_clipped.size == Vector2.ZERO:
return
#According to the relative position of pos_rect to selection_rect, ...
#... manipulate src_rect so only the pixels INSIDE the selection get drawn
if pos_rect.position.x < selection_rect.position.x:
src_rect.position.x += pos_rect.size.x - pos_rect_clipped.size.x
dst.x += pos_rect.size.x - pos_rect_clipped.size.x
if pos_rect.end.x > selection_rect.end.x:
src_rect.size.x = pos_rect_clipped.size.x
if pos_rect.position.y < selection_rect.position.y:
src_rect.position.y += pos_rect.size.y - pos_rect_clipped.size.y
dst.y += pos_rect.size.y - pos_rect_clipped.size.y
if pos_rect.end.y > selection_rect.end.y:
src_rect.size.y = pos_rect_clipped.size.y
#Re-position src_rect and dst based on the clipped position
var pos_difference := (pos_rect.position - pos_rect_clipped.position).abs()
#Obviously, if pos_rect and pos_rect_clipped are the same, pos_difference is Vector2.ZERO
src_rect.position = pos_difference
dst += pos_difference
src_rect.end -= pos_rect.end - pos_rect_clipped.end
#If the selection rectangle is smaller than the brush, ...
#... make sure pixels aren't being drawn outside the selection by adjusting src_rect's size
src_rect.size.x = min(src_rect.size.x, selection_rect.size.x)
src_rect.size.y = min(src_rect.size.y, selection_rect.size.y)
if color.a > 0: #If it's the pencil
layers[current_layer_index][0].blend_rect(custom_brush_image, src_rect, dst)

1
Scripts/Main.gd
View file

@ -18,6 +18,7 @@ var animation_forward := true
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
OS.set_window_title("Pixelorama %s" % ProjectSettings.get_setting("application/config/Version"))
# Set a minimum window size to prevent UI elements from collapsing on each other.
# This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist.
OS.set("min_window_size", Vector2(1024, 600))