From 0669aa81f7524bb6553a68aa4514a28b7df81d15 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Mon, 1 Nov 2021 14:12:37 -0400 Subject: [PATCH] Add some candies Also adjust Rose's mass --- media/food/Candies/Candy Corn-Front.svg | 2 +- media/food/Candies/Candy Corn-Side.svg | 6 +-- media/food/Candies/M&M-Front.svg | 52 +++++++++++++++++++++ media/food/Candies/M&M-Side.svg | 52 +++++++++++++++++++++ media/food/Candies/M&M-Top.svg | 55 +++++++++++++++++++++++ media/food/Candies/Mike and Ike-Front.svg | 52 +++++++++++++++++++++ media/food/Candies/Mike and Ike-Side.svg | 52 +++++++++++++++++++++ media/food/Candies/Mike and Ike-Top.svg | 52 +++++++++++++++++++++ presets/characters.js | 2 +- presets/food.js | 2 +- scripts/process-model.py | 14 +++--- 11 files changed, 328 insertions(+), 13 deletions(-) create mode 100644 media/food/Candies/M&M-Front.svg create mode 100644 media/food/Candies/M&M-Side.svg create mode 100644 media/food/Candies/M&M-Top.svg create mode 100644 media/food/Candies/Mike and Ike-Front.svg create mode 100644 media/food/Candies/Mike and Ike-Side.svg create mode 100644 media/food/Candies/Mike and Ike-Top.svg diff --git a/media/food/Candies/Candy Corn-Front.svg b/media/food/Candies/Candy Corn-Front.svg index f9251b06..b60a9826 100644 --- a/media/food/Candies/Candy Corn-Front.svg +++ b/media/food/Candies/Candy Corn-Front.svg @@ -39,7 +39,7 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019 transform="matrix(0.1,0,0,-0.1,-219.30439,959.29937)"> + d="m 4795,9539 c -882,-33 -1688,-273 -2135,-634 -80,-64 -207,-193 -262,-266 -62,-81 -124,-221 -144,-321 -17,-87 -17,-89 9,-270 68,-474 240,-1372 411,-2153 416,-1899 939,-3539 1423,-4465 267,-512 518,-828 743,-934 58,-28 75,-31 160,-31 85,0 102,3 160,31 225,106 476,422 743,934 440,842 925,2314 1317,3995 202,869 433,2037 517,2623 26,181 26,183 9,270 -20,100 -82,240 -144,321 -55,73 -182,202 -262,266 -437,353 -1264,603 -2080,630 -91,3 -190,7 -220,8 -30,2 -140,0 -245,-4 z" /> + d="m 4885,9538 c -340,-20 -664,-133 -907,-316 -321,-241 -512,-553 -550,-898 -14,-117 3,-458 52,-1069 136,-1686 307,-3042 536,-4255 24,-129 49,-262 55,-295 6,-33 33,-161 60,-284 181,-820 384,-1429 574,-1722 60,-94 159,-197 210,-220 51,-24 119,-24 170,0 51,23 150,126 210,220 190,293 393,902 574,1722 27,123 54,251 60,284 6,33 31,166 55,295 229,1210 401,2583 536,4255 50,623 66,950 52,1068 -39,346 -229,657 -550,899 -299,225 -718,342 -1137,316 z" /> + d="m 4813,9529 c -211,-20 -411,-77 -598,-170 -399,-198 -687,-547 -766,-927 -33,-161 -23,-459 41,-1264 11,-136 20,-250 20,-253 0,-3 671,-5 1490,-5 820,0 1490,2 1490,5 0,3 9,117 20,253 64,805 74,1103 41,1264 -49,235 -167,445 -361,638 -342,342 -847,511 -1377,459 z" /> + d="m 4070,2734 c 0,-35 109,-514 180,-789 206,-804 427,-1305 637,-1444 40,-27 55,-31 112,-31 78,0 109,16 184,93 192,197 383,662 567,1382 71,275 180,754 180,789 0,3 -418,6 -930,6 -511,0 -930,-3 -930,-6 z" /> diff --git a/media/food/Candies/M&M-Front.svg b/media/food/Candies/M&M-Front.svg new file mode 100644 index 00000000..6ef7dced --- /dev/null +++ b/media/food/Candies/M&M-Front.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/Candies/M&M-Side.svg b/media/food/Candies/M&M-Side.svg new file mode 100644 index 00000000..3cbaf782 --- /dev/null +++ b/media/food/Candies/M&M-Side.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/Candies/M&M-Top.svg b/media/food/Candies/M&M-Top.svg new file mode 100644 index 00000000..4279db61 --- /dev/null +++ b/media/food/Candies/M&M-Top.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/media/food/Candies/Mike and Ike-Front.svg b/media/food/Candies/Mike and Ike-Front.svg new file mode 100644 index 00000000..d3fa9d05 --- /dev/null +++ b/media/food/Candies/Mike and Ike-Front.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/Candies/Mike and Ike-Side.svg b/media/food/Candies/Mike and Ike-Side.svg new file mode 100644 index 00000000..d3fa9d05 --- /dev/null +++ b/media/food/Candies/Mike and Ike-Side.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/Candies/Mike and Ike-Top.svg b/media/food/Candies/Mike and Ike-Top.svg new file mode 100644 index 00000000..93baa82f --- /dev/null +++ b/media/food/Candies/Mike and Ike-Top.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index c216e8bd..cb55989b 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -7219,7 +7219,7 @@ characterMakers.push(() => makeCharacter( }, fae: { height: math.unit(4, "cm"), - weight: math.unit(80, "grams"), + weight: math.unit(10, "grams"), name: "Fae", image: { source: "./media/characters/rose/fae.svg", diff --git a/presets/food.js b/presets/food.js index 54ae7ef4..7a9d0864 100644 --- a/presets/food.js +++ b/presets/food.js @@ -122,7 +122,7 @@ function makeFood() { results.push(makeModel({"name": "Pizza", "kind": "food", "forms": [{"name": "10 Inch", "views": [{"name": "Top", "height": 0.0254 * 10}]}, {"name": "12 Inch", "views": [{"name": "Top", "height": 0.0254 * 12}]}, {"name": "14 Inch", "views": [{"name": "Top", "height": 0.0254 * 14}]}, {"name": "16 Inch", "views": [{"name": "Top", "height": 0.0254 * 16}]}]})) - /* ***Candies*** */ results.push(makeModel({"name": "Candies", "kind": "food", "forms": [{"name": "Candy Corn", "views": [{"name": "Front", "height": 0.022001154720783234}, {"name": "Side", "height": 0.022001154720783234}, {"name": "Top", "height": 0.007666293531656265}]}]})); + /* ***Candies*** */ results.push(makeModel({"name": "Candies", "kind": "food", "forms": [{"name": "Candy Corn", "views": [{"name": "Front", "height": 0.022001150995492935}, {"name": "Side", "height": 0.022001150995492935}, {"name": "Top", "height": 0.008009850978851318}]}, {"name": "M&M", "views": [{"name": "Front", "height": 0.006873499136418104}, {"name": "Side", "height": 0.006873499136418104}, {"name": "Top", "height": 0.013283314183354378}]}, {"name": "Mike and Ike", "views": [{"name": "Front", "height": 0.021699998527765274}, {"name": "Side", "height": 0.021699998527765274}, {"name": "Top", "height": 0.00970000121742487}]}]})); /* ***Crackers*** */ results.push(makeModel({"name": "Crackers", "kind": "food", "forms": [{"name": "Cheez-It", "views": [{"name": "Front", "height": 0.004728816449642181}, {"name": "Side", "height": 0.004728816449642181}, {"name": "Top", "height": 0.024000002071261406}]}]})); /* ***INSERT HERE*** */ diff --git a/scripts/process-model.py b/scripts/process-model.py index 1a4491df..ad77e466 100644 --- a/scripts/process-model.py +++ b/scripts/process-model.py @@ -19,7 +19,7 @@ def combine(base_path, highlight_path, vivid_path, output_path): with open(output_path, "w", encoding="utf-8") as f: f.write(vivid_data) - subprocess.run([INKSCAPE, "--without-gui", "--export-plain-svg=" + output_path.resolve().__str__(), "--export-area-drawing", output_path], shell=True) + subprocess.run([INKSCAPE, "--without-gui", "--export-plain-svg=" + output_path.resolve().__str__(), "--export-area-drawing", output_path], shell=False) configdir = pathlib.Path(__file__).parent configpath = configdir.joinpath("config.json") @@ -66,17 +66,17 @@ for data in all_data["forms"]: input_highlight = sourcedir.joinpath(name + "-" + view_name + "-highlight.bmp") input_vivid = sourcedir.joinpath(name + "-" + view_name + "-vivid.bmp") - subprocess.run(["convert", input, base_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_base], shell=True) - subprocess.run(["convert", input, highlight_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_highlight], shell=True) - subprocess.run(["convert", input, vivid_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_vivid], shell=True) + subprocess.run(["magick", "convert", input, base_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_base], shell=False) + subprocess.run(["magick", "convert", input, highlight_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_highlight], shell=False) + subprocess.run(["magick", "convert", input, vivid_lut, "-channel", "RGB", "-clut", "-background", "#FFFFFF", "-flatten", input_vivid], shell=False) output_base = sourcedir.joinpath(name + "-" + view_name + "-base.svg") output_highlight = sourcedir.joinpath(name + "-" + view_name + "-highlight.svg") output_vivid = sourcedir.joinpath(name + "-" + view_name + "-vivid.svg") - subprocess.run([POTRACE, input_base, "-b", "svg", "-o", output_base], shell=True) - subprocess.run([POTRACE, input_highlight, "-b", "svg", "-C", "#1a1a1a", "-o", output_highlight], shell=True) - subprocess.run([POTRACE, input_vivid, "-b", "svg", "-C", "#333333", "-o", output_vivid], shell=True) + subprocess.run([POTRACE, input_base, "-b", "svg", "-o", output_base], shell=False) + subprocess.run([POTRACE, input_highlight, "-b", "svg", "-C", "#1a1a1a", "-o", output_highlight], shell=False) + subprocess.run([POTRACE, input_vivid, "-b", "svg", "-C", "#333333", "-o", output_vivid], shell=False) combine(output_base, output_highlight, output_vivid, result) # os.unlink(input_base) # os.unlink(input_highlight)