Make a new Candies object

media/attribution.js

@@ -18460,7 +18460,7 @@ const attributionData = {
             ]
         },
         {
-            prefix: "./media/food/candy/",
+            prefix: "./media/food/old-candy/",
             files: [
                 { name: "gummy-bear.svg", source: null },
                 { name: "lifesaver.svg", source: null },
@@ -18554,6 +18554,13 @@ const attributionData = {
                 "http://www.ezzo.com/products.html"
             ]
         },
+        {
+            prefix: "./media/food/Candies/",
+            all: null,
+            authors: [
+                "chemicalcrux"
+            ]
+        },
         {
             prefix: "./media/furniture/Sofas/",
             files: [

media/food/Candies/Candy Corn-Front.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg18"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 561.2522 918.5401"
+   height="918.5401pt"
+   width="561.2522pt"
+   version="1.0">
+  <defs
+     id="defs22" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-219.30439,959.29937)">
+    <path
+       id="path4"
+       d="m 4780,9589 c -974,-35 -1842,-325 -2280,-761 -148,-147 -232,-276 -279,-432 -41,-134 -39,-181 20,-541 354,-2151 890,-4240 1446,-5635 381,-956 750,-1548 1088,-1747 260,-153 521,-39 819,357 740,983 1563,3586 2100,6645 130,738 133,777 77,944 -245,725 -1520,1224 -2991,1170 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-219.30439,959.29937)">
+    <path
+       id="path8"
+       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 105,-728 391,-2133 628,-3083 421,-1686 890,-3010 1337,-3775 210,-359 429,-607 612,-694 58,-28 75,-31 160,-31 85,0 102,3 160,31 592,281 1319,1948 1949,4469 236,948 523,2357 628,3083 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" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g16"
+     transform="matrix(0.1,0,0,-0.1,-219.30439,959.29937)">
+    <path
+       id="path12"
+       d="m 4745,9534 c -456,-28 -812,-85 -1172,-190 -691,-200 -1202,-585 -1303,-980 -25,-97 -25,-168 0,-341 20,-141 133,-784 173,-993 l 22,-115 h 2535 2535 l 22,115 c 40,209 153,852 173,993 25,173 25,244 1,339 -87,340 -463,666 -1024,888 -319,126 -811,234 -1232,270 -125,11 -626,20 -730,14 z" />
+    <path
+       id="path14"
+       d="m 3550,2737 c 0,-11 112,-309 184,-489 394,-989 781,-1596 1117,-1753 46,-21 68,-25 149,-25 81,0 103,4 149,25 335,156 724,767 1117,1753 72,180 184,478 184,489 0,2 -652,3 -1450,3 -797,0 -1450,-1 -1450,-3 z" />
+  </g>
+</svg>

media/food/Candies/Candy Corn-Side.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg18"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 325.9021 918.79242"
+   height="918.79242pt"
+   width="325.9021pt"
+   version="1.0">
+  <defs
+     id="defs22" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-337,959.43331)">
+    <path
+       id="path4"
+       d="m 4925,9593 c -264,-11 -501,-72 -740,-189 -499,-245 -815,-712 -815,-1204 0,-175 65,-1088 120,-1695 227,-2481 596,-4509 997,-5485 46,-111 145,-307 190,-373 53,-78 162,-185 217,-214 263,-134 536,240 795,1087 402,1318 742,3619 916,6199 29,433 31,555 10,677 -59,334 -274,662 -575,877 -106,75 -313,181 -435,222 -209,70 -463,107 -680,98 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-337,959.43331)">
+    <path
+       id="path8"
+       d="m 4885,9538 c -340,-20 -664,-133 -907,-316 -314,-236 -504,-540 -549,-879 -23,-176 34,-1018 151,-2208 107,-1089 261,-2207 421,-3055 28,-146 57,-303 65,-350 62,-358 243,-1063 359,-1400 142,-412 266,-650 412,-792 108,-105 218,-105 326,0 146,142 270,380 412,792 116,337 297,1042 359,1400 8,47 37,204 65,350 209,1108 389,2540 516,4105 30,378 65,918 65,1017 0,385 -200,750 -558,1020 -299,225 -718,342 -1137,316 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g16"
+     transform="matrix(0.1,0,0,-0.1,-337,959.43331)">
+    <path
+       id="path12"
+       d="m 4813,9529 c -45,-4 -131,-17 -190,-29 -521,-105 -961,-459 -1130,-909 -69,-182 -77,-365 -43,-878 24,-346 47,-663 56,-745 l 6,-58 h 1488 1488 l 6,58 c 3,31 13,145 21,252 61,803 68,1054 36,1212 -49,235 -167,445 -361,638 -342,342 -847,511 -1377,459 z" />
+    <path
+       id="path14"
+       d="m 4070,2731 c 0,-28 98,-463 161,-714 211,-844 440,-1373 656,-1516 40,-27 55,-31 112,-31 75,0 106,15 174,83 204,203 404,695 596,1464 63,251 161,686 161,714 0,5 -371,9 -930,9 -559,0 -930,-4 -930,-9 z" />
+  </g>
+</svg>

media/food/Candies/Candy Corn-Top.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg16"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 560.79999 325.9043"
+   height="325.9043pt"
+   width="560.79999pt"
+   version="1.0">
+  <defs
+     id="defs20" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     style="fill:#000000;stroke:none"
+     id="g6"
+     transform="matrix(0.1,0,0,-0.1,-219.6,662.90428)">
+    <path
+       id="path4"
+       d="m 4420,6610 c -146,-14 -243,-31 -460,-80 l -275,-61 -310,-131 c -170,-72 -323,-137 -340,-146 -46,-23 -476,-355 -516,-398 -20,-22 -82,-104 -138,-183 -98,-138 -104,-148 -144,-275 l -41,-131 v -205 -205 l 41,-131 c 40,-127 46,-137 144,-275 56,-79 118,-161 138,-183 40,-43 470,-375 516,-399 17,-8 165,-72 330,-142 l 300,-127 280,-64 c 376,-86 553,-104 1055,-104 502,0 679,18 1055,104 l 280,64 300,127 c 165,70 313,134 329,142 16,8 138,98 271,200 l 242,184 122,171 c 121,169 123,173 164,302 l 41,131 v 205 205 l -41,131 c -41,129 -43,133 -164,302 l -122,171 -242,184 c -133,102 -255,192 -271,200 -16,8 -164,72 -329,142 l -300,127 -280,64 c -383,88 -553,104 -1075,103 -273,-1 -425,-6 -560,-19 z" />
+  </g>
+  <g
+     style="fill:#1a1a1a;stroke:none"
+     id="g10"
+     transform="matrix(0.1,0,0,-0.1,-219.6,662.90428)">
+    <path
+       id="path8"
+       d="m 4440,6560 c -161,-15 -242,-28 -470,-80 l -275,-62 -323,-136 -322,-136 -245,-187 -246,-187 -118,-165 c -116,-164 -118,-167 -156,-294 l -39,-128 v -185 -185 l 39,-128 c 38,-127 40,-130 156,-294 l 118,-165 243,-186 243,-185 325,-138 325,-138 270,-61 c 354,-80 559,-100 1035,-100 476,0 672,19 1030,100 l 275,62 325,137 325,138 243,185 242,185 118,166 c 117,164 119,167 157,294 l 39,128 v 185 185 l -39,128 c -38,127 -40,130 -156,294 l -118,165 -246,187 -245,187 -322,136 -323,136 -275,62 c -238,54 -304,65 -490,81 -286,25 -817,24 -1100,-1 z" />
+  </g>
+  <g
+     style="fill:#333333;stroke:none"
+     id="g14"
+     transform="matrix(0.1,0,0,-0.1,-219.6,662.90428)">
+    <path
+       id="path12"
+       d="m 4690,6570 c -305,-12 -410,-26 -721,-96 l -286,-64 -314,-133 -314,-134 -245,-187 -245,-186 -120,-168 c -116,-162 -121,-173 -155,-283 l -35,-114 v -210 -210 l 36,-111 c 34,-104 44,-122 157,-280 l 120,-169 241,-183 241,-183 317,-135 316,-134 286,-65 c 380,-85 510,-97 1031,-97 520,0 649,12 1031,97 l 286,65 314,133 314,134 245,187 245,186 120,168 c 116,162 121,173 155,283 l 35,114 v 210 210 l -36,111 c -34,104 -44,122 -157,280 l -120,169 -241,183 -241,183 -317,135 -316,134 -286,65 c -233,52 -319,67 -461,79 -218,19 -623,26 -880,16 z" />
+  </g>
+</svg>

presets/food.js

@@ -115,7 +115,7 @@ function makeFood() {
             ["gummy-bear", 2, "inches", 3.5, "g"],
             ["lifesaver", 0.925, "inches", 3.5, "g"],
         ],
-        "Candy",
+        "Old Candy",
         "",
         "food"
     ))
@@ -128,5 +128,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}]}]}));
+    /* ***INSERT HERE*** */
     return results;
 }

scripts/blender-model.py

@@ -5,8 +5,8 @@ import json
 import os
 import pathlib
 
-GROUP_NAME = "Glassware"
-GROUP_KIND = "objects"
+GROUP_NAME = "Candy"
+GROUP_KIND = "food"
 
 path_info = pathlib.Path(bpy.data.filepath).parent.joinpath("macrovision-directory.txt")
 config_path = pathlib.Path(open(path_info).read())
@@ -29,7 +29,7 @@ bpy.data.worlds["World"].node_tree.nodes["Background"].inputs[1].default_value =
 
 objects = []
 for object in bpy.data.collections["Macrovision"].objects:
-    if object.type == "MESH" or object.type == "CURVE":
+    if object.type == "MESH" or object.type == "CURVE" or object.type == "SURFACE":
         objects.append(object)
 
 all_data = {}