diff --git a/addons/draw_gd/plugin.cfg b/addons/draw_gd/plugin.cfg new file mode 100644 index 0000000..850ee53 --- /dev/null +++ b/addons/draw_gd/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="DrawGD" +description="A free & open-source 2D sprite editor editor plugin, based on Pixelorama." +author="Relintai" +version="" +script="plugin.gd" diff --git a/addons/draw_gd/plugin.gd b/addons/draw_gd/plugin.gd new file mode 100644 index 0000000..49e712e --- /dev/null +++ b/addons/draw_gd/plugin.gd @@ -0,0 +1,10 @@ +tool +extends EditorPlugin + + +func _enter_tree(): + pass + + +func _exit_tree(): + pass diff --git a/src/Autoload/DrawGD.gd b/addons/draw_gd/src/Autoload/DrawGD.gd similarity index 98% rename from src/Autoload/DrawGD.gd rename to addons/draw_gd/src/Autoload/DrawGD.gd index 71f40d5..36a5d1b 100644 --- a/src/Autoload/DrawGD.gd +++ b/addons/draw_gd/src/Autoload/DrawGD.gd @@ -14,7 +14,7 @@ const high_speed_move_rate := 3750.0 var root_directory := "." var window_title := "" setget title_changed # Why doesn't Godot have get_window_title()? var config_cache := ConfigFile.new() -var XDGDataPaths = preload("res://src/XDGDataPaths.gd") +var XDGDataPaths = preload("res://addons/draw_gd/src/XDGDataPaths.gd") var directory_module : Reference var projects := [] # Array of Projects @@ -166,10 +166,10 @@ var quit_and_save_dialog : ConfirmationDialog onready var current_version : String = ProjectSettings.get_setting("application/config/Version") -var tools_script = preload("res://src/Autoload/Tools.gd") +var tools_script = preload("res://addons/draw_gd/src/Autoload/Tools.gd") var tools = null -var opensave_script = preload("res://src/Autoload/OpenSave.gd") +var opensave_script = preload("res://addons/draw_gd/src/Autoload/OpenSave.gd") var opensave = null func _ready() -> void: @@ -291,7 +291,7 @@ func find_node_by_name(root : Node, node_name : String) -> Node: func notification_label(text : String) -> void: - var notification : Label = load("res://src/UI/NotificationLabel.tscn").instance() + var notification : Label = load("res://addons/draw_gd/src/UI/NotificationLabel.tscn").instance() notification.text = tr(text) notification.rect_position = Vector2(240, OS.window_size.y - animation_timeline.rect_size.y - 20) notification.theme = control.theme diff --git a/src/Autoload/DrawingAlgos.gd b/addons/draw_gd/src/Autoload/DrawingAlgos.gd similarity index 100% rename from src/Autoload/DrawingAlgos.gd rename to addons/draw_gd/src/Autoload/DrawingAlgos.gd diff --git a/src/Autoload/Export.gd b/addons/draw_gd/src/Autoload/Export.gd similarity index 100% rename from src/Autoload/Export.gd rename to addons/draw_gd/src/Autoload/Export.gd diff --git a/src/Autoload/Import.gd b/addons/draw_gd/src/Autoload/Import.gd similarity index 100% rename from src/Autoload/Import.gd rename to addons/draw_gd/src/Autoload/Import.gd diff --git a/src/Autoload/OpenSave.gd b/addons/draw_gd/src/Autoload/OpenSave.gd similarity index 99% rename from src/Autoload/OpenSave.gd rename to addons/draw_gd/src/Autoload/OpenSave.gd index 7c2011c..8593ccd 100644 --- a/src/Autoload/OpenSave.gd +++ b/addons/draw_gd/src/Autoload/OpenSave.gd @@ -1,6 +1,6 @@ extends Node -var Export = preload("res://src/Autoload/Export.gd") +var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") var current_save_paths := [] # Array of strings # Stores a filename of a backup file in user:// until user saves manually @@ -39,7 +39,7 @@ func handle_loading_files(files : PoolStringArray) -> void: func handle_loading_image(file : String, image : Image) -> void: - var preview_dialog : ConfirmationDialog = preload("res://src/UI/Dialogs/PreviewDialog.tscn").instance() + var preview_dialog : ConfirmationDialog = preload("res://addons/draw_gd/src/UI/Dialogs/PreviewDialog.tscn").instance() preview_dialog.path = file preview_dialog.image = image DrawGD.control.add_child(preview_dialog) diff --git a/src/Autoload/Tools.gd b/addons/draw_gd/src/Autoload/Tools.gd similarity index 93% rename from src/Autoload/Tools.gd rename to addons/draw_gd/src/Autoload/Tools.gd index e4cb9a8..7f62900 100644 --- a/src/Autoload/Tools.gd +++ b/addons/draw_gd/src/Autoload/Tools.gd @@ -39,13 +39,13 @@ class Slot: signal color_changed(color, button) var _tools = { - "RectSelect" : "res://src/Tools/RectSelect.tscn", - "Zoom" : "res://src/Tools/Zoom.tscn", - "ColorPicker" : "res://src/Tools/ColorPicker.tscn", - "Pencil" : "res://src/Tools/Pencil.tscn", - "Eraser" : "res://src/Tools/Eraser.tscn", - "Bucket" : "res://src/Tools/Bucket.tscn", - "LightenDarken" : "res://src/Tools/LightenDarken.tscn", + "RectSelect" : "res://addons/draw_gd/src/Tools/RectSelect.tscn", + "Zoom" : "res://addons/draw_gd/src/Tools/Zoom.tscn", + "ColorPicker" : "res://addons/draw_gd/src/Tools/ColorPicker.tscn", + "Pencil" : "res://addons/draw_gd/src/Tools/Pencil.tscn", + "Eraser" : "res://addons/draw_gd/src/Tools/Eraser.tscn", + "Bucket" : "res://addons/draw_gd/src/Tools/Bucket.tscn", + "LightenDarken" : "res://addons/draw_gd/src/Tools/LightenDarken.tscn", } var _slots = {} var _panels = {} diff --git a/src/Classes/AnimationTag.gd b/addons/draw_gd/src/Classes/AnimationTag.gd similarity index 100% rename from src/Classes/AnimationTag.gd rename to addons/draw_gd/src/Classes/AnimationTag.gd diff --git a/src/Classes/Cel.gd b/addons/draw_gd/src/Classes/Cel.gd similarity index 100% rename from src/Classes/Cel.gd rename to addons/draw_gd/src/Classes/Cel.gd diff --git a/src/Classes/Drawers.gd b/addons/draw_gd/src/Classes/Drawers.gd similarity index 100% rename from src/Classes/Drawers.gd rename to addons/draw_gd/src/Classes/Drawers.gd diff --git a/src/Classes/Frame.gd b/addons/draw_gd/src/Classes/Frame.gd similarity index 100% rename from src/Classes/Frame.gd rename to addons/draw_gd/src/Classes/Frame.gd diff --git a/src/Classes/ImageEffect.gd b/addons/draw_gd/src/Classes/ImageEffect.gd similarity index 98% rename from src/Classes/ImageEffect.gd rename to addons/draw_gd/src/Classes/ImageEffect.gd index df24164..300ff92 100644 --- a/src/Classes/ImageEffect.gd +++ b/addons/draw_gd/src/Classes/ImageEffect.gd @@ -2,7 +2,7 @@ class_name ImageEffect extends AcceptDialog # Parent class for all image effects # Methods that have "pass" are meant to be replaced by the inherited Scripts -var Export = preload("res://src/Autoload/Export.gd") +var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") enum {CEL, FRAME, ALL_FRAMES, ALL_PROJECTS} diff --git a/src/Classes/Layer.gd b/addons/draw_gd/src/Classes/Layer.gd similarity index 100% rename from src/Classes/Layer.gd rename to addons/draw_gd/src/Classes/Layer.gd diff --git a/src/Classes/Project.gd b/addons/draw_gd/src/Classes/Project.gd similarity index 96% rename from src/Classes/Project.gd rename to addons/draw_gd/src/Classes/Project.gd index ca6976e..ac4e689 100644 --- a/src/Classes/Project.gd +++ b/addons/draw_gd/src/Classes/Project.gd @@ -1,7 +1,7 @@ class_name Project extends Reference # A class for project properties. -var Export = preload("res://src/Autoload/Export.gd") +var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") var name := "" setget name_changed var size : Vector2 setget size_changed @@ -102,7 +102,7 @@ func change_project() -> void: # Create new ones for i in range(layers.size() - 1, -1, -1): # Create layer buttons - var layer_container = load("res://src/UI/Timeline/LayerButton.tscn").instance() + var layer_container = load("res://addons/draw_gd/src/UI/Timeline/LayerButton.tscn").instance() layer_container.i = i if layers[i].name == tr("Layer") + " 0": layers[i].name = tr("Layer") + " %s" % i @@ -113,7 +113,7 @@ func change_project() -> void: DrawGD.frames_container.add_child(layers[i].frame_container) for j in range(frames.size()): # Create Cel buttons - var cel_button = load("res://src/UI/Timeline/CelButton.tscn").instance() + var cel_button = load("res://addons/draw_gd/src/UI/Timeline/CelButton.tscn").instance() cel_button.frame = j cel_button.layer = i cel_button.get_child(0).texture = frames[j].cels[i].image_texture @@ -365,7 +365,7 @@ func frames_changed(value : Array) -> void: DrawGD.frame_ids.add_child(label) for i in range(layers.size() - 1, -1, -1): - var cel_button = load("res://src/UI/Timeline/CelButton.tscn").instance() + var cel_button = load("res://addons/draw_gd/src/UI/Timeline/CelButton.tscn").instance() cel_button.frame = j cel_button.layer = i cel_button.get_child(0).texture = frames[j].cels[i].image_texture @@ -387,7 +387,7 @@ func layers_changed(value : Array) -> void: remove_cel_buttons() for i in range(layers.size() - 1, -1, -1): - var layer_container = load("res://src/UI/Timeline/LayerButton.tscn").instance() + var layer_container = load("res://addons/draw_gd/src/UI/Timeline/LayerButton.tscn").instance() layer_container.i = i if layers[i].name == tr("Layer") + " 0": layers[i].name = tr("Layer") + " %s" % i @@ -398,7 +398,7 @@ func layers_changed(value : Array) -> void: DrawGD.frames_container.add_child(layers[i].frame_container) for j in range(frames.size()): - var cel_button = load("res://src/UI/Timeline/CelButton.tscn").instance() + var cel_button = load("res://addons/draw_gd/src/UI/Timeline/CelButton.tscn").instance() cel_button.frame = j cel_button.layer = i cel_button.get_child(0).texture = frames[j].cels[i].image_texture @@ -505,7 +505,7 @@ func animation_tags_changed(value : Array) -> void: child.queue_free() for tag in animation_tags: - var tag_c : Container = load("res://src/UI/Timeline/AnimationTag.tscn").instance() + var tag_c : Container = load("res://addons/draw_gd/src/UI/Timeline/AnimationTag.tscn").instance() DrawGD.tag_container.add_child(tag_c) var tag_position : int = DrawGD.tag_container.get_child_count() - 1 DrawGD.tag_container.move_child(tag_c, tag_position) diff --git a/src/Main.gd b/addons/draw_gd/src/Main.gd similarity index 98% rename from src/Main.gd rename to addons/draw_gd/src/Main.gd index 03217ee..dec0d63 100644 --- a/src/Main.gd +++ b/addons/draw_gd/src/Main.gd @@ -1,7 +1,7 @@ extends Control -var Export = preload("res://src/Autoload/Export.gd") -var ImportScript = preload("res://src/Autoload/Import.gd") +var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") +var ImportScript = preload("res://addons/draw_gd/src/Autoload/Import.gd") var Import = ImportScript.new() var opensprite_file_selected := false diff --git a/src/Main.tscn b/addons/draw_gd/src/Main.tscn similarity index 76% rename from src/Main.tscn rename to addons/draw_gd/src/Main.tscn index c63ca8a..0176107 100644 --- a/src/Main.tscn +++ b/addons/draw_gd/src/Main.tscn @@ -1,22 +1,22 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://src/Main.gd" type="Script" id=2] -[ext_resource path="res://src/UI/TopMenuContainer.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/UI/UI.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/UI/PatternsPopup.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/UI/BrushesPopup.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ImageEffects.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/UI/Dialogs/SaveSpriteHTML5.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/UI/Dialogs/SaveSprite.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/UI/Dialogs/OpenSprite.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/UI/Dialogs/CreateNewImage.tscn" type="PackedScene" id=28] -[ext_resource path="res://src/Preferences/PreferencesDialog.tscn" type="PackedScene" id=32] -[ext_resource path="res://src/UI/Dialogs/ExportDialog.tscn" type="PackedScene" id=39] +[ext_resource path="res://addons/draw_gd/src/Main.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ImageEffects.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/CreateNewImage.tscn" type="PackedScene" id=3] +[ext_resource path="res://addons/draw_gd/src/UI/BrushesPopup.tscn" type="PackedScene" id=4] +[ext_resource path="res://addons/draw_gd/src/UI/PatternsPopup.tscn" type="PackedScene" id=5] +[ext_resource path="res://addons/draw_gd/src/UI/UI.tscn" type="PackedScene" id=6] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/OpenSprite.tscn" type="PackedScene" id=7] +[ext_resource path="res://addons/draw_gd/src/Preferences/PreferencesDialog.tscn" type="PackedScene" id=8] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ExportDialog.tscn" type="PackedScene" id=9] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/SaveSpriteHTML5.tscn" type="PackedScene" id=10] +[ext_resource path="res://addons/draw_gd/src/UI/TopMenuContainer.tscn" type="PackedScene" id=11] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/SaveSprite.tscn" type="PackedScene" id=12] [node name="DrawGDControl" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 2 ) +script = ExtResource( 1 ) __meta__ = { "_edit_horizontal_guides_": [ ], "_edit_use_anchors_": false, @@ -31,9 +31,9 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="TopMenuContainer" parent="MenuAndUI" instance=ExtResource( 3 )] +[node name="TopMenuContainer" parent="MenuAndUI" instance=ExtResource( 11 )] -[node name="UI" parent="MenuAndUI" instance=ExtResource( 4 )] +[node name="UI" parent="MenuAndUI" instance=ExtResource( 6 )] [node name="Dialogs" type="Control" parent="."] mouse_filter = 2 @@ -41,30 +41,30 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ImageEffects" parent="Dialogs" instance=ExtResource( 7 )] +[node name="ImageEffects" parent="Dialogs" instance=ExtResource( 2 )] -[node name="BrushesPopup" parent="Dialogs" instance=ExtResource( 6 )] +[node name="BrushesPopup" parent="Dialogs" instance=ExtResource( 4 )] [node name="PatternsPopup" parent="Dialogs" instance=ExtResource( 5 )] -[node name="CreateNewImage" parent="Dialogs" instance=ExtResource( 28 )] +[node name="CreateNewImage" parent="Dialogs" instance=ExtResource( 3 )] margin_right = 375.0 -[node name="OpenSprite" parent="Dialogs" instance=ExtResource( 12 )] +[node name="OpenSprite" parent="Dialogs" instance=ExtResource( 7 )] current_dir = "/home/relintai/Projects/draw_gd" current_path = "/home/relintai/Projects/draw_gd/" -[node name="SaveSprite" parent="Dialogs" instance=ExtResource( 11 )] +[node name="SaveSprite" parent="Dialogs" instance=ExtResource( 12 )] margin_left = 108.0 margin_top = 40.0 margin_right = 623.0 margin_bottom = 388.0 -[node name="SaveSpriteHTML5" parent="Dialogs" instance=ExtResource( 8 )] +[node name="SaveSpriteHTML5" parent="Dialogs" instance=ExtResource( 10 )] -[node name="ExportDialog" parent="Dialogs" instance=ExtResource( 39 )] +[node name="ExportDialog" parent="Dialogs" instance=ExtResource( 9 )] -[node name="PreferencesDialog" parent="Dialogs" instance=ExtResource( 32 )] +[node name="PreferencesDialog" parent="Dialogs" instance=ExtResource( 8 )] margin_right = 617.0 [node name="UnsavedCanvasDialog" type="ConfirmationDialog" parent="Dialogs"] diff --git a/src/Palette/EditPalettePopup.gd b/addons/draw_gd/src/Palette/EditPalettePopup.gd similarity index 98% rename from src/Palette/EditPalettePopup.gd rename to addons/draw_gd/src/Palette/EditPalettePopup.gd index afe31c8..ae8eecf 100644 --- a/src/Palette/EditPalettePopup.gd +++ b/addons/draw_gd/src/Palette/EditPalettePopup.gd @@ -1,6 +1,6 @@ extends WindowDialog -var palette_button = preload("res://src/Palette/PaletteButton.tscn") +var palette_button = preload("res://addons/draw_gd/src/Palette/PaletteButton.tscn") var current_palette : String var current_swatch := -1 diff --git a/src/Palette/EditPalettePopup.tscn b/addons/draw_gd/src/Palette/EditPalettePopup.tscn similarity index 96% rename from src/Palette/EditPalettePopup.tscn rename to addons/draw_gd/src/Palette/EditPalettePopup.tscn index 76d5d2c..84e4289 100644 --- a/src/Palette/EditPalettePopup.tscn +++ b/addons/draw_gd/src/Palette/EditPalettePopup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://src/Palette/EditPalettePopup.gd" type="Script" id=1] +[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=1] [ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2] -[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=3] -[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=6] +[ext_resource path="res://addons/draw_gd/src/Palette/EditPalettePopup.gd" type="Script" id=3] +[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=4] [sub_resource type="ButtonGroup" id=1] @@ -12,7 +12,7 @@ margin_right = 600.0 margin_bottom = 550.0 rect_min_size = Vector2( 600, 570 ) window_title = "Edit Palette" -script = ExtResource( 1 ) +script = ExtResource( 3 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_right = 1.0 @@ -94,7 +94,7 @@ margin_left = 2.0 margin_top = 3.0 margin_right = 62.0 margin_bottom = 29.0 -texture = ExtResource( 6 ) +texture = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false } @@ -111,7 +111,7 @@ margin_left = 2.0 margin_top = 3.0 margin_right = 62.0 margin_bottom = 29.0 -texture = ExtResource( 6 ) +texture = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false } @@ -160,7 +160,7 @@ margin_left = -6.0 margin_top = -1.0 margin_right = 6.0 margin_bottom = 1.0 -texture = ExtResource( 3 ) +texture = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -239,6 +239,7 @@ margin_right = 385.0 margin_bottom = 30.0 group = SubResource( 1 ) text = "Dummy" + [connection signal="popup_hide" from="." to="." method="_on_EditPalettePopup_popup_hide"] [connection signal="color_changed" from="VBoxContainer/HBoxContainer/EditPaletteColorPicker" to="." method="_on_EditPaletteColorPicker_color_changed"] [connection signal="pressed" from="VBoxContainer/HBoxContainer/VBoxContainer/CenterContainer/HBoxContainer/LeftColor" to="." method="_on_LeftColor_pressed"] diff --git a/src/Palette/NewPaletteDialog.tscn b/addons/draw_gd/src/Palette/NewPaletteDialog.tscn similarity index 100% rename from src/Palette/NewPaletteDialog.tscn rename to addons/draw_gd/src/Palette/NewPaletteDialog.tscn diff --git a/src/Palette/Palette.gd b/addons/draw_gd/src/Palette/Palette.gd similarity index 100% rename from src/Palette/Palette.gd rename to addons/draw_gd/src/Palette/Palette.gd diff --git a/src/Palette/PaletteButton.gd b/addons/draw_gd/src/Palette/PaletteButton.gd similarity index 100% rename from src/Palette/PaletteButton.gd rename to addons/draw_gd/src/Palette/PaletteButton.gd diff --git a/src/Palette/PaletteButton.tscn b/addons/draw_gd/src/Palette/PaletteButton.tscn similarity index 81% rename from src/Palette/PaletteButton.tscn rename to addons/draw_gd/src/Palette/PaletteButton.tscn index 11d9eb0..ba61ab6 100644 --- a/src/Palette/PaletteButton.tscn +++ b/addons/draw_gd/src/Palette/PaletteButton.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/Palette/PaletteButton.gd" type="Script" id=3] -[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=6] +[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=1] +[ext_resource path="res://addons/draw_gd/src/Palette/PaletteButton.gd" type="Script" id=2] [sub_resource type="ImageTexture" id=1] @@ -15,7 +15,7 @@ toggle_mode = true action_mode = 0 button_mask = 3 icon = SubResource( 1 ) -script = ExtResource( 3 ) +script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } @@ -29,7 +29,7 @@ margin_right = -1.0 margin_bottom = -1.0 size_flags_horizontal = 3 size_flags_vertical = 3 -texture = ExtResource( 6 ) +texture = ExtResource( 1 ) patch_margin_left = 2 patch_margin_top = 2 patch_margin_right = 2 diff --git a/src/Palette/PaletteColor.gd b/addons/draw_gd/src/Palette/PaletteColor.gd similarity index 100% rename from src/Palette/PaletteColor.gd rename to addons/draw_gd/src/Palette/PaletteColor.gd diff --git a/src/Palette/PaletteContainer.gd b/addons/draw_gd/src/Palette/PaletteContainer.gd similarity index 98% rename from src/Palette/PaletteContainer.gd rename to addons/draw_gd/src/Palette/PaletteContainer.gd index 56393bf..290154b 100644 --- a/src/Palette/PaletteContainer.gd +++ b/addons/draw_gd/src/Palette/PaletteContainer.gd @@ -3,7 +3,7 @@ extends GridContainer enum {CEL, FRAME, ALL_FRAMES} -const palette_button = preload("res://src/Palette/PaletteButton.tscn") +const palette_button = preload("res://addons/draw_gd/src/Palette/PaletteButton.tscn") var current_palette = "Default" var from_palette : Palette @@ -11,7 +11,7 @@ var from_palette : Palette onready var palette_from_sprite_dialog = $"../../../../PaletteFromSpriteDialog" onready var remove_palette_warning = $"../../../../RemovePaletteWarning" -var Import = preload("res://src/Autoload/Import.gd") +var Import = preload("res://addons/draw_gd/src/Autoload/Import.gd") func _ready() -> void: diff --git a/src/Palette/PaletteImportFileDialog.tscn b/addons/draw_gd/src/Palette/PaletteImportFileDialog.tscn similarity index 100% rename from src/Palette/PaletteImportFileDialog.tscn rename to addons/draw_gd/src/Palette/PaletteImportFileDialog.tscn diff --git a/src/Palette/PalettePanelContainer.tscn b/addons/draw_gd/src/Palette/PalettePanelContainer.tscn similarity index 95% rename from src/Palette/PalettePanelContainer.tscn rename to addons/draw_gd/src/Palette/PalettePanelContainer.tscn index 85feeb5..25bebe9 100644 --- a/src/Palette/PalettePanelContainer.tscn +++ b/addons/draw_gd/src/Palette/PalettePanelContainer.tscn @@ -1,12 +1,13 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://src/Palette/PaletteContainer.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/Palette/PaletteContainer.gd" type="Script" id=1] [ext_resource path="res://assets/graphics/dark_themes/palette/edit_palette.png" type="Texture" id=2] [ext_resource path="res://assets/graphics/dark_themes/palette/add_palette.png" type="Texture" id=3] [ext_resource path="res://assets/graphics/dark_themes/palette/remove_palette.png" type="Texture" id=4] -[ext_resource path="res://src/Palette/PaletteImportFileDialog.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/Palette/NewPaletteDialog.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/Palette/EditPalettePopup.tscn" type="PackedScene" id=7] +[ext_resource path="res://addons/draw_gd/src/Palette/PaletteImportFileDialog.tscn" type="PackedScene" id=5] +[ext_resource path="res://addons/draw_gd/src/Palette/NewPaletteDialog.tscn" type="PackedScene" id=6] +[ext_resource path="res://addons/draw_gd/src/Palette/EditPalettePopup.tscn" type="PackedScene" id=7] + [sub_resource type="ButtonGroup" id=1] diff --git a/src/Preferences/HandleLanguages.gd b/addons/draw_gd/src/Preferences/HandleLanguages.gd similarity index 100% rename from src/Preferences/HandleLanguages.gd rename to addons/draw_gd/src/Preferences/HandleLanguages.gd diff --git a/src/Preferences/HandleShortcuts.gd b/addons/draw_gd/src/Preferences/HandleShortcuts.gd similarity index 100% rename from src/Preferences/HandleShortcuts.gd rename to addons/draw_gd/src/Preferences/HandleShortcuts.gd diff --git a/src/Preferences/PreferencesDialog.gd b/addons/draw_gd/src/Preferences/PreferencesDialog.gd similarity index 98% rename from src/Preferences/PreferencesDialog.gd rename to addons/draw_gd/src/Preferences/PreferencesDialog.gd index 2df6640..ebc405a 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/addons/draw_gd/src/Preferences/PreferencesDialog.gd @@ -34,7 +34,7 @@ var selected_item := 0 onready var list : ItemList = $HSplitContainer/List onready var right_side : VBoxContainer = $HSplitContainer/ScrollContainer/VBoxContainer onready var autosave_interval : SpinBox = $HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer/AutosaveInterval -onready var restore_default_button_scene = preload("res://src/Preferences/RestoreDefaultButton.tscn") +onready var restore_default_button_scene = preload("res://addons/draw_gd/src/Preferences/RestoreDefaultButton.tscn") func _ready() -> void: diff --git a/src/Preferences/PreferencesDialog.tscn b/addons/draw_gd/src/Preferences/PreferencesDialog.tscn similarity index 99% rename from src/Preferences/PreferencesDialog.tscn rename to addons/draw_gd/src/Preferences/PreferencesDialog.tscn index 16299e3..8c5774a 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/addons/draw_gd/src/Preferences/PreferencesDialog.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Preferences/PreferencesDialog.gd" type="Script" id=1] -[ext_resource path="res://src/Preferences/HandleLanguages.gd" type="Script" id=4] -[ext_resource path="res://src/Preferences/HandleShortcuts.gd" type="Script" id=6] +[ext_resource path="res://addons/draw_gd/src/Preferences/PreferencesDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/Preferences/HandleLanguages.gd" type="Script" id=4] +[ext_resource path="res://addons/draw_gd/src/Preferences/HandleShortcuts.gd" type="Script" id=6] + [sub_resource type="ButtonGroup" id=1] diff --git a/src/Preferences/RestoreDefaultButton.gd b/addons/draw_gd/src/Preferences/RestoreDefaultButton.gd similarity index 100% rename from src/Preferences/RestoreDefaultButton.gd rename to addons/draw_gd/src/Preferences/RestoreDefaultButton.gd diff --git a/src/Preferences/RestoreDefaultButton.tscn b/addons/draw_gd/src/Preferences/RestoreDefaultButton.tscn similarity index 84% rename from src/Preferences/RestoreDefaultButton.tscn rename to addons/draw_gd/src/Preferences/RestoreDefaultButton.tscn index 5017d8b..afe021a 100644 --- a/src/Preferences/RestoreDefaultButton.tscn +++ b/addons/draw_gd/src/Preferences/RestoreDefaultButton.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://assets/graphics/dark_themes/misc/icon_reload.png" type="Texture" id=1] -[ext_resource path="res://src/Preferences/RestoreDefaultButton.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Preferences/RestoreDefaultButton.gd" type="Script" id=2] [sub_resource type="ImageTexture" id=1] @@ -18,4 +18,5 @@ script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="." to="." method="_on_RestoreDefaultButton_pressed"] diff --git a/src/Preferences/ThemeColorPreview.tscn b/addons/draw_gd/src/Preferences/ThemeColorPreview.tscn similarity index 100% rename from src/Preferences/ThemeColorPreview.tscn rename to addons/draw_gd/src/Preferences/ThemeColorPreview.tscn diff --git a/src/SelectionRectangle.gd b/addons/draw_gd/src/SelectionRectangle.gd similarity index 100% rename from src/SelectionRectangle.gd rename to addons/draw_gd/src/SelectionRectangle.gd diff --git a/src/Shaders/TransparentChecker.shader b/addons/draw_gd/src/Shaders/TransparentChecker.shader similarity index 100% rename from src/Shaders/TransparentChecker.shader rename to addons/draw_gd/src/Shaders/TransparentChecker.shader diff --git a/src/Tools/Base.gd b/addons/draw_gd/src/Tools/Base.gd similarity index 100% rename from src/Tools/Base.gd rename to addons/draw_gd/src/Tools/Base.gd diff --git a/src/Tools/Base.tscn b/addons/draw_gd/src/Tools/Base.tscn similarity index 96% rename from src/Tools/Base.tscn rename to addons/draw_gd/src/Tools/Base.tscn index 74bc53d..fa1ed57 100644 --- a/src/Tools/Base.tscn +++ b/addons/draw_gd/src/Tools/Base.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://src/Tools/Base.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.gd" type="Script" id=1] [ext_resource path="res://assets/graphics/dark_themes/tools/horizontal_mirror_on.png" type="Texture" id=2] [ext_resource path="res://assets/graphics/dark_themes/tools/horizontal_mirror_off.png" type="Texture" id=3] [ext_resource path="res://assets/graphics/dark_themes/tools/vertical_mirror_on.png" type="Texture" id=4] [ext_resource path="res://assets/graphics/dark_themes/tools/vertical_mirror_off.png" type="Texture" id=5] + [node name="ToolOptions" type="VBoxContainer"] margin_left = 7.0 margin_top = 7.0 diff --git a/src/Tools/Bucket.gd b/addons/draw_gd/src/Tools/Bucket.gd similarity index 99% rename from src/Tools/Bucket.gd rename to addons/draw_gd/src/Tools/Bucket.gd index 51a5a7e..0f1e951 100644 --- a/src/Tools/Bucket.gd +++ b/addons/draw_gd/src/Tools/Bucket.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Base.gd" +extends "res://addons/draw_gd/src/Tools/Base.gd" var _pattern : Patterns.Pattern diff --git a/src/Tools/Bucket.tscn b/addons/draw_gd/src/Tools/Bucket.tscn similarity index 96% rename from src/Tools/Bucket.tscn rename to addons/draw_gd/src/Tools/Bucket.tscn index 19ee763..0097263 100644 --- a/src/Tools/Bucket.tscn +++ b/addons/draw_gd/src/Tools/Bucket.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/Tools/Bucket.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Bucket.gd" type="Script" id=3] + [sub_resource type="StyleBoxFlat" id=2] bg_color = Color( 1, 1, 1, 1 ) diff --git a/src/Tools/ColorPicker.gd b/addons/draw_gd/src/Tools/ColorPicker.gd similarity index 95% rename from src/Tools/ColorPicker.gd rename to addons/draw_gd/src/Tools/ColorPicker.gd index 239361c..9d718d1 100644 --- a/src/Tools/ColorPicker.gd +++ b/addons/draw_gd/src/Tools/ColorPicker.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Base.gd" +extends "res://addons/draw_gd/src/Tools/Base.gd" var _color_slot := 0 diff --git a/src/Tools/ColorPicker.tscn b/addons/draw_gd/src/Tools/ColorPicker.tscn similarity index 87% rename from src/Tools/ColorPicker.tscn rename to addons/draw_gd/src/Tools/ColorPicker.tscn index c230814..608644a 100644 --- a/src/Tools/ColorPicker.tscn +++ b/addons/draw_gd/src/Tools/ColorPicker.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/ColorPicker.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/ColorPicker.gd" type="Script" id=2] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/src/Tools/Draw.gd b/addons/draw_gd/src/Tools/Draw.gd similarity index 99% rename from src/Tools/Draw.gd rename to addons/draw_gd/src/Tools/Draw.gd index 3919b8e..e44a159 100644 --- a/src/Tools/Draw.gd +++ b/addons/draw_gd/src/Tools/Draw.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Base.gd" +extends "res://addons/draw_gd/src/Tools/Base.gd" var _brush := Brushes.get_default_brush() diff --git a/src/Tools/Draw.tscn b/addons/draw_gd/src/Tools/Draw.tscn similarity index 95% rename from src/Tools/Draw.tscn rename to addons/draw_gd/src/Tools/Draw.tscn index 2727ac8..aeab78f 100644 --- a/src/Tools/Draw.tscn +++ b/addons/draw_gd/src/Tools/Draw.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/Tools/Draw.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Draw.gd" type="Script" id=3] + [sub_resource type="StyleBoxFlat" id=2] bg_color = Color( 1, 1, 1, 1 ) diff --git a/src/Tools/Eraser.gd b/addons/draw_gd/src/Tools/Eraser.gd similarity index 97% rename from src/Tools/Eraser.gd rename to addons/draw_gd/src/Tools/Eraser.gd index 8c894bb..898c9f3 100644 --- a/src/Tools/Eraser.gd +++ b/addons/draw_gd/src/Tools/Eraser.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Draw.gd" +extends "res://addons/draw_gd/src/Tools/Draw.gd" var _last_position := Vector2.INF diff --git a/addons/draw_gd/src/Tools/Eraser.tscn b/addons/draw_gd/src/Tools/Eraser.tscn new file mode 100644 index 0000000..89af5b2 --- /dev/null +++ b/addons/draw_gd/src/Tools/Eraser.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://addons/draw_gd/src/Tools/Draw.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/Eraser.gd" type="Script" id=2] + + +[node name="ToolOptions" instance=ExtResource( 1 )] +script = ExtResource( 2 ) diff --git a/src/Tools/LightenDarken.gd b/addons/draw_gd/src/Tools/LightenDarken.gd similarity index 97% rename from src/Tools/LightenDarken.gd rename to addons/draw_gd/src/Tools/LightenDarken.gd index 5826fee..b8cb160 100644 --- a/src/Tools/LightenDarken.gd +++ b/addons/draw_gd/src/Tools/LightenDarken.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Draw.gd" +extends "res://addons/draw_gd/src/Tools/Draw.gd" var _last_position := Vector2.INF diff --git a/src/Tools/LightenDarken.tscn b/addons/draw_gd/src/Tools/LightenDarken.tscn similarity index 91% rename from src/Tools/LightenDarken.tscn rename to addons/draw_gd/src/Tools/LightenDarken.tscn index 7f781fd..fcb1883 100644 --- a/src/Tools/LightenDarken.tscn +++ b/addons/draw_gd/src/Tools/LightenDarken.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/Draw.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/LightenDarken.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Draw.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/LightenDarken.gd" type="Script" id=2] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/src/Tools/Pencil.gd b/addons/draw_gd/src/Tools/Pencil.gd similarity index 97% rename from src/Tools/Pencil.gd rename to addons/draw_gd/src/Tools/Pencil.gd index 6094c78..b73f7f3 100644 --- a/src/Tools/Pencil.gd +++ b/addons/draw_gd/src/Tools/Pencil.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Draw.gd" +extends "res://addons/draw_gd/src/Tools/Draw.gd" var _last_position := Vector2.INF diff --git a/src/Tools/Pencil.tscn b/addons/draw_gd/src/Tools/Pencil.tscn similarity index 89% rename from src/Tools/Pencil.tscn rename to addons/draw_gd/src/Tools/Pencil.tscn index a779ed1..0883212 100644 --- a/src/Tools/Pencil.tscn +++ b/addons/draw_gd/src/Tools/Pencil.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/Draw.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/Pencil.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/Tools/Draw.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/Pencil.gd" type="Script" id=3] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 3 ) diff --git a/src/Tools/RectSelect.gd b/addons/draw_gd/src/Tools/RectSelect.gd similarity index 97% rename from src/Tools/RectSelect.gd rename to addons/draw_gd/src/Tools/RectSelect.gd index d9f8df9..c5347bf 100644 --- a/src/Tools/RectSelect.gd +++ b/addons/draw_gd/src/Tools/RectSelect.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Base.gd" +extends "res://addons/draw_gd/src/Tools/Base.gd" var _start := Rect2(0, 0, 0, 0) diff --git a/src/Tools/RectSelect.tscn b/addons/draw_gd/src/Tools/RectSelect.tscn similarity index 68% rename from src/Tools/RectSelect.tscn rename to addons/draw_gd/src/Tools/RectSelect.tscn index d557baa..ff28773 100644 --- a/src/Tools/RectSelect.tscn +++ b/addons/draw_gd/src/Tools/RectSelect.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/RectSelect.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/RectSelect.gd" type="Script" id=2] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/src/Tools/Zoom.gd b/addons/draw_gd/src/Tools/Zoom.gd similarity index 93% rename from src/Tools/Zoom.gd rename to addons/draw_gd/src/Tools/Zoom.gd index 192068a..ae41266 100644 --- a/src/Tools/Zoom.gd +++ b/addons/draw_gd/src/Tools/Zoom.gd @@ -1,4 +1,4 @@ -extends "res://src/Tools/Base.gd" +extends "res://addons/draw_gd/src/Tools/Base.gd" var _zoom_mode := 0 diff --git a/src/Tools/Zoom.tscn b/addons/draw_gd/src/Tools/Zoom.tscn similarity index 92% rename from src/Tools/Zoom.tscn rename to addons/draw_gd/src/Tools/Zoom.tscn index 91bfbba..236d513 100644 --- a/src/Tools/Zoom.tscn +++ b/addons/draw_gd/src/Tools/Zoom.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Tools/Base.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/Zoom.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Tools/Base.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/Tools/Zoom.gd" type="Script" id=2] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/src/UI/BrushButton.gd b/addons/draw_gd/src/UI/BrushButton.gd similarity index 100% rename from src/UI/BrushButton.gd rename to addons/draw_gd/src/UI/BrushButton.gd diff --git a/src/UI/BrushButton.tscn b/addons/draw_gd/src/UI/BrushButton.tscn similarity index 95% rename from src/UI/BrushButton.tscn rename to addons/draw_gd/src/UI/BrushButton.tscn index a0a8545..68664b4 100644 --- a/src/UI/BrushButton.tscn +++ b/addons/draw_gd/src/UI/BrushButton.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/BrushButton.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/BrushButton.gd" type="Script" id=2] + [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 1, 1, 1, 1 ) diff --git a/src/UI/BrushesPopup.gd b/addons/draw_gd/src/UI/BrushesPopup.gd similarity index 97% rename from src/UI/BrushesPopup.gd rename to addons/draw_gd/src/UI/BrushesPopup.gd index ba4e613..80c0a5f 100644 --- a/src/UI/BrushesPopup.gd +++ b/addons/draw_gd/src/UI/BrushesPopup.gd @@ -52,7 +52,7 @@ static func get_default_brush() -> Brush: static func create_button(image : Image) -> Node: - var button : BaseButton = load("res://src/UI/BrushButton.tscn").instance() + var button : BaseButton = load("res://addons/draw_gd/src/UI/BrushButton.tscn").instance() var tex := ImageTexture.new() tex.create_from_image(image, 0) button.get_child(0).texture = tex diff --git a/src/UI/BrushesPopup.tscn b/addons/draw_gd/src/UI/BrushesPopup.tscn similarity index 92% rename from src/UI/BrushesPopup.tscn rename to addons/draw_gd/src/UI/BrushesPopup.tscn index b96585e..590fe1b 100644 --- a/src/UI/BrushesPopup.tscn +++ b/addons/draw_gd/src/UI/BrushesPopup.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/BrushesPopup.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/BrushesPopup.gd" type="Script" id=1] + [node name="BrushesPopup" type="Popup"] margin_right = 226.0 diff --git a/src/UI/Canvas/CameraMovement.gd b/addons/draw_gd/src/UI/Canvas/CameraMovement.gd similarity index 100% rename from src/UI/Canvas/CameraMovement.gd rename to addons/draw_gd/src/UI/Canvas/CameraMovement.gd diff --git a/src/UI/Canvas/Canvas.gd b/addons/draw_gd/src/UI/Canvas/Canvas.gd similarity index 100% rename from src/UI/Canvas/Canvas.gd rename to addons/draw_gd/src/UI/Canvas/Canvas.gd diff --git a/addons/draw_gd/src/UI/Canvas/Canvas.tscn b/addons/draw_gd/src/UI/Canvas/Canvas.tscn new file mode 100644 index 0000000..b1c8267 --- /dev/null +++ b/addons/draw_gd/src/UI/Canvas/Canvas.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Canvas.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Grid.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Indicators.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/TileMode.gd" type="Script" id=4] + + +[node name="Canvas" type="Node2D"] +script = ExtResource( 1 ) + +[node name="Grid" type="Node2D" parent="."] +script = ExtResource( 2 ) + +[node name="TileMode" type="Node2D" parent="."] +script = ExtResource( 4 ) + +[node name="Indicators" type="Node2D" parent="."] +script = ExtResource( 3 ) diff --git a/src/UI/Canvas/CanvasPreview.gd b/addons/draw_gd/src/UI/Canvas/CanvasPreview.gd similarity index 100% rename from src/UI/Canvas/CanvasPreview.gd rename to addons/draw_gd/src/UI/Canvas/CanvasPreview.gd diff --git a/src/UI/Canvas/CanvasPreview.tscn b/addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn similarity index 72% rename from src/UI/Canvas/CanvasPreview.tscn rename to addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn index 7d05788..5ef2ee0 100644 --- a/src/UI/Canvas/CanvasPreview.tscn +++ b/addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Canvas/CanvasPreview.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/CanvasPreview.gd" type="Script" id=1] + [node name="CanvasPreview" type="Node2D"] script = ExtResource( 1 ) diff --git a/src/UI/Canvas/Grid.gd b/addons/draw_gd/src/UI/Canvas/Grid.gd similarity index 100% rename from src/UI/Canvas/Grid.gd rename to addons/draw_gd/src/UI/Canvas/Grid.gd diff --git a/src/UI/Canvas/Indicators.gd b/addons/draw_gd/src/UI/Canvas/Indicators.gd similarity index 100% rename from src/UI/Canvas/Indicators.gd rename to addons/draw_gd/src/UI/Canvas/Indicators.gd diff --git a/src/UI/Canvas/Rulers/Guide.gd b/addons/draw_gd/src/UI/Canvas/Rulers/Guide.gd similarity index 100% rename from src/UI/Canvas/Rulers/Guide.gd rename to addons/draw_gd/src/UI/Canvas/Rulers/Guide.gd diff --git a/src/UI/Canvas/Rulers/HorizontalRuler.gd b/addons/draw_gd/src/UI/Canvas/Rulers/HorizontalRuler.gd similarity index 100% rename from src/UI/Canvas/Rulers/HorizontalRuler.gd rename to addons/draw_gd/src/UI/Canvas/Rulers/HorizontalRuler.gd diff --git a/src/UI/Canvas/Rulers/SymmetryGuide.gd b/addons/draw_gd/src/UI/Canvas/Rulers/SymmetryGuide.gd similarity index 100% rename from src/UI/Canvas/Rulers/SymmetryGuide.gd rename to addons/draw_gd/src/UI/Canvas/Rulers/SymmetryGuide.gd diff --git a/src/UI/Canvas/Rulers/VerticalRuler.gd b/addons/draw_gd/src/UI/Canvas/Rulers/VerticalRuler.gd similarity index 100% rename from src/UI/Canvas/Rulers/VerticalRuler.gd rename to addons/draw_gd/src/UI/Canvas/Rulers/VerticalRuler.gd diff --git a/src/UI/Canvas/TileMode.gd b/addons/draw_gd/src/UI/Canvas/TileMode.gd similarity index 100% rename from src/UI/Canvas/TileMode.gd rename to addons/draw_gd/src/UI/Canvas/TileMode.gd diff --git a/src/UI/CanvasPreviewContainer.gd b/addons/draw_gd/src/UI/CanvasPreviewContainer.gd similarity index 100% rename from src/UI/CanvasPreviewContainer.gd rename to addons/draw_gd/src/UI/CanvasPreviewContainer.gd diff --git a/src/UI/CanvasPreviewContainer.tscn b/addons/draw_gd/src/UI/CanvasPreviewContainer.tscn similarity index 87% rename from src/UI/CanvasPreviewContainer.tscn rename to addons/draw_gd/src/UI/CanvasPreviewContainer.tscn index a56e7fe..03ce2c0 100644 --- a/src/UI/CanvasPreviewContainer.tscn +++ b/addons/draw_gd/src/UI/CanvasPreviewContainer.tscn @@ -1,12 +1,13 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/UI/CanvasPreviewContainer.gd" type="Script" id=3] -[ext_resource path="res://src/UI/Canvas/CameraMovement.gd" type="Script" id=4] -[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=5] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/CanvasPreviewContainer.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/CameraMovement.gd" type="Script" id=4] +[ext_resource path="res://addons/draw_gd/src/Shaders/TransparentChecker.shader" type="Shader" id=5] [ext_resource path="res://assets/graphics/dark_themes/timeline/play.png" type="Texture" id=7] + [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 5 ) shader_param/size = 10.0 diff --git a/src/UI/ColorAndToolOptions.gd b/addons/draw_gd/src/UI/ColorAndToolOptions.gd similarity index 100% rename from src/UI/ColorAndToolOptions.gd rename to addons/draw_gd/src/UI/ColorAndToolOptions.gd diff --git a/src/UI/ColorAndToolOptions.tscn b/addons/draw_gd/src/UI/ColorAndToolOptions.tscn similarity index 98% rename from src/UI/ColorAndToolOptions.tscn rename to addons/draw_gd/src/UI/ColorAndToolOptions.tscn index 4cf4ac4..be6234f 100644 --- a/src/UI/ColorAndToolOptions.tscn +++ b/addons/draw_gd/src/UI/ColorAndToolOptions.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://assets/graphics/dark_themes/misc/color_switch.png" type="Texture" id=1] [ext_resource path="res://assets/graphics/dark_themes/misc/color_defaults.png" type="Texture" id=2] -[ext_resource path="res://src/UI/ColorAndToolOptions.gd" type="Script" id=8] +[ext_resource path="res://addons/draw_gd/src/UI/ColorAndToolOptions.gd" type="Script" id=8] + [sub_resource type="ShortCut" id=1] diff --git a/src/UI/Dialogs/CreateNewImage.gd b/addons/draw_gd/src/UI/Dialogs/CreateNewImage.gd similarity index 100% rename from src/UI/Dialogs/CreateNewImage.gd rename to addons/draw_gd/src/UI/Dialogs/CreateNewImage.gd diff --git a/src/UI/Dialogs/CreateNewImage.tscn b/addons/draw_gd/src/UI/Dialogs/CreateNewImage.tscn similarity index 96% rename from src/UI/Dialogs/CreateNewImage.tscn rename to addons/draw_gd/src/UI/Dialogs/CreateNewImage.tscn index 5f6cf84..a57d1ef 100644 --- a/src/UI/Dialogs/CreateNewImage.tscn +++ b/addons/draw_gd/src/UI/Dialogs/CreateNewImage.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/CreateNewImage.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/CreateNewImage.gd" type="Script" id=1] + [node name="CreateNewImage" type="ConfirmationDialog"] margin_right = 300.0 diff --git a/src/UI/Dialogs/ExportDialog.gd b/addons/draw_gd/src/UI/Dialogs/ExportDialog.gd similarity index 99% rename from src/UI/Dialogs/ExportDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ExportDialog.gd index cc0b529..a65bada 100644 --- a/src/UI/Dialogs/ExportDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ExportDialog.gd @@ -1,6 +1,6 @@ extends AcceptDialog -var ExportScript = preload("res://src/Autoload/Export.gd") +var ExportScript = preload("res://addons/draw_gd/src/Autoload/Export.gd") var Export = ExportScript.new() # called when user resumes export after filename collision diff --git a/src/UI/Dialogs/ExportDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ExportDialog.tscn similarity index 98% rename from src/UI/Dialogs/ExportDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ExportDialog.tscn index 04a7685..c5fc51b 100644 --- a/src/UI/Dialogs/ExportDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ExportDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ExportDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ExportDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="ExportDialog" type="AcceptDialog"] margin_right = 532.0 diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd similarity index 91% rename from src/UI/Dialogs/ImageEffects/DesaturateDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd index 7a6af8c..5647465 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") var red := true var green := true diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn similarity index 93% rename from src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn index 94a6f7a..1056a5c 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/DesaturateDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="DesaturateDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd similarity index 100% rename from src/UI/Dialogs/ImageEffects/FlipImageDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn similarity index 91% rename from src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn index b1a07cd..431ea3f 100644 --- a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/FlipImageDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="FlipImageDialog" type="ConfirmationDialog"] margin_right = 283.0 diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.gd similarity index 94% rename from src/UI/Dialogs/ImageEffects/GradientDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.gd index 7b2b5f9..c39c83e 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") onready var color1 : ColorPickerButton = $VBoxContainer/OptionsContainer/ColorsContainer/ColorPickerButton onready var color2 : ColorPickerButton = $VBoxContainer/OptionsContainer/ColorsContainer/ColorPickerButton2 diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.tscn similarity index 95% rename from src/UI/Dialogs/ImageEffects/GradientDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.tscn index baf5931..2355da9 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="GradientDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.gd similarity index 96% rename from src/UI/Dialogs/ImageEffects/HSVDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.gd index bff1b93..605ea19 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") onready var hue_slider = $VBoxContainer/HBoxContainer/Sliders/Hue onready var sat_slider = $VBoxContainer/HBoxContainer/Sliders/Saturation diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.tscn similarity index 95% rename from src/UI/Dialogs/ImageEffects/HSVDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.tscn index 1691885..e48d044 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/HSVDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="HSVDialog" type="ConfirmationDialog"] margin_left = 1.0 diff --git a/addons/draw_gd/src/UI/Dialogs/ImageEffects/ImageEffects.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ImageEffects.tscn new file mode 100644 index 0000000..78c9ba5 --- /dev/null +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ImageEffects.tscn @@ -0,0 +1,45 @@ +[gd_scene load_steps=11 format=2] + +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn" type="PackedScene" id=3] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn" type="PackedScene" id=8] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn" type="PackedScene" id=9] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn" type="PackedScene" id=10] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/HSVDialog.tscn" type="PackedScene" id=11] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/GradientDialog.tscn" type="PackedScene" id=12] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn" type="PackedScene" id=13] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.tscn" type="PackedScene" id=14] + + +[node name="ImageEffects" type="Control"] +mouse_filter = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ScaleImage" parent="." instance=ExtResource( 14 )] +margin_bottom = 127.0 + +[node name="ResizeCanvas" parent="." instance=ExtResource( 8 )] +margin_right = 216.0 +margin_bottom = 392.0 + +[node name="RotateImage" parent="." instance=ExtResource( 9 )] + +[node name="FlipImageDialog" parent="." instance=ExtResource( 1 )] + +[node name="InvertColorsDialog" parent="." instance=ExtResource( 2 )] + +[node name="DesaturateDialog" parent="." instance=ExtResource( 3 )] + +[node name="OutlineDialog" parent="." instance=ExtResource( 13 )] +margin_right = 217.0 +margin_bottom = 106.0 + +[node name="HSVDialog" parent="." instance=ExtResource( 11 )] + +[node name="GradientDialog" parent="." instance=ExtResource( 12 )] +margin_bottom = 214.0 + +[node name="ShaderEffect" parent="." instance=ExtResource( 10 )] diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd similarity index 91% rename from src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd index efcd6d7..122ab21 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") var red := true var green := true diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn similarity index 93% rename from src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn index 9be6721..e46ff34 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="InvertColorsDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.gd similarity index 93% rename from src/UI/Dialogs/ImageEffects/OutlineDialog.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.gd index e594f54..28b3971 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") var color := Color.red var thickness := 1 diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn similarity index 94% rename from src/UI/Dialogs/ImageEffects/OutlineDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn index b85b668..b384505 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/OutlineDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/OutlineDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="OutlineDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd similarity index 97% rename from src/UI/Dialogs/ImageEffects/ResizeCanvas.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd index f74c7de..75f371e 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd @@ -1,6 +1,6 @@ extends ConfirmationDialog -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") var width := 64 var height := 64 diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn similarity index 95% rename from src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn index 11bf81d..d8e7c9f 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ResizeCanvas.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd" type="Script" id=2] + [node name="ResizeCanvas" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.gd similarity index 94% rename from src/UI/Dialogs/ImageEffects/RotateImage.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.gd index 2cc2579..feedb74 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.gd @@ -1,6 +1,6 @@ extends ImageEffect -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") onready var type_option_button : OptionButton = $VBoxContainer/HBoxContainer2/TypeOptionButton onready var angle_hslider : HSlider = $VBoxContainer/AngleOptions/AngleHSlider diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn similarity index 92% rename from src/UI/Dialogs/ImageEffects/RotateImage.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn index 029745f..8ef1de1 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/RotateImage.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/RotateImage.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="RotateImage" type="ConfirmationDialog"] margin_right = 245.0 diff --git a/src/UI/Dialogs/ImageEffects/ScaleImage.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.gd similarity index 84% rename from src/UI/Dialogs/ImageEffects/ScaleImage.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.gd index 1d4cb7d..3a484c3 100644 --- a/src/UI/Dialogs/ImageEffects/ScaleImage.gd +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.gd @@ -1,6 +1,6 @@ extends ConfirmationDialog -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") func _on_ScaleImage_confirmed() -> void: var width : int = $VBoxContainer/OptionsContainer/WidthValue.value diff --git a/src/UI/Dialogs/ImageEffects/ScaleImage.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.tscn similarity index 95% rename from src/UI/Dialogs/ImageEffects/ScaleImage.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.tscn index 55046bf..45c164b 100644 --- a/src/UI/Dialogs/ImageEffects/ScaleImage.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ScaleImage.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ScaleImage.gd" type="Script" id=1] + [node name="ScaleImage" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ImageEffects/ShaderEffect.gd b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.gd similarity index 100% rename from src/UI/Dialogs/ImageEffects/ShaderEffect.gd rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.gd diff --git a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn similarity index 95% rename from src/UI/Dialogs/ImageEffects/ShaderEffect.tscn rename to addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn index 73ffd6d..6ef981e 100644 --- a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn +++ b/addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ShaderEffect.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/ImageEffects/ShaderEffect.gd" type="Script" id=1] + [sub_resource type="ShaderMaterial" id=1] diff --git a/src/UI/Dialogs/OpenSprite.tscn b/addons/draw_gd/src/UI/Dialogs/OpenSprite.tscn similarity index 100% rename from src/UI/Dialogs/OpenSprite.tscn rename to addons/draw_gd/src/UI/Dialogs/OpenSprite.tscn diff --git a/src/UI/Dialogs/PreviewDialog.gd b/addons/draw_gd/src/UI/Dialogs/PreviewDialog.gd similarity index 100% rename from src/UI/Dialogs/PreviewDialog.gd rename to addons/draw_gd/src/UI/Dialogs/PreviewDialog.gd diff --git a/src/UI/Dialogs/PreviewDialog.tscn b/addons/draw_gd/src/UI/Dialogs/PreviewDialog.tscn similarity index 98% rename from src/UI/Dialogs/PreviewDialog.tscn rename to addons/draw_gd/src/UI/Dialogs/PreviewDialog.tscn index e908216..14ed10a 100644 --- a/src/UI/Dialogs/PreviewDialog.tscn +++ b/addons/draw_gd/src/UI/Dialogs/PreviewDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/PreviewDialog.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Dialogs/PreviewDialog.gd" type="Script" id=1] [node name="PreviewDialog" type="ConfirmationDialog"] margin_right = 200.0 @@ -197,6 +197,7 @@ text = "Brush name:" margin_left = 85.0 margin_right = 143.0 margin_bottom = 24.0 + [connection signal="about_to_show" from="." to="." method="_on_PreviewDialog_about_to_show"] [connection signal="confirmed" from="." to="." method="_on_PreviewDialog_confirmed"] [connection signal="popup_hide" from="." to="." method="_on_PreviewDialog_popup_hide"] diff --git a/src/UI/Dialogs/SaveSprite.tscn b/addons/draw_gd/src/UI/Dialogs/SaveSprite.tscn similarity index 100% rename from src/UI/Dialogs/SaveSprite.tscn rename to addons/draw_gd/src/UI/Dialogs/SaveSprite.tscn diff --git a/src/UI/Dialogs/SaveSpriteHTML5.tscn b/addons/draw_gd/src/UI/Dialogs/SaveSpriteHTML5.tscn similarity index 100% rename from src/UI/Dialogs/SaveSpriteHTML5.tscn rename to addons/draw_gd/src/UI/Dialogs/SaveSpriteHTML5.tscn diff --git a/src/UI/NotificationLabel.gd b/addons/draw_gd/src/UI/NotificationLabel.gd similarity index 100% rename from src/UI/NotificationLabel.gd rename to addons/draw_gd/src/UI/NotificationLabel.gd diff --git a/src/UI/NotificationLabel.tscn b/addons/draw_gd/src/UI/NotificationLabel.tscn similarity index 83% rename from src/UI/NotificationLabel.tscn rename to addons/draw_gd/src/UI/NotificationLabel.tscn index 463bb0f..3550269 100644 --- a/src/UI/NotificationLabel.tscn +++ b/addons/draw_gd/src/UI/NotificationLabel.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/NotificationLabel.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/NotificationLabel.gd" type="Script" id=2] + diff --git a/src/UI/PatternButton.gd b/addons/draw_gd/src/UI/PatternButton.gd similarity index 100% rename from src/UI/PatternButton.gd rename to addons/draw_gd/src/UI/PatternButton.gd diff --git a/src/UI/PatternButton.tscn b/addons/draw_gd/src/UI/PatternButton.tscn similarity index 93% rename from src/UI/PatternButton.tscn rename to addons/draw_gd/src/UI/PatternButton.tscn index 8ac4825..da5a970 100644 --- a/src/UI/PatternButton.tscn +++ b/addons/draw_gd/src/UI/PatternButton.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/PatternButton.gd" type="Script" id=2] + [sub_resource type="StyleBoxFlat" id=2] bg_color = Color( 1, 1, 1, 1 ) diff --git a/src/UI/PatternsPopup.gd b/addons/draw_gd/src/UI/PatternsPopup.gd similarity index 92% rename from src/UI/PatternsPopup.gd rename to addons/draw_gd/src/UI/PatternsPopup.gd index 57e10dd..9a95107 100644 --- a/src/UI/PatternsPopup.gd +++ b/addons/draw_gd/src/UI/PatternsPopup.gd @@ -17,7 +17,7 @@ func select_pattern(pattern : Pattern) -> void: static func create_button(image : Image) -> Node: - var button : BaseButton = load("res://src/UI/PatternButton.tscn").instance() + var button : BaseButton = load("res://addons/draw_gd/src/UI/PatternButton.tscn").instance() var tex := ImageTexture.new() tex.create_from_image(image, 0) button.get_child(0).texture = tex diff --git a/src/UI/PatternsPopup.tscn b/addons/draw_gd/src/UI/PatternsPopup.tscn similarity index 86% rename from src/UI/PatternsPopup.tscn rename to addons/draw_gd/src/UI/PatternsPopup.tscn index 9a21544..47badb6 100644 --- a/src/UI/PatternsPopup.tscn +++ b/addons/draw_gd/src/UI/PatternsPopup.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/PatternsPopup.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/PatternsPopup.gd" type="Script" id=1] + [node name="PatternsPopup" type="PopupPanel"] margin_right = 226.0 diff --git a/src/UI/Tabs.gd b/addons/draw_gd/src/UI/Tabs.gd similarity index 100% rename from src/UI/Tabs.gd rename to addons/draw_gd/src/UI/Tabs.gd diff --git a/src/UI/Timeline/AnimationTag.tscn b/addons/draw_gd/src/UI/Timeline/AnimationTag.tscn similarity index 100% rename from src/UI/Timeline/AnimationTag.tscn rename to addons/draw_gd/src/UI/Timeline/AnimationTag.tscn diff --git a/src/UI/Timeline/AnimationTimeline.gd b/addons/draw_gd/src/UI/Timeline/AnimationTimeline.gd similarity index 100% rename from src/UI/Timeline/AnimationTimeline.gd rename to addons/draw_gd/src/UI/Timeline/AnimationTimeline.gd diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/addons/draw_gd/src/UI/Timeline/AnimationTimeline.tscn similarity index 99% rename from src/UI/Timeline/AnimationTimeline.tscn rename to addons/draw_gd/src/UI/Timeline/AnimationTimeline.tscn index e9cb458..a6f3f7e 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/addons/draw_gd/src/UI/Timeline/AnimationTimeline.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=44 format=2] -[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1] [ext_resource path="res://assets/graphics/dark_themes/layers/new_layer.png" type="Texture" id=2] [ext_resource path="res://assets/graphics/dark_themes/layers/delete_layer_disabled.png" type="Texture" id=3] [ext_resource path="res://assets/graphics/dark_themes/layers/move_up_disabled.png" type="Texture" id=4] @@ -8,7 +8,7 @@ [ext_resource path="res://assets/graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6] [ext_resource path="res://assets/graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7] [ext_resource path="res://assets/graphics/dark_themes/timeline/move_arrow.png" type="Texture" id=8] -[ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18] [ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19] [ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20] [ext_resource path="res://assets/graphics/dark_themes/timeline/go_to_first_frame.png" type="Texture" id=21] @@ -22,7 +22,8 @@ [ext_resource path="res://assets/graphics/dark_themes/timeline/onion_skinning_off.png" type="Texture" id=29] [ext_resource path="res://assets/graphics/dark_themes/timeline/expandable.png" type="Texture" id=30] [ext_resource path="res://assets/graphics/dark_themes/timeline/loop.png" type="Texture" id=31] -[ext_resource path="res://src/UI/Timeline/FrameTagDialog.tscn" type="PackedScene" id=42] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/FrameTagDialog.tscn" type="PackedScene" id=42] + [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 1 ) diff --git a/src/UI/Timeline/CelButton.gd b/addons/draw_gd/src/UI/Timeline/CelButton.gd similarity index 100% rename from src/UI/Timeline/CelButton.gd rename to addons/draw_gd/src/UI/Timeline/CelButton.gd diff --git a/src/UI/Timeline/CelButton.tscn b/addons/draw_gd/src/UI/Timeline/CelButton.tscn similarity index 89% rename from src/UI/Timeline/CelButton.tscn rename to addons/draw_gd/src/UI/Timeline/CelButton.tscn index 54c1c76..96de31d 100644 --- a/src/UI/Timeline/CelButton.tscn +++ b/addons/draw_gd/src/UI/Timeline/CelButton.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Timeline/CelButton.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/CelButton.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=2] + [node name="CelButton" type="Button"] margin_top = 18.0 diff --git a/src/UI/Timeline/FrameTagDialog.gd b/addons/draw_gd/src/UI/Timeline/FrameTagDialog.gd similarity index 100% rename from src/UI/Timeline/FrameTagDialog.gd rename to addons/draw_gd/src/UI/Timeline/FrameTagDialog.gd diff --git a/src/UI/Timeline/FrameTagDialog.tscn b/addons/draw_gd/src/UI/Timeline/FrameTagDialog.tscn similarity index 96% rename from src/UI/Timeline/FrameTagDialog.tscn rename to addons/draw_gd/src/UI/Timeline/FrameTagDialog.tscn index c50b5bf..c60e97d 100644 --- a/src/UI/Timeline/FrameTagDialog.tscn +++ b/addons/draw_gd/src/UI/Timeline/FrameTagDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Timeline/FrameTagDialog.gd" type="Script" id=1] -[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2] +[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/FrameTagDialog.gd" type="Script" id=2] [node name="FrameTagDialog" type="AcceptDialog"] margin_right = 83.0 @@ -9,7 +9,7 @@ margin_bottom = 58.0 rect_min_size = Vector2( 400, 200 ) window_title = "Frame Tag Properties" resizable = true -script = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_right = 1.0 @@ -68,7 +68,7 @@ margin_left = -6.0 margin_top = -6.0 margin_right = 6.0 margin_bottom = 6.0 -texture = ExtResource( 2 ) +texture = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -159,6 +159,7 @@ margin_bottom = 56.0 mouse_default_cursor_shape = 2 min_value = 1.0 value = 1.0 + [connection signal="about_to_show" from="." to="." method="_on_FrameTagDialog_about_to_show"] [connection signal="popup_hide" from="." to="." method="_on_FrameTagDialog_popup_hide"] [connection signal="pressed" from="VBoxContainer/ScrollContainer/VBoxTagContainer/AddTag" to="." method="_on_AddTag_pressed"] diff --git a/src/UI/Timeline/LayerButton.gd b/addons/draw_gd/src/UI/Timeline/LayerButton.gd similarity index 100% rename from src/UI/Timeline/LayerButton.gd rename to addons/draw_gd/src/UI/Timeline/LayerButton.gd diff --git a/src/UI/Timeline/LayerButton.tscn b/addons/draw_gd/src/UI/Timeline/LayerButton.tscn similarity index 97% rename from src/UI/Timeline/LayerButton.tscn rename to addons/draw_gd/src/UI/Timeline/LayerButton.tscn index 90d8612..a42f585 100644 --- a/src/UI/Timeline/LayerButton.tscn +++ b/addons/draw_gd/src/UI/Timeline/LayerButton.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/UI/Timeline/LayerButton.gd" type="Script" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/LayerButton.gd" type="Script" id=1] [ext_resource path="res://assets/graphics/dark_themes/layers/layer_visible.png" type="Texture" id=2] [ext_resource path="res://assets/graphics/dark_themes/layers/unlock.png" type="Texture" id=3] [ext_resource path="res://assets/graphics/dark_themes/layers/unlinked_layer.png" type="Texture" id=4] @@ -158,6 +158,7 @@ text = "Layer 0" editable = false caret_blink = true caret_blink_speed = 0.5 + [connection signal="pressed" from="." to="." method="_on_LayerContainer_pressed"] [connection signal="pressed" from="HBoxContainer/LayerButtons/VisibilityButton" to="." method="_on_VisibilityButton_pressed"] [connection signal="pressed" from="HBoxContainer/LayerButtons/LockButton" to="." method="_on_LockButton_pressed"] diff --git a/src/UI/ToolButtons.gd b/addons/draw_gd/src/UI/ToolButtons.gd similarity index 100% rename from src/UI/ToolButtons.gd rename to addons/draw_gd/src/UI/ToolButtons.gd diff --git a/src/UI/TopMenuContainer.gd b/addons/draw_gd/src/UI/TopMenuContainer.gd similarity index 98% rename from src/UI/TopMenuContainer.gd rename to addons/draw_gd/src/UI/TopMenuContainer.gd index 82af56f..65d468f 100644 --- a/src/UI/TopMenuContainer.gd +++ b/addons/draw_gd/src/UI/TopMenuContainer.gd @@ -1,7 +1,7 @@ extends Panel -var Export = preload("res://src/Autoload/Export.gd") -var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd") +var Export = preload("res://addons/draw_gd/src/Autoload/Export.gd") +var DrawingAlgos = preload("res://addons/draw_gd/src/Autoload/DrawingAlgos.gd") var file_menu : PopupMenu var view_menu : PopupMenu diff --git a/src/UI/TopMenuContainer.tscn b/addons/draw_gd/src/UI/TopMenuContainer.tscn similarity index 96% rename from src/UI/TopMenuContainer.tscn rename to addons/draw_gd/src/UI/TopMenuContainer.tscn index c199c5b..0d2672d 100644 --- a/src/UI/TopMenuContainer.tscn +++ b/addons/draw_gd/src/UI/TopMenuContainer.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/TopMenuContainer.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/TopMenuContainer.gd" type="Script" id=2] + [node name="TopMenuContainer" type="Panel"] margin_right = 1280.0 diff --git a/src/UI/TransparentChecker.gd b/addons/draw_gd/src/UI/TransparentChecker.gd similarity index 100% rename from src/UI/TransparentChecker.gd rename to addons/draw_gd/src/UI/TransparentChecker.gd diff --git a/src/UI/TransparentChecker.tscn b/addons/draw_gd/src/UI/TransparentChecker.tscn similarity index 72% rename from src/UI/TransparentChecker.tscn rename to addons/draw_gd/src/UI/TransparentChecker.tscn index 7fa0d51..7429b40 100644 --- a/src/UI/TransparentChecker.tscn +++ b/addons/draw_gd/src/UI/TransparentChecker.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=1] -[ext_resource path="res://src/UI/TransparentChecker.gd" type="Script" id=2] +[ext_resource path="res://addons/draw_gd/src/Shaders/TransparentChecker.shader" type="Shader" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.gd" type="Script" id=2] + [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) diff --git a/src/UI/UI.tscn b/addons/draw_gd/src/UI/UI.tscn similarity index 85% rename from src/UI/UI.tscn rename to addons/draw_gd/src/UI/UI.tscn index fadc75f..99e5c2c 100644 --- a/src/UI/UI.tscn +++ b/addons/draw_gd/src/UI/UI.tscn @@ -1,26 +1,26 @@ [gd_scene load_steps=23 format=2] -[ext_resource path="res://src/UI/ToolButtons.gd" type="Script" id=1] -[ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/UI/Tabs.gd" type="Script" id=3] -[ext_resource path="res://src/UI/Canvas/Rulers/VerticalRuler.gd" type="Script" id=4] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/UI/Canvas/Rulers/HorizontalRuler.gd" type="Script" id=6] -[ext_resource path="res://src/UI/Canvas/CameraMovement.gd" type="Script" id=7] -[ext_resource path="res://src/SelectionRectangle.gd" type="Script" id=8] -[ext_resource path="res://assets/graphics/dark_themes/tools/bucket.png" type="Texture" id=10] -[ext_resource path="res://assets/graphics/dark_themes/tools/colorpicker.png" type="Texture" id=11] -[ext_resource path="res://assets/graphics/dark_themes/tools/rectselect.png" type="Texture" id=12] -[ext_resource path="res://assets/graphics/dark_themes/tools/eraser_r.png" type="Texture" id=13] -[ext_resource path="res://assets/graphics/dark_themes/tools/pencil_l.png" type="Texture" id=14] -[ext_resource path="res://assets/graphics/dark_themes/tools/lightendarken.png" type="Texture" id=15] -[ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16] -[ext_resource path="res://src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=17] -[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18] -[ext_resource path="res://src/UI/Canvas/Canvas.tscn" type="PackedScene" id=19] -[ext_resource path="res://src/Palette/PalettePanelContainer.tscn" type="PackedScene" id=20] -[ext_resource path="res://assets/graphics/dark_themes/tools/zoom.png" type="Texture" id=21] -[ext_resource path="res://src/UI/ViewportContainer.gd" type="Script" id=23] +[ext_resource path="res://addons/draw_gd/src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/draw_gd/src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Rulers/VerticalRuler.gd" type="Script" id=3] +[ext_resource path="res://addons/draw_gd/src/UI/Tabs.gd" type="Script" id=4] +[ext_resource path="res://assets/graphics/dark_themes/tools/bucket.png" type="Texture" id=5] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=6] +[ext_resource path="res://addons/draw_gd/src/UI/ToolButtons.gd" type="Script" id=7] +[ext_resource path="res://addons/draw_gd/src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=8] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/CameraMovement.gd" type="Script" id=9] +[ext_resource path="res://assets/graphics/dark_themes/tools/lightendarken.png" type="Texture" id=10] +[ext_resource path="res://addons/draw_gd/src/SelectionRectangle.gd" type="Script" id=11] +[ext_resource path="res://assets/graphics/dark_themes/tools/pencil_l.png" type="Texture" id=12] +[ext_resource path="res://assets/graphics/dark_themes/tools/rectselect.png" type="Texture" id=13] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Rulers/HorizontalRuler.gd" type="Script" id=14] +[ext_resource path="res://assets/graphics/dark_themes/tools/eraser_r.png" type="Texture" id=15] +[ext_resource path="res://assets/graphics/dark_themes/tools/colorpicker.png" type="Texture" id=16] +[ext_resource path="res://addons/draw_gd/src/Palette/PalettePanelContainer.tscn" type="PackedScene" id=17] +[ext_resource path="res://addons/draw_gd/src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18] +[ext_resource path="res://assets/graphics/dark_themes/tools/zoom.png" type="Texture" id=19] +[ext_resource path="res://addons/draw_gd/src/UI/Canvas/Canvas.tscn" type="PackedScene" id=20] +[ext_resource path="res://addons/draw_gd/src/UI/ViewportContainer.gd" type="Script" id=21] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 1 ) @@ -63,7 +63,7 @@ margin_right = 39.0 margin_bottom = 255.0 size_flags_horizontal = 4 size_flags_vertical = 0 -script = ExtResource( 1 ) +script = ExtResource( 7 ) __meta__ = { "_edit_use_anchors_": false } @@ -80,7 +80,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/RectSelect"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 12 ) +texture = ExtResource( 13 ) __meta__ = { "_edit_use_anchors_": false } @@ -98,7 +98,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Zoom"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 21 ) +texture = ExtResource( 19 ) __meta__ = { "_edit_use_anchors_": false } @@ -116,7 +116,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/ColorPicker"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 11 ) +texture = ExtResource( 16 ) __meta__ = { "_edit_use_anchors_": false } @@ -134,7 +134,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Pencil"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 14 ) +texture = ExtResource( 12 ) __meta__ = { "_edit_use_anchors_": false } @@ -152,7 +152,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Eraser"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 13 ) +texture = ExtResource( 15 ) __meta__ = { "_edit_use_anchors_": false } @@ -170,7 +170,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/Bucket"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 10 ) +texture = ExtResource( 5 ) __meta__ = { "_edit_use_anchors_": false } @@ -188,7 +188,7 @@ button_mask = 3 [node name="TextureRect" type="TextureRect" parent="ToolPanel/PanelContainer/ToolButtons/LightenDarken"] margin_right = 32.0 margin_bottom = 32.0 -texture = ExtResource( 15 ) +texture = ExtResource( 10 ) __meta__ = { "_edit_use_anchors_": false } @@ -219,7 +219,7 @@ margin_bottom = 31.0 tab_align = 0 tab_close_display_policy = 1 drag_to_rearrange_enabled = true -script = ExtResource( 3 ) +script = ExtResource( 4 ) [node name="HorizontalRuler" type="Button" parent="CanvasAndTimeline/ViewportAndRulers"] margin_top = 38.0 @@ -230,7 +230,7 @@ focus_mode = 0 mouse_default_cursor_shape = 14 action_mode = 0 enabled_focus_mode = 0 -script = ExtResource( 6 ) +script = ExtResource( 14 ) [node name="HSplitContainer" type="HSplitContainer" parent="CanvasAndTimeline/ViewportAndRulers"] margin_top = 58.0 @@ -256,7 +256,7 @@ size_flags_horizontal = 0 size_flags_vertical = 3 action_mode = 0 enabled_focus_mode = 0 -script = ExtResource( 4 ) +script = ExtResource( 3 ) [node name="ViewportContainer" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 @@ -267,7 +267,7 @@ mouse_default_cursor_shape = 3 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true -script = ExtResource( 23 ) +script = ExtResource( 21 ) [node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] size = Vector2( 874, 422 ) @@ -275,14 +275,14 @@ handle_input_locally = false usage = 0 render_target_update_mode = 3 -[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 5 )] +[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 1 )] -[node name="Canvas" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 19 )] +[node name="Canvas" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 20 )] [node name="Camera2D" type="Camera2D" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) -script = ExtResource( 7 ) +script = ExtResource( 9 ) [node name="SelectionRectangle" type="Polygon2D" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] visible = false @@ -291,7 +291,7 @@ color = Color( 0.0823529, 0.694118, 0.623529, 0.592157 ) invert_enable = true invert_border = 0.5 polygon = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0 ) -script = ExtResource( 8 ) +script = ExtResource( 11 ) [node name="ViewportContainer2" type="ViewportContainer" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer"] margin_left = 902.0 @@ -299,21 +299,21 @@ margin_right = 902.0 margin_bottom = 422.0 size_flags_vertical = 3 stretch = true -script = ExtResource( 23 ) +script = ExtResource( 21 ) [node name="Viewport" type="Viewport" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2"] size = Vector2( 0, 422 ) handle_input_locally = false render_target_update_mode = 3 -[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 5 )] +[node name="TransparentChecker" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 1 )] -[node name="CanvasPreview" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 2 )] +[node name="CanvasPreview" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 6 )] [node name="Camera2D2" type="Camera2D" parent="CanvasAndTimeline/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) -script = ExtResource( 7 ) +script = ExtResource( 9 ) [node name="AnimationTimeline" parent="CanvasAndTimeline" instance=ExtResource( 18 )] margin_top = 492.0 @@ -336,7 +336,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CanvasPreviewContainer" parent="RightPanel/PreviewAndPalettes" instance=ExtResource( 16 )] +[node name="CanvasPreviewContainer" parent="RightPanel/PreviewAndPalettes" instance=ExtResource( 8 )] margin_left = 15.0 margin_right = 315.0 @@ -347,10 +347,10 @@ margin_bottom = 676.0 size_flags_vertical = 3 custom_constants/autohide = 0 -[node name="ColorAndToolOptions" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )] +[node name="ColorAndToolOptions" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 2 )] margin_bottom = 248.0 -[node name="PalettePanelContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )] +[node name="PalettePanelContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )] margin_top = 260.0 margin_bottom = 508.0 diff --git a/src/UI/ViewportContainer.gd b/addons/draw_gd/src/UI/ViewportContainer.gd similarity index 100% rename from src/UI/ViewportContainer.gd rename to addons/draw_gd/src/UI/ViewportContainer.gd diff --git a/src/XDGDataPaths.gd b/addons/draw_gd/src/XDGDataPaths.gd similarity index 100% rename from src/XDGDataPaths.gd rename to addons/draw_gd/src/XDGDataPaths.gd diff --git a/project.godot b/project.godot index efdacf5..1653e46 100644 --- a/project.godot +++ b/project.godot @@ -12,77 +12,77 @@ _global_script_classes=[ { "base": "Reference", "class": "AnimationTag", "language": "GDScript", -"path": "res://src/Classes/AnimationTag.gd" +"path": "res://addons/draw_gd/src/Classes/AnimationTag.gd" }, { "base": "Popup", "class": "Brushes", "language": "GDScript", -"path": "res://src/UI/BrushesPopup.gd" +"path": "res://addons/draw_gd/src/UI/BrushesPopup.gd" }, { "base": "Node2D", "class": "Canvas", "language": "GDScript", -"path": "res://src/UI/Canvas/Canvas.gd" +"path": "res://addons/draw_gd/src/UI/Canvas/Canvas.gd" }, { "base": "Reference", "class": "Cel", "language": "GDScript", -"path": "res://src/Classes/Cel.gd" +"path": "res://addons/draw_gd/src/Classes/Cel.gd" }, { "base": "Reference", "class": "Drawer", "language": "GDScript", -"path": "res://src/Classes/Drawers.gd" +"path": "res://addons/draw_gd/src/Classes/Drawers.gd" }, { "base": "Reference", "class": "Frame", "language": "GDScript", -"path": "res://src/Classes/Frame.gd" +"path": "res://addons/draw_gd/src/Classes/Frame.gd" }, { "base": "Line2D", "class": "Guide", "language": "GDScript", -"path": "res://src/UI/Canvas/Rulers/Guide.gd" +"path": "res://addons/draw_gd/src/UI/Canvas/Rulers/Guide.gd" }, { "base": "AcceptDialog", "class": "ImageEffect", "language": "GDScript", -"path": "res://src/Classes/ImageEffect.gd" +"path": "res://addons/draw_gd/src/Classes/ImageEffect.gd" }, { "base": "Reference", "class": "Layer", "language": "GDScript", -"path": "res://src/Classes/Layer.gd" +"path": "res://addons/draw_gd/src/Classes/Layer.gd" }, { "base": "Button", "class": "LayerButton", "language": "GDScript", -"path": "res://src/UI/Timeline/LayerButton.gd" +"path": "res://addons/draw_gd/src/UI/Timeline/LayerButton.gd" }, { "base": "Reference", "class": "Palette", "language": "GDScript", -"path": "res://src/Palette/Palette.gd" +"path": "res://addons/draw_gd/src/Palette/Palette.gd" }, { "base": "Reference", "class": "PaletteColor", "language": "GDScript", -"path": "res://src/Palette/PaletteColor.gd" +"path": "res://addons/draw_gd/src/Palette/PaletteColor.gd" }, { "base": "PopupPanel", "class": "Patterns", "language": "GDScript", -"path": "res://src/UI/PatternsPopup.gd" +"path": "res://addons/draw_gd/src/UI/PatternsPopup.gd" }, { "base": "Reference", "class": "Project", "language": "GDScript", -"path": "res://src/Classes/Project.gd" +"path": "res://addons/draw_gd/src/Classes/Project.gd" }, { "base": "Guide", "class": "SymmetryGuide", "language": "GDScript", -"path": "res://src/UI/Canvas/Rulers/SymmetryGuide.gd" +"path": "res://addons/draw_gd/src/UI/Canvas/Rulers/SymmetryGuide.gd" } ] _global_script_class_icons={ "AnimationTag": "", @@ -106,7 +106,7 @@ _global_script_class_icons={ config/name="DrawGD" config/description="A free & open-source 2D sprite editor editor plugin, based on Pixelorama." -run/main_scene="res://src/Main.tscn" +run/main_scene="res://addons/draw_gd/src/Main.tscn" run/low_processor_mode=true boot_splash/image="res://assets/graphics/splash.png" boot_splash/bg_color=Color( 0.145098, 0.145098, 0.164706, 1 ) @@ -121,7 +121,7 @@ driver="Dummy" [autoload] -DrawGD="*res://src/Autoload/DrawGD.gd" +DrawGD="*res://addons/draw_gd/src/Autoload/DrawGD.gd" [debug] @@ -133,6 +133,10 @@ gdscript/warnings/return_value_discarded=false window/size/width=1280 window/size/height=720 +[editor_plugins] + +enabled=PoolStringArray( "draw_gd" ) + [importer_defaults] texture={ diff --git a/src/Tools/Eraser.tscn b/src/Tools/Eraser.tscn deleted file mode 100644 index 52ed98e..0000000 --- a/src/Tools/Eraser.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://src/Tools/Draw.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Tools/Eraser.gd" type="Script" id=2] - -[node name="ToolOptions" instance=ExtResource( 1 )] -script = ExtResource( 2 ) diff --git a/src/UI/Canvas/Canvas.tscn b/src/UI/Canvas/Canvas.tscn deleted file mode 100644 index 23c51da..0000000 --- a/src/UI/Canvas/Canvas.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://src/UI/Canvas/Canvas.gd" type="Script" id=1] -[ext_resource path="res://src/UI/Canvas/Grid.gd" type="Script" id=2] -[ext_resource path="res://src/UI/Canvas/Indicators.gd" type="Script" id=3] -[ext_resource path="res://src/UI/Canvas/TileMode.gd" type="Script" id=4] - -[node name="Canvas" type="Node2D"] -script = ExtResource( 1 ) - -[node name="Grid" type="Node2D" parent="."] -script = ExtResource( 2 ) - -[node name="TileMode" type="Node2D" parent="."] -script = ExtResource( 4 ) - -[node name="Indicators" type="Node2D" parent="."] -script = ExtResource( 3 ) diff --git a/src/UI/Dialogs/ImageEffects/ImageEffects.tscn b/src/UI/Dialogs/ImageEffects/ImageEffects.tscn deleted file mode 100644 index fb3d684..0000000 --- a/src/UI/Dialogs/ImageEffects/ImageEffects.tscn +++ /dev/null @@ -1,44 +0,0 @@ -[gd_scene load_steps=11 format=2] - -[ext_resource path="res://src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/RotateImage.tscn" type="PackedScene" id=9] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ShaderEffect.tscn" type="PackedScene" id=10] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/HSVDialog.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientDialog.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/OutlineDialog.tscn" type="PackedScene" id=13] -[ext_resource path="res://src/UI/Dialogs/ImageEffects/ScaleImage.tscn" type="PackedScene" id=14] - -[node name="ImageEffects" type="Control"] -mouse_filter = 2 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="ScaleImage" parent="." instance=ExtResource( 14 )] -margin_bottom = 127.0 - -[node name="ResizeCanvas" parent="." instance=ExtResource( 8 )] -margin_right = 216.0 -margin_bottom = 392.0 - -[node name="RotateImage" parent="." instance=ExtResource( 9 )] - -[node name="FlipImageDialog" parent="." instance=ExtResource( 1 )] - -[node name="InvertColorsDialog" parent="." instance=ExtResource( 2 )] - -[node name="DesaturateDialog" parent="." instance=ExtResource( 3 )] - -[node name="OutlineDialog" parent="." instance=ExtResource( 13 )] -margin_right = 217.0 -margin_bottom = 106.0 - -[node name="HSVDialog" parent="." instance=ExtResource( 11 )] - -[node name="GradientDialog" parent="." instance=ExtResource( 12 )] -margin_bottom = 214.0 - -[node name="ShaderEffect" parent="." instance=ExtResource( 10 )]