Filenames of assets in "Tool Cursors" are now in snake_case
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/Bucket_Cursor.png-1dd69de9e5a420f21aff31c606463041.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/Bucket_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/Bucket_Cursor.png-1dd69de9e5a420f21aff31c606463041.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/ColorPicker_Cursor.png-8077f7779b2b1b2187041fb8b8ac9640.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/ColorPicker_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/ColorPicker_Cursor.png-8077f7779b2b1b2187041fb8b8ac9640.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/Eraser_Cursor.png-717a55017415d492bc9737e75afa0896.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/Eraser_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/Eraser_Cursor.png-717a55017415d492bc9737e75afa0896.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/LightenDarken_Cursor.png-55bad3afdcf8808a1f05dc651333e1b5.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/LightenDarken_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/LightenDarken_Cursor.png-55bad3afdcf8808a1f05dc651333e1b5.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/Pencil_Cursor.png-1dac20ead3a7191330a10f59d65267f5.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/Pencil_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/Pencil_Cursor.png-1dac20ead3a7191330a10f59d65267f5.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/RectSelect_Cursor.png-8ff7e3f008c13896e5eba151ec43a7d9.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/RectSelect_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/RectSelect_Cursor.png-8ff7e3f008c13896e5eba151ec43a7d9.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/Zoom_Cursor.png-e3af3f47b82b1194656f9f30a59605fd.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Tool Cursors/Zoom_Cursor.png"
|
|
||||||
dest_files=[ "res://.import/Zoom_Cursor.png-e3af3f47b82b1194656f9f30a59605fd.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
Before Width: | Height: | Size: 601 B After Width: | Height: | Size: 601 B |
13
Assets/Graphics/cursor_icons/bucket_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/bucket_cursor.png-3904a66cfa23532599646c4b3935db4c.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/bucket_cursor.png"
|
||||||
|
dest_files=[ "res://.import/bucket_cursor.png-3904a66cfa23532599646c4b3935db4c.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 581 B After Width: | Height: | Size: 581 B |
13
Assets/Graphics/cursor_icons/colorpicker_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/colorpicker_cursor.png-66f2b3c65851e2f13670d7353094689b.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/colorpicker_cursor.png"
|
||||||
|
dest_files=[ "res://.import/colorpicker_cursor.png-66f2b3c65851e2f13670d7353094689b.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 547 B |
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
path="res://.import/Cursor.png-a311bc072ee5dc38d7f52d76fe3ea236.stex"
|
path="res://.import/cursor.png-0624bd893151e74ab6d8c66cd50bdf48.stex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
source_file="res://Assets/Graphics/Cursor.png"
|
source_file="res://Assets/Graphics/cursor_icons/cursor.png"
|
||||||
dest_files=[ "res://.import/Cursor.png-a311bc072ee5dc38d7f52d76fe3ea236.stex" ]
|
dest_files=[ "res://.import/cursor.png-0624bd893151e74ab6d8c66cd50bdf48.stex" ]
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 566 B After Width: | Height: | Size: 566 B |
13
Assets/Graphics/cursor_icons/eraser_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/eraser_cursor.png-dc85e18c034eeceae700bdc84d355781.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/eraser_cursor.png"
|
||||||
|
dest_files=[ "res://.import/eraser_cursor.png-dc85e18c034eeceae700bdc84d355781.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 583 B After Width: | Height: | Size: 583 B |
13
Assets/Graphics/cursor_icons/lightendarken_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/lightendarken_cursor.png-1d7d1d85f09620936724110dea609afa.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/lightendarken_cursor.png"
|
||||||
|
dest_files=[ "res://.import/lightendarken_cursor.png-1d7d1d85f09620936724110dea609afa.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 566 B After Width: | Height: | Size: 566 B |
13
Assets/Graphics/cursor_icons/pencil_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/pencil_cursor.png-946280d432b7b8090468249c06e3ce30.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/pencil_cursor.png"
|
||||||
|
dest_files=[ "res://.import/pencil_cursor.png-946280d432b7b8090468249c06e3ce30.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 544 B |
13
Assets/Graphics/cursor_icons/rectselect_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/rectselect_cursor.png-1b6c225f67f9d204e84c3f0c8d531e42.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/rectselect_cursor.png"
|
||||||
|
dest_files=[ "res://.import/rectselect_cursor.png-1b6c225f67f9d204e84c3f0c8d531e42.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
13
Assets/Graphics/cursor_icons/zoom_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/zoom_cursor.png-0e666007ccf97a59bcde517b3ad4df58.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Graphics/cursor_icons/zoom_cursor.png"
|
||||||
|
dest_files=[ "res://.import/zoom_cursor.png-0e666007ccf97a59bcde517b3ad4df58.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
|
@ -45,7 +45,7 @@ var has_focus := false
|
||||||
var pressure_sensitivity_mode = Pressure_Sensitivity.NONE
|
var pressure_sensitivity_mode = Pressure_Sensitivity.NONE
|
||||||
var open_last_project := true
|
var open_last_project := true
|
||||||
var smooth_zoom := true
|
var smooth_zoom := true
|
||||||
var cursor_image = preload("res://Assets/Graphics/Cursor.png")
|
var cursor_image = preload("res://Assets/Graphics/cursor_icons/cursor.png")
|
||||||
var left_cursor_tool_texture : ImageTexture
|
var left_cursor_tool_texture : ImageTexture
|
||||||
var right_cursor_tool_texture : ImageTexture
|
var right_cursor_tool_texture : ImageTexture
|
||||||
|
|
||||||
|
@ -284,9 +284,9 @@ func _ready() -> void:
|
||||||
canvas = find_node_by_name(root, "Canvas")
|
canvas = find_node_by_name(root, "Canvas")
|
||||||
canvases.append(canvas)
|
canvases.append(canvas)
|
||||||
left_cursor_tool_texture = ImageTexture.new()
|
left_cursor_tool_texture = ImageTexture.new()
|
||||||
left_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/Tool Cursors/Pencil_Cursor.png"))
|
left_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/cursor_icons/pencil_cursor.png"))
|
||||||
right_cursor_tool_texture = ImageTexture.new()
|
right_cursor_tool_texture = ImageTexture.new()
|
||||||
right_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/Tool Cursors/Eraser_Cursor.png"))
|
right_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/cursor_icons/eraser_cursor.png"))
|
||||||
canvas_parent = canvas.get_parent()
|
canvas_parent = canvas.get_parent()
|
||||||
main_viewport = find_node_by_name(root, "ViewportContainer")
|
main_viewport = find_node_by_name(root, "ViewportContainer")
|
||||||
second_viewport = find_node_by_name(root, "ViewportContainer2")
|
second_viewport = find_node_by_name(root, "ViewportContainer2")
|
||||||
|
|
|
@ -609,8 +609,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
|
||||||
else:
|
else:
|
||||||
t[0].texture_normal = load("res://Assets/Graphics/%s Themes/Tools/%s.png" % [Global.theme_type, tool_name])
|
t[0].texture_normal = load("res://Assets/Graphics/%s Themes/Tools/%s.png" % [Global.theme_type, tool_name])
|
||||||
|
|
||||||
Global.left_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/Tool Cursors/%s_Cursor.png" % Global.current_left_tool), 0)
|
Global.left_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/cursor_icons/%s_cursor.png" % Global.current_left_tool.to_lower()), 0)
|
||||||
Global.right_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/Tool Cursors/%s_Cursor.png" % Global.current_right_tool), 0)
|
Global.right_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/cursor_icons/%s_cursor.png" % Global.current_right_tool.to_lower()), 0)
|
||||||
|
|
||||||
|
|
||||||
func _on_LeftBrushTypeButton_pressed() -> void:
|
func _on_LeftBrushTypeButton_pressed() -> void:
|
||||||
|
|