diff --git a/Assets/Graphics/Light Themes/Layers/Clone_Layer.png b/Assets/Graphics/Light Themes/Layers/Clone_Layer.png index 0b722f3..aa5c6dd 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Clone_Layer.png and b/Assets/Graphics/Light Themes/Layers/Clone_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Delete_Layer.png b/Assets/Graphics/Light Themes/Layers/Delete_Layer.png index 70a61bb..787cf86 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Delete_Layer.png and b/Assets/Graphics/Light Themes/Layers/Delete_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png b/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png index ca0296d..4000e34 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png and b/Assets/Graphics/Light Themes/Layers/Layer_Invisible.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Layer_Visible.png b/Assets/Graphics/Light Themes/Layers/Layer_Visible.png index b405fa5..a236268 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Layer_Visible.png and b/Assets/Graphics/Light Themes/Layers/Layer_Visible.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Merge_Down.png b/Assets/Graphics/Light Themes/Layers/Merge_Down.png index a0215bd..1fa7206 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Merge_Down.png and b/Assets/Graphics/Light Themes/Layers/Merge_Down.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Move_Down.png b/Assets/Graphics/Light Themes/Layers/Move_Down.png index cba0338..2a90ff9 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Move_Down.png and b/Assets/Graphics/Light Themes/Layers/Move_Down.png differ diff --git a/Assets/Graphics/Light Themes/Layers/Move_Up.png b/Assets/Graphics/Light Themes/Layers/Move_Up.png index 8a93cec..7551644 100644 Binary files a/Assets/Graphics/Light Themes/Layers/Move_Up.png and b/Assets/Graphics/Light Themes/Layers/Move_Up.png differ diff --git a/Assets/Graphics/Light Themes/Layers/New_Layer.png b/Assets/Graphics/Light Themes/Layers/New_Layer.png index 0642c0e..4d08c51 100644 Binary files a/Assets/Graphics/Light Themes/Layers/New_Layer.png and b/Assets/Graphics/Light Themes/Layers/New_Layer.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png b/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png index f14ad54..bc97533 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Go_To_First_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png b/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png index beea38b..99633ba 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Go_To_Last_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop.png b/Assets/Graphics/Light Themes/Timeline/Loop.png index d08f65f..c9fb126 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop.png and b/Assets/Graphics/Light Themes/Timeline/Loop.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop_None.png b/Assets/Graphics/Light Themes/Timeline/Loop_None.png index 6b3332e..e81dd62 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop_None.png and b/Assets/Graphics/Light Themes/Timeline/Loop_None.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png b/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png index 926c6fe..f05dfa0 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png and b/Assets/Graphics/Light Themes/Timeline/Loop_PingPong.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/New_Frame.png b/Assets/Graphics/Light Themes/Timeline/New_Frame.png index 3e00664..3a430ba 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/New_Frame.png and b/Assets/Graphics/Light Themes/Timeline/New_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Next_Frame.png b/Assets/Graphics/Light Themes/Timeline/Next_Frame.png index 24372b9..47e2578 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Next_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Next_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Pause.png b/Assets/Graphics/Light Themes/Timeline/Pause.png index 4f947f0..fa2ceb2 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Pause.png and b/Assets/Graphics/Light Themes/Timeline/Pause.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Play Backwards.png b/Assets/Graphics/Light Themes/Timeline/Play Backwards.png index 924bec4..e606af3 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Play Backwards.png and b/Assets/Graphics/Light Themes/Timeline/Play Backwards.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Play.png b/Assets/Graphics/Light Themes/Timeline/Play.png index 127fd0e..4102993 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Play.png and b/Assets/Graphics/Light Themes/Timeline/Play.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png b/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png index 327a631..c5f12e4 100644 Binary files a/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png and b/Assets/Graphics/Light Themes/Timeline/Previous_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush.png b/Assets/Graphics/Light Themes/Tools/Brush.png index e97dc8c..2c24508 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush.png and b/Assets/Graphics/Light Themes/Tools/Brush.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush_l.png b/Assets/Graphics/Light Themes/Tools/Brush_l.png index ae2919e..2104df5 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush_l.png and b/Assets/Graphics/Light Themes/Tools/Brush_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Brush_r.png b/Assets/Graphics/Light Themes/Tools/Brush_r.png index 67d3dfd..85b0afa 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Brush_r.png and b/Assets/Graphics/Light Themes/Tools/Brush_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket.png b/Assets/Graphics/Light Themes/Tools/Bucket.png index 63d1187..8e80c9b 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket.png and b/Assets/Graphics/Light Themes/Tools/Bucket.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket_l.png b/Assets/Graphics/Light Themes/Tools/Bucket_l.png index 3ef679b..d285efa 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket_l.png and b/Assets/Graphics/Light Themes/Tools/Bucket_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Bucket_r.png b/Assets/Graphics/Light Themes/Tools/Bucket_r.png index 4c4cdb2..c0bd7be 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Bucket_r.png and b/Assets/Graphics/Light Themes/Tools/Bucket_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker.png b/Assets/Graphics/Light Themes/Tools/ColorPicker.png index 095ecee..b693c5a 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png b/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png index 86f59c7..2ed36f7 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png b/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png index 7a85f69..e17385f 100644 Binary files a/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png and b/Assets/Graphics/Light Themes/Tools/ColorPicker_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser.png b/Assets/Graphics/Light Themes/Tools/Eraser.png index 53b5938..c728021 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser.png and b/Assets/Graphics/Light Themes/Tools/Eraser.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser_l.png b/Assets/Graphics/Light Themes/Tools/Eraser_l.png index 400f8f9..a676602 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser_l.png and b/Assets/Graphics/Light Themes/Tools/Eraser_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Eraser_r.png b/Assets/Graphics/Light Themes/Tools/Eraser_r.png index eedda64..2c8beb5 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Eraser_r.png and b/Assets/Graphics/Light Themes/Tools/Eraser_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken.png b/Assets/Graphics/Light Themes/Tools/LightenDarken.png index adfa57f..f6d3dc6 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png b/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png index 266dc77..33a009e 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png b/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png index d28a7ad..d3f3a80 100644 Binary files a/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png and b/Assets/Graphics/Light Themes/Tools/LightenDarken_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil.png b/Assets/Graphics/Light Themes/Tools/Pencil.png index 27c4ea9..3b61a03 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil.png and b/Assets/Graphics/Light Themes/Tools/Pencil.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil_l.png b/Assets/Graphics/Light Themes/Tools/Pencil_l.png index 8d89005..388d384 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil_l.png and b/Assets/Graphics/Light Themes/Tools/Pencil_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/Pencil_r.png b/Assets/Graphics/Light Themes/Tools/Pencil_r.png index 779517c..6f4fd0f 100644 Binary files a/Assets/Graphics/Light Themes/Tools/Pencil_r.png and b/Assets/Graphics/Light Themes/Tools/Pencil_r.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect.png b/Assets/Graphics/Light Themes/Tools/RectSelect.png index af55175..2a4e1d8 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect.png and b/Assets/Graphics/Light Themes/Tools/RectSelect.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect_l.png b/Assets/Graphics/Light Themes/Tools/RectSelect_l.png index 6339c87..a18ff56 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect_l.png and b/Assets/Graphics/Light Themes/Tools/RectSelect_l.png differ diff --git a/Assets/Graphics/Light Themes/Tools/RectSelect_r.png b/Assets/Graphics/Light Themes/Tools/RectSelect_r.png index de73bf5..23892a4 100644 Binary files a/Assets/Graphics/Light Themes/Tools/RectSelect_r.png and b/Assets/Graphics/Light Themes/Tools/RectSelect_r.png differ diff --git a/Scripts/Import.gd b/Scripts/Import.gd index d781a2c..b3b3f5d 100644 --- a/Scripts/Import.gd +++ b/Scripts/Import.gd @@ -1,13 +1,5 @@ extends Node -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - func import_gpl(path : String) -> Palette: var result : Palette = null var file = File.new() @@ -28,7 +20,7 @@ func import_gpl(path : String) -> Palette: var name_end = path.find_last('.') if name_end > name_start: result.name = path.substr(name_start, name_end - name_start) - + # Comments if line.begins_with('#'): comments += line.trim_prefix('#') + '\n' @@ -41,13 +33,9 @@ func import_gpl(path : String) -> Palette: var color = Color(red, green, blue) result.add_color(color, name) line_number += 1 - + if result: result.comments = comments file.close() - - return result -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass + return result diff --git a/Scripts/Palette/PaletteContainer.gd b/Scripts/Palette/PaletteContainer.gd index 7649918..fc2e0c2 100644 --- a/Scripts/Palette/PaletteContainer.gd +++ b/Scripts/Palette/PaletteContainer.gd @@ -51,7 +51,7 @@ func on_palette_import_file_selected(path) -> void: palette = Palette.new().load_from_file(path) elif path.to_lower().ends_with("gpl"): palette = Import.import_gpl(path) - + if palette: if not Global.palettes.has(palette.name): Global.palettes[palette.name] = palette @@ -216,5 +216,5 @@ func _delete_palette_file(file_name : String) -> void: func save_palette(palette_name : String, filename : String) -> void: var palette = Global.palettes[palette_name] - + palette.save_to_file("user://palettes/custom/" + filename)