Skip to content

Commit

Permalink
Revert palette file format back to JSON (#967)
Browse files Browse the repository at this point in the history
* Some static typing and use notification to check if the theme has changed in swatches

* Use Vector2i for scrolling, hide scrollbars in the node properties

* More static typing improvements

* More static typing & docstring improvements, remove some methods from Palettes.gd

* [WIP] Go back to json for palettes instead of tres

* Revert back to using dictionaries for palette colors instead of array

Reverts part of the previous commit

* Read width & height from files, don't store the name

* Fix palette renaming

* Copy non-json palettes into json files

* Fix palette duplication

* Add a new _fill_imported_palette_with_colors() to avoid duplicate code in import file methods

* Fix palette file importing when not initialising

* Export palettes as images

* Replace "tres" with "json" filter in the open sprite dialog

* When exporting a palette as an image, automatically set the file name to the palette name

* Replace default palette files with json

* Remove the Global.palette_panel variable, use signals instead.

* Static typing in signals

* Fix warning in Palettes.gd

* Fix formatting

* Add missing comments to the palette files

* Update Palettes.gd

* A few more static typing improvements
  • Loading branch information
OverloadedOrama authored Dec 22, 2023
1 parent 18a74c7 commit 0cb98f6
Show file tree
Hide file tree
Showing 28 changed files with 1,059 additions and 1,438 deletions.
71 changes: 71 additions & 0 deletions pixelorama_data/Palettes/BubbleGum16.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"colors": [
{
"color": "(0.0824, 0.0902, 0.102, 1)",
"index": 0
},
{
"color": "(0.4941, 0.0196, 0.1294, 1)",
"index": 1
},
{
"color": "(0.8392, 0.1373, 0.0667, 1)",
"index": 2
},
{
"color": "(1, 0.5137, 0.149, 1)",
"index": 3
},
{
"color": "(1, 0.8196, 0, 1)",
"index": 4
},
{
"color": "(0.9765, 0.9922, 1, 1)",
"index": 5
},
{
"color": "(1, 0.502, 0.6392, 1)",
"index": 6
},
{
"color": "(1, 0.149, 0.4549, 1)",
"index": 7
},
{
"color": "(0.5765, 0.1294, 0.4118, 1)",
"index": 8
},
{
"color": "(0.2588, 0, 0.4039, 1)",
"index": 9
},
{
"color": "(0.1373, 0.2863, 0.4588, 1)",
"index": 10
},
{
"color": "(0.4039, 0.6824, 0.8314, 1)",
"index": 11
},
{
"color": "(0.749, 1, 0.2314, 1)",
"index": 12
},
{
"color": "(0.0627, 0.8196, 0.4588, 1)",
"index": 13
},
{
"color": "(0, 0.4667, 0.6, 1)",
"index": 14
},
{
"color": "(0, 0.1569, 0.349, 1)",
"index": 15
}
],
"comment": "Author: PineTreePizza\nFound in Lospec by CheetoHead/greusser\nhttps://lospec.com/palette-list/bubblegum-16",
"height": 2,
"width": 8
}
113 changes: 0 additions & 113 deletions pixelorama_data/Palettes/BubbleGum16.tres

This file was deleted.

107 changes: 107 additions & 0 deletions pixelorama_data/Palettes/Complementary.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"colors": [
{
"color": "(0.702, 0.3137, 0.0078, 1)",
"index": 0
},
{
"color": "(1, 0.6, 0.2667, 1)",
"index": 1
},
{
"color": "(1, 0.4392, 0, 1)",
"index": 2
},
{
"color": "(0, 0.6, 0.702, 1)",
"index": 3
},
{
"color": "(0, 0.8549, 1, 1)",
"index": 4
},
{
"color": "(0.702, 0.0078, 0.0078, 1)",
"index": 5
},
{
"color": "(1, 0.2667, 0.2667, 1)",
"index": 6
},
{
"color": "(1, 0.0078, 0.0039, 1)",
"index": 7
},
{
"color": "(0, 0.702, 0.2, 1)",
"index": 8
},
{
"color": "(0, 1, 0.2824, 1)",
"index": 9
},
{
"color": "(0.502, 0.0078, 0.702, 1)",
"index": 10
},
{
"color": "(0.7922, 0.2667, 1, 1)",
"index": 11
},
{
"color": "(0.702, 0, 0.9922, 1)",
"index": 12
},
{
"color": "(0.4941, 0.702, 0, 1)",
"index": 13
},
{
"color": "(0.7098, 1, 0, 1)",
"index": 14
},
{
"color": "(0.0078, 0.0667, 0.702, 1)",
"index": 15
},
{
"color": "(0.2667, 0.3294, 1, 1)",
"index": 16
},
{
"color": "(0.0039, 0.0824, 1, 1)",
"index": 17
},
{
"color": "(0.702, 0.549, 0, 1)",
"index": 18
},
{
"color": "(1, 0.7843, 0, 1)",
"index": 19
},
{
"color": "(0.0078, 0.6196, 0.702, 1)",
"index": 20
},
{
"color": "(0.4745, 0.9373, 1, 1)",
"index": 21
},
{
"color": "(0, 0.8824, 1, 1)",
"index": 22
},
{
"color": "(0.702, 0.302, 0, 1)",
"index": 23
},
{
"color": "(1, 0.4314, 0, 1)",
"index": 24
}
],
"comment": "Author: Erevoid",
"height": 4,
"width": 8
}
Loading

0 comments on commit 0cb98f6

Please sign in to comment.