diff --git a/media/attribution.js b/media/attribution.js index d8f289d0..6784203d 100644 --- a/media/attribution.js +++ b/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: [ diff --git a/media/food/Candies/Candy Corn-Front.svg b/media/food/Candies/Candy Corn-Front.svg new file mode 100644 index 00000000..f9251b06 --- /dev/null +++ b/media/food/Candies/Candy Corn-Front.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/Candy Corn-Side.svg b/media/food/Candies/Candy Corn-Side.svg new file mode 100644 index 00000000..0a0f8013 --- /dev/null +++ b/media/food/Candies/Candy Corn-Side.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/Candy Corn-Top.svg b/media/food/Candies/Candy Corn-Top.svg new file mode 100644 index 00000000..52afa0d4 --- /dev/null +++ b/media/food/Candies/Candy Corn-Top.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/candy/gummy-bear.svg b/media/food/old-candy/gummy-bear.svg similarity index 100% rename from media/food/candy/gummy-bear.svg rename to media/food/old-candy/gummy-bear.svg diff --git a/media/food/candy/lifesaver.svg b/media/food/old-candy/lifesaver.svg similarity index 100% rename from media/food/candy/lifesaver.svg rename to media/food/old-candy/lifesaver.svg diff --git a/presets/food.js b/presets/food.js index 5a774e9c..de3d9d40 100644 --- a/presets/food.js +++ b/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; } diff --git a/scripts/blender-model.py b/scripts/blender-model.py index 45a4bd77..28372fc9 100644 --- a/scripts/blender-model.py +++ b/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 = {}