huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 09:39:48 +00:00
Code Issues Wiki Activity
Pixelorama/Scripts/BrushButton.gd

104 lines
4.4 KiB
GDScript3
Raw Normal View History

More UI changes - Left tool options is now on top of the right tool options. - Brushes have been removed from the right panel, and have instead become a popup that appears when you press one of the brush type buttons, to choose a brush. The indicators will be removed.
2019-11-29 22:41:34 +00:00
extends BaseButton
Custom brushes, crop image, split screen, about menu & asset re-organizing - Added support for custom brushes. When you Ctrl-C a selection, it gets added to the list of custom brushes. Each mouse button can have a different brush, and the user can choose whether their color comes from the brush itself or the selected color in the tool options. They can also be resized based on the selected brush size. - Custom brushes are also being saved on .pxo files. - You can now crop images (per frame). All layers of that frame are taken into account and are affected. - Added split screen support. The user can toggle between single screen and split screen, where a second canvas is being shown. Note that you cannot draw on the second canvas. - Added an About Pixelorama selection on the new Help menu. - Project assets are re-organized.
2019-09-25 19:59:48 +00:00
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
export var brush_type = 0 # Global.Brush_Types.PIXEL
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
export var custom_brush_index := -3
Added a new brush type - Random Brushes They're like File brushes, but each time you draw, expect to see something different! To make a random brush, just put the images you want in the same folder (under the main Brushes folder of course), and make sure their filename starts with "%". I also changed _process() to _input() in Canvas.gd, so there may be some unexpected behavior.
2019-12-26 19:36:56 +00:00
# warning-ignore:unused_class_variable
var random_brushes := []
Brush Selection Fix
2020-04-17 17:03:52 +00:00
signal brush_selected
Custom brushes, crop image, split screen, about menu & asset re-organizing - Added support for custom brushes. When you Ctrl-C a selection, it gets added to the list of custom brushes. Each mouse button can have a different brush, and the user can choose whether their color comes from the brush itself or the selected color in the tool options. They can also be resized based on the selected brush size. - Custom brushes are also being saved on .pxo files. - You can now crop images (per frame). All layers of that frame are taken into account and are affected. - Added split screen support. The user can toggle between single screen and split screen, where a second canvas is being shown. Note that you cannot draw on the second canvas. - Added an About Pixelorama selection on the new Help menu. - Project assets are re-organized.
2019-09-25 19:59:48 +00:00
func _on_BrushButton_pressed() -> void:
Remove custom brushes with the middle mouse button And made the "X" button on the custom brushes a little smaller. Partially addresses #132
2020-01-27 22:19:55 +00:00
# Delete the brush on middle mouse press
if Input.is_action_just_released("middle_mouse"):
_on_DeleteButton_pressed()
return
Pattern filling - Partially addresses #130 If the user chooses a brush that is not the pixel or a circle brush and uses the bucket tool, the brush image is used as a pattern that fills the area.
2020-03-28 03:15:09 +00:00
Added proper circle brush - Bresenham's Circle Algorithm The circle's radius is the brush's size. Respects image/selection boundaries, works with mirror. A special plot_circle() method is found on Global, to calculate the rectangles used by the mouse cursor/position indicator.
2019-12-25 18:27:25 +00:00
# Change left brush
Fixed issue where the brush type select popup window chose brush type for the right tool instead of the left
2019-12-16 00:02:49 +00:00
if Global.brush_type_window_position == "left":
Custom brushes, crop image, split screen, about menu & asset re-organizing - Added support for custom brushes. When you Ctrl-C a selection, it gets added to the list of custom brushes. Each mouse button can have a different brush, and the user can choose whether their color comes from the brush itself or the selected color in the tool options. They can also be resized based on the selected brush size. - Custom brushes are also being saved on .pxo files. - You can now crop images (per frame). All layers of that frame are taken into account and are affected. - Added split screen support. The user can toggle between single screen and split screen, where a second canvas is being shown. Note that you cannot draw on the second canvas. - Added an About Pixelorama selection on the new Help menu. - Project assets are re-organized.
2019-09-25 19:59:48 +00:00
Global.current_left_brush_type = brush_type
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
Global.custom_left_brush_index = custom_brush_index
Added proper circle brush - Bresenham's Circle Algorithm The circle's radius is the brush's size. Respects image/selection boundaries, works with mirror. A special plot_circle() method is found on Global, to calculate the rectangles used by the mouse cursor/position indicator.
2019-12-25 18:27:25 +00:00
if custom_brush_index > -1: # Custom brush
Added Patterns for the bucket tool The bucket tool can now use Patterns instead of colors to fill areas. They get loaded from the "Patterns" folder, similar to how Brushes and Palletes work. You can no longer use brushes for the bucket tool.
2020-04-24 21:42:02 +00:00
if Global.current_left_tool == "Pencil":
"Brush color from" doesn't appear when Pencil isn't selected Also renamed some nodes and made changes to the links found at the About Dialog.
2019-12-03 15:59:50 +00:00
Global.left_color_interpolation_container.visible = true
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# if hint_tooltip == "":
# Global.left_brush_type_label.text = tr("Custom brush")
# else:
# Global.left_brush_type_label.text = tr("Brush:") + " %s" % hint_tooltip
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -3: # Pixel brush
"Brush color from" now invisible when pixel brush is selected
2019-12-02 22:25:22 +00:00
Global.left_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.left_brush_type_label.text = tr("Brush: Pixel")
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -2: # Circle brush
Added proper circle brush - Bresenham's Circle Algorithm The circle's radius is the brush's size. Respects image/selection boundaries, works with mirror. A special plot_circle() method is found on Global, to calculate the rectangles used by the mouse cursor/position indicator.
2019-12-25 18:27:25 +00:00
Global.left_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.left_brush_type_label.text = tr("Brush: Circle")
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -1: # Filled Circle brush
Global.left_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.left_brush_type_label.text = tr("Brush: Filled Circle")
More UI changes - Left tool options is now on top of the right tool options. - Brushes have been removed from the right panel, and have instead become a popup that appears when you press one of the brush type buttons, to choose a brush. The indicators will be removed.
2019-11-29 22:41:34 +00:00
Global.update_left_custom_brush()
Brush Selection Fix
2020-04-17 17:03:52 +00:00
emit_signal("brush_selected")
Remove trailing whitespace and ensure newlines at end of files
2019-10-25 14:38:38 +00:00
Added proper circle brush - Bresenham's Circle Algorithm The circle's radius is the brush's size. Respects image/selection boundaries, works with mirror. A special plot_circle() method is found on Global, to calculate the rectangles used by the mouse cursor/position indicator.
2019-12-25 18:27:25 +00:00
else: # Change right brush
Custom brushes, crop image, split screen, about menu & asset re-organizing - Added support for custom brushes. When you Ctrl-C a selection, it gets added to the list of custom brushes. Each mouse button can have a different brush, and the user can choose whether their color comes from the brush itself or the selected color in the tool options. They can also be resized based on the selected brush size. - Custom brushes are also being saved on .pxo files. - You can now crop images (per frame). All layers of that frame are taken into account and are affected. - Added split screen support. The user can toggle between single screen and split screen, where a second canvas is being shown. Note that you cannot draw on the second canvas. - Added an About Pixelorama selection on the new Help menu. - Project assets are re-organized.
2019-09-25 19:59:48 +00:00
Global.current_right_brush_type = brush_type
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
Global.custom_right_brush_index = custom_brush_index
Custom brushes, crop image, split screen, about menu & asset re-organizing - Added support for custom brushes. When you Ctrl-C a selection, it gets added to the list of custom brushes. Each mouse button can have a different brush, and the user can choose whether their color comes from the brush itself or the selected color in the tool options. They can also be resized based on the selected brush size. - Custom brushes are also being saved on .pxo files. - You can now crop images (per frame). All layers of that frame are taken into account and are affected. - Added split screen support. The user can toggle between single screen and split screen, where a second canvas is being shown. Note that you cannot draw on the second canvas. - Added an About Pixelorama selection on the new Help menu. - Project assets are re-organized.
2019-09-25 19:59:48 +00:00
if custom_brush_index > -1:
Added Patterns for the bucket tool The bucket tool can now use Patterns instead of colors to fill areas. They get loaded from the "Patterns" folder, similar to how Brushes and Palletes work. You can no longer use brushes for the bucket tool.
2020-04-24 21:42:02 +00:00
if Global.current_right_tool == "Pencil":
"Brush color from" doesn't appear when Pencil isn't selected Also renamed some nodes and made changes to the links found at the About Dialog.
2019-12-03 15:59:50 +00:00
Global.right_color_interpolation_container.visible = true
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# if hint_tooltip == "":
# Global.right_brush_type_label.text = tr("Custom brush")
# else:
# Global.right_brush_type_label.text = tr("Brush:") + " %s" % hint_tooltip
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -3: # Pixel brush
"Brush color from" now invisible when pixel brush is selected
2019-12-02 22:25:22 +00:00
Global.right_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.right_brush_type_label.text = tr("Brush: Pixel")
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -2: # Circle brush
Added proper circle brush - Bresenham's Circle Algorithm The circle's radius is the brush's size. Respects image/selection boundaries, works with mirror. A special plot_circle() method is found on Global, to calculate the rectangles used by the mouse cursor/position indicator.
2019-12-25 18:27:25 +00:00
Global.right_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.right_brush_type_label.text = tr("Brush: Circle")
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
elif custom_brush_index == -1: # Filled Circle brush
Global.right_color_interpolation_container.visible = false
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.right_brush_type_label.text = tr("Brush: Filled Circle")
More UI changes - Left tool options is now on top of the right tool options. - Brushes have been removed from the right panel, and have instead become a popup that appears when you press one of the brush type buttons, to choose a brush. The indicators will be removed.
2019-11-29 22:41:34 +00:00
Global.update_right_custom_brush()
Brush Selection Fix
2020-04-17 17:03:52 +00:00
emit_signal("brush_selected")
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
func _on_DeleteButton_pressed() -> void:
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
if brush_type == Global.Brush_Types.CUSTOM:
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
if Global.custom_left_brush_index == custom_brush_index:
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
Global.custom_left_brush_index = -3
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
Global.current_left_brush_type = Global.Brush_Types.PIXEL
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.left_brush_type_label.text = "Brush: Pixel"
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
Global.update_left_custom_brush()
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
if Global.custom_right_brush_index == custom_brush_index:
Added a new brush type - Filled Circle Filled Circle brush is just like the Circle brush, but filled. Issue is, when drawing while moving the mouse, some pixels remain unfilled. Also added some more file brushes.
2019-12-27 20:02:47 +00:00
Global.custom_right_brush_index = -3
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
Global.current_right_brush_type = Global.Brush_Types.PIXEL
Major UI changes in Main.tscn More changes will happen
2020-03-27 01:40:23 +00:00
# Global.right_brush_type_label.text = "Brush: Pixel"
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
Global.update_right_custom_brush()
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
var project_brush_index = custom_brush_index - Global.brushes_from_files
UndoRedo vol 11 - Remove custom brush has UndoRedo - Removing a custom brush can now be undone and redone. - Fixed custom brush symmetry on mirrored drawing
2019-11-11 16:41:43 +00:00
Global.undos += 1
Global.undo_redo.create_action("Delete Custom Brush")
Removed left and right brush arrows - Removed left and right brush arrow indicators completely. - Fixed bug when removing custom project brushes.
2019-11-30 00:45:45 +00:00
for i in range(project_brush_index, Global.project_brush_container.get_child_count()):
Added a seconds ruler for the timeline & changed brushes position
2019-11-20 12:41:02 +00:00
var bb = Global.project_brush_container.get_child(i)
UndoRedo vol 11 - Remove custom brush has UndoRedo - Removing a custom brush can now be undone and redone. - Fixed custom brush symmetry on mirrored drawing
2019-11-11 16:41:43 +00:00
if Global.custom_left_brush_index == bb.custom_brush_index:
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
Global.custom_left_brush_index -= 1
UndoRedo vol 11 - Remove custom brush has UndoRedo - Removing a custom brush can now be undone and redone. - Fixed custom brush symmetry on mirrored drawing
2019-11-11 16:41:43 +00:00
if Global.custom_right_brush_index == bb.custom_brush_index:
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
Global.custom_right_brush_index -= 1
UndoRedo vol 11 - Remove custom brush has UndoRedo - Removing a custom brush can now be undone and redone. - Fixed custom brush symmetry on mirrored drawing
2019-11-11 16:41:43 +00:00
Global.undo_redo.add_do_property(bb, "custom_brush_index", bb.custom_brush_index - 1)
Global.undo_redo.add_undo_property(bb, "custom_brush_index", bb.custom_brush_index)
Fix multiple inferring errors
2019-12-27 22:00:24 +00:00
var custom_brushes: Array = Global.custom_brushes.duplicate()
UndoRedo vol 11 - Remove custom brush has UndoRedo - Removing a custom brush can now be undone and redone. - Fixed custom brush symmetry on mirrored drawing
2019-11-11 16:41:43 +00:00
custom_brushes.remove(custom_brush_index)
Global.undo_redo.add_do_property(Global, "custom_brushes", custom_brushes)
Global.undo_redo.add_undo_property(Global, "custom_brushes", Global.custom_brushes)
Global.undo_redo.add_do_method(Global, "redo_custom_brush", self)
Global.undo_redo.add_undo_method(Global, "undo_custom_brush", self)
Global.undo_redo.commit_action()
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
func _on_BrushButton_mouse_entered() -> void:
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
if brush_type == Global.Brush_Types.CUSTOM:
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
$DeleteButton.visible = true
func _on_BrushButton_mouse_exited() -> void:
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
if brush_type == Global.Brush_Types.CUSTOM:
Remove custom brushes - The ability to remove custom "project" brushes have now been added. Note that you cannot remove file brushes, or the pixel brush. - Added some UI labels for the two brush containers
2019-11-11 13:55:28 +00:00
$DeleteButton.visible = false
Copy permalink