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

Custom canvas images for all tools

Browse source
This commit is contained in:
OverloadedOrama 2019-12-08 03:32:58 +02:00
parent bf4052ad84
commit 2a086a41d8
15 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Assets/Graphics/Tools/Brush.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 803 B

BIN
Assets/Graphics/Tools/Brush_l.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 852 B

BIN
Assets/Graphics/Tools/Brush_l_r.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 867 B

BIN
Assets/Graphics/Tools/Brush_r.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 859 B

BIN
Assets/Graphics/Tools/Bucket_Cursor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 311 B

BIN
Assets/Graphics/Tools/ColorPicker_Cursor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 746 B

After

Width:  |  Height:  |  Size: 253 B

BIN
Assets/Graphics/Tools/Eraser_Cursor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 268 B

6
Assets/Graphics/Tools/Brush_l_r.png.import → Assets/Graphics/Tools/Eraser_Cursor.png.import
View file

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.stex" path="res://.import/Eraser_Cursor.png-f692572693acb37ec2194276528a81d8.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://Assets/Graphics/Tools/Brush_l_r.png" source_file="res://Assets/Graphics/Tools/Eraser_Cursor.png"
dest_files=[ "res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.stex" ] dest_files=[ "res://.import/Eraser_Cursor.png-f692572693acb37ec2194276528a81d8.stex" ]
[params] [params]

BIN
Assets/Graphics/Tools/LightenDarken_Cursor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 289 B

6
Assets/Graphics/Tools/Brush_l.png.import → Assets/Graphics/Tools/LightenDarken_Cursor.png.import
View file

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.stex" path="res://.import/LightenDarken_Cursor.png-4c3a225d3133a1ea63f3ad47f599a686.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://Assets/Graphics/Tools/Brush_l.png" source_file="res://Assets/Graphics/Tools/LightenDarken_Cursor.png"
dest_files=[ "res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.stex" ] dest_files=[ "res://.import/LightenDarken_Cursor.png-4c3a225d3133a1ea63f3ad47f599a686.stex" ]
[params] [params]

BIN
Assets/Graphics/Tools/Pencil_Cursor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 259 B

6
Assets/Graphics/Tools/Brush.png.import → Assets/Graphics/Tools/Pencil_Cursor.png.import
View file

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.stex" path="res://.import/Pencil_Cursor.png-835e48cc824d523278a13c95a3b3ec6e.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://Assets/Graphics/Tools/Brush.png" source_file="res://Assets/Graphics/Tools/Pencil_Cursor.png"
dest_files=[ "res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.stex" ] dest_files=[ "res://.import/Pencil_Cursor.png-835e48cc824d523278a13c95a3b3ec6e.stex" ]
[params] [params]

BIN
Assets/Graphics/Tools/RectSelect_Cursor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 132 B

6
Assets/Graphics/Tools/Brush_r.png.import → Assets/Graphics/Tools/RectSelect_Cursor.png.import
View file

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.stex" path="res://.import/RectSelect_Cursor.png-a7675c7d3d9b92992266b4bedca7e03f.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://Assets/Graphics/Tools/Brush_r.png" source_file="res://Assets/Graphics/Tools/RectSelect_Cursor.png"
dest_files=[ "res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.stex" ] dest_files=[ "res://.import/RectSelect_Cursor.png-a7675c7d3d9b92992266b4bedca7e03f.stex" ]
[params] [params]

5
Scripts/Canvas.gd
View file

@ -108,10 +108,7 @@ func _process(delta : float) -> void:
Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y] Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y]
if !cursor_inside_canvas: if !cursor_inside_canvas:
cursor_inside_canvas = true cursor_inside_canvas = true
if Global.current_left_tool == "Bucket": Input.set_custom_mouse_cursor(load("res://Assets/Graphics/Tools/%s_Cursor.png" % Global.current_left_tool), 0, Vector2(3, 24))
Input.set_custom_mouse_cursor(preload("res://Assets/Graphics/Tools/Bucket_Cursor.png"), 0, Vector2(6, 27))
elif Global.current_left_tool == "ColorPicker":
Input.set_custom_mouse_cursor(preload("res://Assets/Graphics/Tools/ColorPicker_Cursor.png"), 0, Vector2(5, 28))
else: else:
if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT): if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT):
if mouse_inside_canvas: if mouse_inside_canvas: