huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 17:49:47 +00:00
Code Issues Wiki Activity
Pixelorama/src/Autoload/Tools.gd

419 lines
13 KiB
GDScript3
Raw Normal View History

Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
extends Node
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
signal color_changed(color, button)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var pen_pressure := 1.0
Mirroring buttons now affect both left & right tools
2022-02-17 14:07:03 +00:00
var horizontal_mirror := false
var vertical_mirror := false
Made pixel perfect into a global tool option More global tool options will most likely be added soon, most notably tablet pen pressure sensitivity options.
2022-02-28 17:24:14 +00:00
var pixel_perfect := false
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
var tools := {
"RectSelect":
Added remove_tool() method in Tools May be useful for extensions that add new tools
2022-02-22 00:58:52 +00:00
Tool.new(
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
"RectSelect",
"Rectangular Selection",
"rectangle_select",
preload("res://src/Tools/SelectionTools/RectSelect.tscn")
Added remove_tool() method in Tools May be useful for extensions that add new tools
2022-02-22 00:58:52 +00:00
),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"EllipseSelect":
Added remove_tool() method in Tools May be useful for extensions that add new tools
2022-02-22 00:58:52 +00:00
Tool.new(
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
"EllipseSelect",
"Elliptical Selection",
"ellipse_select",
preload("res://src/Tools/SelectionTools/EllipseSelect.tscn")
Added remove_tool() method in Tools May be useful for extensions that add new tools
2022-02-22 00:58:52 +00:00
),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"PolygonSelect":
Tool.new(
"PolygonSelect",
"Polygonal Selection",
"polygon_select",
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
preload("res://src/Tools/SelectionTools/PolygonSelect.tscn"),
"Double-click to connect the last point to the starting point"
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
),
"ColorSelect":
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
Tool.new(
"ColorSelect",
"Select By Color",
"color_select",
preload("res://src/Tools/SelectionTools/ColorSelect.tscn")
),
"MagicWand":
Tool.new(
"MagicWand",
"Magic Wand",
"magic_wand",
preload("res://src/Tools/SelectionTools/MagicWand.tscn")
),
"Lasso":
Tool.new(
"Lasso",
"Lasso / Free Select Tool",
"lasso",
preload("res://src/Tools/SelectionTools/Lasso.tscn")
),
"Move": Tool.new("Move", "Move", "move", preload("res://src/Tools/Move.tscn")),
"Zoom": Tool.new("Zoom", "Zoom", "zoom", preload("res://src/Tools/Zoom.tscn")),
"Pan": Tool.new("Pan", "Pan", "pan", preload("res://src/Tools/Pan.tscn")),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"ColorPicker":
Tool.new(
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
"ColorPicker",
"Color Picker",
"colorpicker",
preload("res://src/Tools/ColorPicker.tscn"),
"Select a color from a pixel of the sprite"
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
),
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
"Pencil":
Tool.new(
"Pencil",
"Pencil",
"pencil",
preload("res://src/Tools/Pencil.tscn"),
"Hold %s to make a line",
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
["draw_create_line"]
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
),
"Eraser":
Tool.new(
"Eraser",
"Eraser",
"eraser",
preload("res://src/Tools/Eraser.tscn"),
"Hold %s to make a line",
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
["draw_create_line"]
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
),
"Bucket": Tool.new("Bucket", "Bucket", "fill", preload("res://src/Tools/Bucket.tscn")),
"Shading":
Tool.new("Shading", "Shading Tool", "shading", preload("res://src/Tools/Shading.tscn")),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"LineTool":
Tool.new(
"LineTool",
"Line Tool",
"linetool",
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
preload("res://src/Tools/LineTool.tscn"),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"""Hold %s to snap the angle of the line
Hold %s to center the shape on the click origin
Hold %s to displace the shape's origin""",
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
["shape_perfect", "shape_center", "shape_displace"]
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
),
"RectangleTool":
Tool.new(
"RectangleTool",
"Rectangle Tool",
"rectangletool",
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
preload("res://src/Tools/RectangleTool.tscn"),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"""Hold %s to create a 1:1 shape
Hold %s to center the shape on the click origin
Hold %s to displace the shape's origin""",
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
["shape_perfect", "shape_center", "shape_displace"]
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
),
"EllipseTool":
Tool.new(
"EllipseTool",
"Ellipse Tool",
"ellipsetool",
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
preload("res://src/Tools/EllipseTool.tscn"),
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
"""Hold %s to create a 1:1 shape
Hold %s to center the shape on the click origin
Hold %s to displace the shape's origin""",
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
["shape_perfect", "shape_center", "shape_displace"]
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
),
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
}
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
var _tool_button_scene: PackedScene = preload("res://src/Tools/ToolButton.tscn")
var _slots := {}
var _panels := {}
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var _tool_buttons: Node
var _active_button := -1
var _last_position := Vector2.INF
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
class Tool:
var name := ""
var display_name := ""
var scene: PackedScene
var icon: Texture
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
var cursor_icon: Texture
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
var shortcut := ""
var extra_hint := ""
var extra_shortcuts := [] # Array of String(s)
var button_node: BaseButton
func _init(
_name: String,
_display_name: String,
_shortcut: String,
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
_scene: PackedScene,
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
_extra_hint := "",
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
_extra_shortucts := []
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
) -> void:
name = _name
display_name = _display_name
shortcut = _shortcut
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
scene = _scene
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
extra_hint = _extra_hint
extra_shortcuts = _extra_shortucts
icon = load("res://assets/graphics/tools/%s.png" % name.to_lower())
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
cursor_icon = load("res://assets/graphics/tools/cursors/%s.png" % name.to_lower())
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
func generate_hint_tooltip() -> String:
var hint := display_name
Support tools that don't have shortcuts Might be useful for Extensions that add tools and for the future where we allow users more freedom with shortcut binding, including unbinding shortcuts.
2022-02-22 21:38:47 +00:00
var shortcuts := []
var left_text := ""
var right_text := ""
if InputMap.has_action("left_" + shortcut + "_tool"):
Implement the Keychain Plugin (#700) * Start implementing the godot_better_input plugin * Update ShortcutEdit.gd * Load & save preset option * Add some groups and fix action events not being deleted on load * Add MenuInputAction class for multiple menu accelerators * Create a proper plugin and a BetterInput autoload * Update menu accelerators * Move settings to BetterInput * Move menu enums to Global, make more MenuInputActions * Add more menu events * Add new groups * Optimize BetterInput _input() method * Remove a lot of lines of code * Change some previous events, add ignore actions and a View menu group * Change update_item_accelerator to update_ui * Move MenuInputAction initialization to BetterInput.gd * Update hint tooltips when a shortcut changes Temporarily comment out some code regarding the configurable modifiers * Some MenuInputAction variable name changes * Add handle_input() to InputAction * Update the shortcuts of buttons * Fix shortcut selector menu position * Change plugin name into Keychain * Fix keyboard input dialog exiting when Enter or Space is being pressed * Add two more groups * Make groups folded by default * Temporarily make tool modifier shortcuts not configurable A temporary change, they will be made configurable again, with different actions that are currently mapped to the same events, local/independent from each other. * Add license for Keychain * Fix issue where a key event would be added in other input types * Fix bug where the assigned state was not updated when the dialog appeared again * Update Main.tscn * Add a disabled line edit in keyboard shortcut selector to grab focus * Load presets in the Keychain autoload This way, the input actions get updated from the start, instead of only at the ShortcutEdit scene. WARNING, this currently causes crashes if the menu items have no shortcut binded to them. * Move custom settings away from Keychain.gd To keep it the same as the upstream plugin * Change menu enum names * Made action_get_first_key() more general * Use arrays for menu items instead of dictionaries, fixes crash * Move moveable panels to Window menu * Format * Optimize hint tooltip updating * Add support for translations in Keychain * Translation changes * Made tool modifiers configurable Needs more testing. * Made camera arrow key movement configurable & joypad axis support This commit removes the ability to press Shift and Control+Shift to adjust the camera arrow key movement speed. Instead, the speed depends on the zoom level. The right joypad analog stick is configured to move the camera by default. * Rename presets into shortcut profiles, use Resources and let users create their own * [skip ci] Update addons README * Update Global.gd
2022-05-16 12:07:51 +00:00
var left_list := InputMap.get_action_list("left_" + shortcut + "_tool")
if left_list.size() > 0:
var left_shortcut: String = left_list[0].as_text()
shortcuts.append(left_shortcut)
left_text = "\n%s for left mouse button"
Support tools that don't have shortcuts Might be useful for Extensions that add tools and for the future where we allow users more freedom with shortcut binding, including unbinding shortcuts.
2022-02-22 21:38:47 +00:00
if InputMap.has_action("right_" + shortcut + "_tool"):
Implement the Keychain Plugin (#700) * Start implementing the godot_better_input plugin * Update ShortcutEdit.gd * Load & save preset option * Add some groups and fix action events not being deleted on load * Add MenuInputAction class for multiple menu accelerators * Create a proper plugin and a BetterInput autoload * Update menu accelerators * Move settings to BetterInput * Move menu enums to Global, make more MenuInputActions * Add more menu events * Add new groups * Optimize BetterInput _input() method * Remove a lot of lines of code * Change some previous events, add ignore actions and a View menu group * Change update_item_accelerator to update_ui * Move MenuInputAction initialization to BetterInput.gd * Update hint tooltips when a shortcut changes Temporarily comment out some code regarding the configurable modifiers * Some MenuInputAction variable name changes * Add handle_input() to InputAction * Update the shortcuts of buttons * Fix shortcut selector menu position * Change plugin name into Keychain * Fix keyboard input dialog exiting when Enter or Space is being pressed * Add two more groups * Make groups folded by default * Temporarily make tool modifier shortcuts not configurable A temporary change, they will be made configurable again, with different actions that are currently mapped to the same events, local/independent from each other. * Add license for Keychain * Fix issue where a key event would be added in other input types * Fix bug where the assigned state was not updated when the dialog appeared again * Update Main.tscn * Add a disabled line edit in keyboard shortcut selector to grab focus * Load presets in the Keychain autoload This way, the input actions get updated from the start, instead of only at the ShortcutEdit scene. WARNING, this currently causes crashes if the menu items have no shortcut binded to them. * Move custom settings away from Keychain.gd To keep it the same as the upstream plugin * Change menu enum names * Made action_get_first_key() more general * Use arrays for menu items instead of dictionaries, fixes crash * Move moveable panels to Window menu * Format * Optimize hint tooltip updating * Add support for translations in Keychain * Translation changes * Made tool modifiers configurable Needs more testing. * Made camera arrow key movement configurable & joypad axis support This commit removes the ability to press Shift and Control+Shift to adjust the camera arrow key movement speed. Instead, the speed depends on the zoom level. The right joypad analog stick is configured to move the camera by default. * Rename presets into shortcut profiles, use Resources and let users create their own * [skip ci] Update addons README * Update Global.gd
2022-05-16 12:07:51 +00:00
var right_list := InputMap.get_action_list("right_" + shortcut + "_tool")
if right_list.size() > 0:
var right_shortcut: String = right_list[0].as_text()
shortcuts.append(right_shortcut)
right_text = "\n%s for right mouse button"
Support tools that don't have shortcuts Might be useful for Extensions that add tools and for the future where we allow users more freedom with shortcut binding, including unbinding shortcuts.
2022-02-22 21:38:47 +00:00
if !shortcuts.empty():
hint += "\n" + left_text + right_text
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
if !extra_hint.empty():
hint += "\n\n" + extra_hint
Show correct tool modifier shortcuts in the tool button tooltips
2022-05-16 16:46:26 +00:00
var extra_shortcuts_mapped := []
for event in extra_shortcuts:
var key: InputEventKey = Keychain.action_get_first_key(event)
var key_string := "None"
if key:
key_string = OS.get_scancode_string(key.get_scancode_with_modifiers())
extra_shortcuts_mapped.append(key_string)
shortcuts.append_array(extra_shortcuts_mapped)
Added shortcuts (#673) * add limit change with brush * Delete Draw.gd * Delete BaseTool.gd * Added all shortcuts * formatting * Removed 1 shortcut from "Fullscreen" * Assigned shortcuts to special behaviours * formatting * Added configurable shortcuts to special behaviour * formatting * Added special behaviour shortcuts and some code im provements * a minor fix
2022-04-27 12:03:39 +00:00
Support tools that don't have shortcuts Might be useful for Extensions that add tools and for the future where we allow users more freedom with shortcut binding, including unbinding shortcuts.
2022-02-22 21:38:47 +00:00
if shortcuts.empty():
hint = tr(hint)
else:
hint = tr(hint) % shortcuts
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
return hint
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
class Slot:
var name: String
var kname: String
var tool_node: Node = null
var button: int
var color: Color
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func _init(slot_name: String) -> void:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
name = slot_name
kname = name.replace(" ", "_").to_lower()
Fixed issues where fully transparent color could not be picked More specifically, the color picked sometimes failed to pick transparent color (and picked black instead), swapping between colors when one of them is fully transparent made it fully opaque, and also when picking a color from a palette which was fully transparent made it fully opaque. Closes #364
2020-10-23 17:18:39 +00:00
func _ready() -> void:
Remove Global.find_node_by_name() Use the built-in find_node() method instead.
2021-06-26 11:01:07 +00:00
_tool_buttons = Global.control.find_node("ToolButtons")
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
for t in tools:
add_tool_button(tools[t])
Implement the Keychain Plugin (#700) * Start implementing the godot_better_input plugin * Update ShortcutEdit.gd * Load & save preset option * Add some groups and fix action events not being deleted on load * Add MenuInputAction class for multiple menu accelerators * Create a proper plugin and a BetterInput autoload * Update menu accelerators * Move settings to BetterInput * Move menu enums to Global, make more MenuInputActions * Add more menu events * Add new groups * Optimize BetterInput _input() method * Remove a lot of lines of code * Change some previous events, add ignore actions and a View menu group * Change update_item_accelerator to update_ui * Move MenuInputAction initialization to BetterInput.gd * Update hint tooltips when a shortcut changes Temporarily comment out some code regarding the configurable modifiers * Some MenuInputAction variable name changes * Add handle_input() to InputAction * Update the shortcuts of buttons * Fix shortcut selector menu position * Change plugin name into Keychain * Fix keyboard input dialog exiting when Enter or Space is being pressed * Add two more groups * Make groups folded by default * Temporarily make tool modifier shortcuts not configurable A temporary change, they will be made configurable again, with different actions that are currently mapped to the same events, local/independent from each other. * Add license for Keychain * Fix issue where a key event would be added in other input types * Fix bug where the assigned state was not updated when the dialog appeared again * Update Main.tscn * Add a disabled line edit in keyboard shortcut selector to grab focus * Load presets in the Keychain autoload This way, the input actions get updated from the start, instead of only at the ShortcutEdit scene. WARNING, this currently causes crashes if the menu items have no shortcut binded to them. * Move custom settings away from Keychain.gd To keep it the same as the upstream plugin * Change menu enum names * Made action_get_first_key() more general * Use arrays for menu items instead of dictionaries, fixes crash * Move moveable panels to Window menu * Format * Optimize hint tooltip updating * Add support for translations in Keychain * Translation changes * Made tool modifiers configurable Needs more testing. * Made camera arrow key movement configurable & joypad axis support This commit removes the ability to press Shift and Control+Shift to adjust the camera arrow key movement speed. Instead, the speed depends on the zoom level. The right joypad analog stick is configured to move the camera by default. * Rename presets into shortcut profiles, use Resources and let users create their own * [skip ci] Update addons README * Update Global.gd
2022-05-16 12:07:51 +00:00
var tool_shortcut: String = Tools.tools[t].shortcut
var left_tool_shortcut := "left_%s_tool" % tool_shortcut
var right_tool_shortcut := "right_%s_tool" % tool_shortcut
Keychain.actions[left_tool_shortcut] = Keychain.InputAction.new("", "Left")
Keychain.actions[right_tool_shortcut] = Keychain.InputAction.new("", "Right")
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
_slots[BUTTON_LEFT] = Slot.new("Left tool")
_slots[BUTTON_RIGHT] = Slot.new("Right tool")
Tweak UI to use less empty space (#514) * Tweak right side panels to use less empty space * Add fake grabber to tools panel. Add a bottom margin. Fix a few issues with resizing. * Fix tallscreen mode. Set a bit smaller animation timeline min height. * Change Preferences visibility settings * Update Main.tscn * Fix crash when changing to tallscreen and then switching themes Co-authored-by: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com>
2021-08-16 23:56:19 +00:00
_panels[BUTTON_LEFT] = Global.control.find_node("LeftPanelContainer", true, false)
_panels[BUTTON_RIGHT] = Global.control.find_node("RightPanelContainer", true, false)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var tool_name: String = Global.config_cache.get_value(
_slots[BUTTON_LEFT].kname, "tool", "Pencil"
)
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
if not tool_name in tools:
Remove some unneeded yield() calls And minor changes to make the code a tiny bit more clean. I tested this PR, but it still might be a bit risky.
2021-11-17 17:59:14 +00:00
tool_name = "Pencil"
set_tool(tool_name, BUTTON_LEFT)
tool_name = Global.config_cache.get_value(_slots[BUTTON_RIGHT].kname, "tool", "Eraser")
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
if not tool_name in tools:
Remove some unneeded yield() calls And minor changes to make the code a tiny bit more clean. I tested this PR, but it still might be a bit risky.
2021-11-17 17:59:14 +00:00
tool_name = "Eraser"
set_tool(tool_name, BUTTON_RIGHT)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
update_tool_buttons()
update_tool_cursors()
Mirroring buttons now affect both left & right tools
2022-02-17 14:07:03 +00:00
horizontal_mirror = Global.config_cache.get_value("preferences", "horizontal_mirror", false)
vertical_mirror = Global.config_cache.get_value("preferences", "vertical_mirror", false)
Made pixel perfect into a global tool option More global tool options will most likely be added soon, most notably tablet pen pressure sensitivity options.
2022-02-28 17:24:14 +00:00
pixel_perfect = Global.config_cache.get_value("preferences", "pixel_perfect", false)
Mirroring buttons now affect both left & right tools
2022-02-17 14:07:03 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
# Yield is necessary for the color picker nodes to update their color values
yield(get_tree(), "idle_frame")
var color_value: Color = Global.config_cache.get_value(
_slots[BUTTON_LEFT].kname, "color", Color.black
)
Remove some unneeded yield() calls And minor changes to make the code a tiny bit more clean. I tested this PR, but it still might be a bit risky.
2021-11-17 17:59:14 +00:00
assign_color(color_value, BUTTON_LEFT, false)
color_value = Global.config_cache.get_value(_slots[BUTTON_RIGHT].kname, "color", Color.white)
assign_color(color_value, BUTTON_RIGHT, false)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
func add_tool_button(t: Tool) -> void:
var tool_button: BaseButton = _tool_button_scene.instance()
tool_button.name = t.name
Change the background left & right colors of tool buttons in code
2022-07-07 23:54:31 +00:00
tool_button.get_node("BackgroundLeft").modulate = Global.left_tool_color
tool_button.get_node("BackgroundRight").modulate = Global.right_tool_color
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
tool_button.get_node("ToolIcon").texture = t.icon
Support tools that don't have shortcuts Might be useful for Extensions that add tools and for the future where we allow users more freedom with shortcut binding, including unbinding shortcuts.
2022-02-22 21:38:47 +00:00
tool_button.hint_tooltip = t.generate_hint_tooltip()
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
t.button_node = tool_button
_tool_buttons.add_child(tool_button)
tool_button.connect("pressed", _tool_buttons, "_on_Tool_pressed", [tool_button])
Added remove_tool() method in Tools May be useful for extensions that add new tools
2022-02-22 00:58:52 +00:00
func remove_tool(t: Tool) -> void:
t.button_node.queue_free()
tools.erase(t.name)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func set_tool(name: String, button: int) -> void:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
var slot = _slots[button]
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var panel: Node = _panels[button]
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
var node: Node = tools[name].scene.instance()
Move Guides without moving mouse outside canvas (#647) * guide movement enhancement * Gave more access to pan tool * Update Guide.gd * Update Guide.gd * Update Tools.gd
2022-02-11 01:16:33 +00:00
if button == BUTTON_LEFT: # As guides are only moved with left mouse
if name == "Pan": # tool you want to give more access at guides
Global.move_guides_on_canvas = true
else:
Global.move_guides_on_canvas = false
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
node.name = name
node.tool_slot = slot
slot.tool_node = node
slot.button = button
panel.add_child(slot.tool_node)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func assign_tool(name: String, button: int) -> void:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
var slot = _slots[button]
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var panel: Node = _panels[button]
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
if slot.tool_node != null:
if slot.tool_node.name == name:
return
panel.remove_child(slot.tool_node)
slot.tool_node.queue_free()
set_tool(name, button)
update_tool_buttons()
update_tool_cursors()
Global.config_cache.set_value(slot.kname, "tool", name)
func default_color() -> void:
assign_color(Color.black, BUTTON_LEFT)
assign_color(Color.white, BUTTON_RIGHT)
func swap_color() -> void:
var left = _slots[BUTTON_LEFT].color
var right = _slots[BUTTON_RIGHT].color
Fixed issues where fully transparent color could not be picked More specifically, the color picked sometimes failed to pick transparent color (and picked black instead), swapping between colors when one of them is fully transparent made it fully opaque, and also when picking a color from a palette which was fully transparent made it fully opaque. Closes #364
2020-10-23 17:18:39 +00:00
assign_color(right, BUTTON_LEFT, false)
assign_color(left, BUTTON_RIGHT, false)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func assign_color(color: Color, button: int, change_alpha := true) -> void:
var c: Color = _slots[button].color
Fixed issues where fully transparent color could not be picked More specifically, the color picked sometimes failed to pick transparent color (and picked black instead), swapping between colors when one of them is fully transparent made it fully opaque, and also when picking a color from a palette which was fully transparent made it fully opaque. Closes #364
2020-10-23 17:18:39 +00:00
# This was requested by Issue #54 on GitHub
if color.a == 0 and change_alpha:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
if color.r != c.r or color.g != c.g or color.b != c.b:
color.a = 1
_slots[button].color = color
Global.config_cache.set_value(_slots[button].kname, "color", color)
emit_signal("color_changed", color, button)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func get_assigned_color(button: int) -> Color:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
return _slots[button].color
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func set_button_size(button_size: int) -> void:
Added tool button size option in the Preferences
2021-06-13 23:14:31 +00:00
if button_size == Global.ButtonSize.SMALL:
for t in _tool_buttons.get_children():
t.rect_min_size = Vector2(24, 24)
t.get_node("BackgroundLeft").rect_size.x = 12
t.get_node("BackgroundRight").rect_size.x = 12
t.get_node("BackgroundRight").rect_position = Vector2(24, 24)
else:
for t in _tool_buttons.get_children():
t.rect_min_size = Vector2(32, 32)
t.get_node("BackgroundLeft").rect_size.x = 16
t.get_node("BackgroundRight").rect_size.x = 16
t.get_node("BackgroundRight").rect_position = Vector2(32, 32)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
func update_tool_buttons() -> void:
for child in _tool_buttons.get_children():
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var left_background: NinePatchRect = child.get_node("BackgroundLeft")
var right_background: NinePatchRect = child.get_node("BackgroundRight")
Added tool button size option in the Preferences
2021-06-13 23:14:31 +00:00
left_background.visible = _slots[BUTTON_LEFT].tool_node.name == child.name
right_background.visible = _slots[BUTTON_RIGHT].tool_node.name == child.name
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Remove pre-set tool button nodes, tool setup now being done only in the Tools singleton Now when making a new tool we only have to set it up in Tools.gd, along with its button and cursor textures and its tool options scene. Previously, we also had to put it in ToolButtons.gd and manually create a button in Tools.tscn
2022-02-21 16:02:02 +00:00
func update_hint_tooltips() -> void:
for tool_name in tools:
var t: Tool = tools[tool_name]
t.button_node.hint_tooltip = t.generate_hint_tooltip()
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
func update_tool_cursors() -> void:
Use preload on the tool scenes again This makes the initial app load time fast again, as it used to be before the tool logic changes. The code is uglier to read now but it's worth it. Also optimize update_tool_cursors()
2022-02-22 22:10:16 +00:00
var left_tool: Tool = tools[_slots[BUTTON_LEFT].tool_node.name]
Global.left_cursor.texture = left_tool.cursor_icon
var right_tool: Tool = tools[_slots[BUTTON_RIGHT].tool_node.name]
Global.right_cursor.texture = right_tool.cursor_icon
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
func draw_indicator() -> void:
if Global.right_square_indicator_visible:
Make the right tool indicator enabled by default and orange, closes #691
2022-07-07 23:49:40 +00:00
_slots[BUTTON_RIGHT].tool_node.draw_indicator(false)
if Global.left_square_indicator_visible:
_slots[BUTTON_LEFT].tool_node.draw_indicator(true)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Add Rectangle and Ellipse tools (#456) * Add Shapes Tool (WIP) * Add Alt button + Fill shape + Other stuff * Add blue theme button textures * Fix tool not previewing on right button * Add config functions * Fix ellipse bug * Correctly added thickness * Keep preview with CTRL * Fix weird PoolVector behaviour * Make preview follow mouse when pressing CTRL * Moved shapes class to a separate script * Update tooltip * Enable mirrors * Separate tools + jittery preview fix + more * Add missing translation * Add missing icons and keybindings * Changed shape draw function buttons Co-authored-by: DragonOfWar <47753585+KawanWeege@users.noreply.github.com>
2021-03-30 17:07:13 +00:00
func draw_preview() -> void:
_slots[BUTTON_LEFT].tool_node.draw_preview()
_slots[BUTTON_RIGHT].tool_node.draw_preview()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func handle_draw(position: Vector2, event: InputEvent) -> void:
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
if not (Global.can_draw and Global.has_focus):
return
Apply mirror view to all tools
2021-03-29 20:00:09 +00:00
var draw_pos := position
if Global.mirror_view:
draw_pos.x = Global.current_project.size.x - position.x - 1
Made left and right tool activation shortcuts configurable Mapped to left and right mouse buttons respectively by default, as well was L1 and R1 buttons respectively in joypads. This commit should allow mouse-free drawing, since it's now possible to activate the left and right tools via joypad and keyboard buttons, thanks to the Keychain plugin.
2022-05-16 22:25:50 +00:00
if event.is_action_pressed("activate_left_tool") and _active_button == -1:
_active_button = BUTTON_LEFT
_slots[_active_button].tool_node.draw_start(draw_pos)
elif event.is_action_released("activate_left_tool") and _active_button == BUTTON_LEFT:
_slots[_active_button].tool_node.draw_end(draw_pos)
_active_button = -1
elif event.is_action("activate_right_tool") and _active_button == -1:
_active_button = BUTTON_RIGHT
_slots[_active_button].tool_node.draw_start(draw_pos)
elif event.is_action_released("activate_right_tool") and _active_button == BUTTON_RIGHT:
_slots[_active_button].tool_node.draw_end(draw_pos)
_active_button = -1
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
if event is InputEventMouseMotion:
Fixed a bug with the Zoom tool, removed Godot's version check from Tools.gd and updated AboutDialog, CHANGELOG and Translations
2021-01-26 14:34:25 +00:00
pen_pressure = event.pressure
if Global.pressure_sensitivity_mode == Global.PressureSensitivity.NONE:
pen_pressure = 1.0
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
if not position.is_equal_approx(_last_position):
_last_position = position
_slots[BUTTON_LEFT].tool_node.cursor_move(position)
_slots[BUTTON_RIGHT].tool_node.cursor_move(position)
if _active_button != -1:
Apply mirror view to all tools
2021-03-29 20:00:09 +00:00
_slots[_active_button].tool_node.draw_move(draw_pos)
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var project: Project = Global.current_project
Refactoring tools (#281) * Refactoring tools * Remove unused code * Fixed some inferring errors and added translations * Attempt to fix some Script Errors found in the CI workflow * Fix bucket crash. * Fix static type convert. Co-authored-by: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
2020-07-09 12:22:17 +00:00
var text := "[%s×%s]" % [project.size.x, project.size.y]
if Global.has_focus:
text += " %s, %s" % [position.x, position.y]
if not _slots[BUTTON_LEFT].tool_node.cursor_text.empty():
text += " %s" % _slots[BUTTON_LEFT].tool_node.cursor_text
if not _slots[BUTTON_RIGHT].tool_node.cursor_text.empty():
text += " %s" % _slots[BUTTON_RIGHT].tool_node.cursor_text
Global.cursor_position_label.text = text
Copy permalink