diff --git a/media/attribution.js b/media/attribution.js index 39d56f43..ca6f4fbc 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -20179,6 +20179,16 @@ const attributionData = { "chemicalcrux" ] }, + { + prefix: "./media/food/Sprinkles/", + all: null, + authors: [ + "chemicalcrux" + ], + citations: [ + "https://freshaprilflours.com/guide-to-baking-and-decorating-with-sprinkles/" + ] + }, { prefix: "./media/furniture/Sofas/", files: [ diff --git a/media/food/Sprinkles/Beads-Angled.svg b/media/food/Sprinkles/Beads-Angled.svg new file mode 100644 index 00000000..868a7ecc --- /dev/null +++ b/media/food/Sprinkles/Beads-Angled.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/food/Sprinkles/Beads-Front.svg b/media/food/Sprinkles/Beads-Front.svg new file mode 100644 index 00000000..ccb6b907 --- /dev/null +++ b/media/food/Sprinkles/Beads-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/Sprinkles/Beads-Top.svg b/media/food/Sprinkles/Beads-Top.svg new file mode 100644 index 00000000..3b048838 --- /dev/null +++ b/media/food/Sprinkles/Beads-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/Sprinkles/Jimmies-Angled.svg b/media/food/Sprinkles/Jimmies-Angled.svg new file mode 100644 index 00000000..7f4ee317 --- /dev/null +++ b/media/food/Sprinkles/Jimmies-Angled.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/food/Sprinkles/Jimmies-Front.svg b/media/food/Sprinkles/Jimmies-Front.svg new file mode 100644 index 00000000..bff52fe0 --- /dev/null +++ b/media/food/Sprinkles/Jimmies-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/Sprinkles/Jimmies-Top.svg b/media/food/Sprinkles/Jimmies-Top.svg new file mode 100644 index 00000000..332670fa --- /dev/null +++ b/media/food/Sprinkles/Jimmies-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/Sprinkles/Nonpareils-Angled.svg b/media/food/Sprinkles/Nonpareils-Angled.svg new file mode 100644 index 00000000..868a7ecc --- /dev/null +++ b/media/food/Sprinkles/Nonpareils-Angled.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/food/Sprinkles/Nonpareils-Front.svg b/media/food/Sprinkles/Nonpareils-Front.svg new file mode 100644 index 00000000..ccb6b907 --- /dev/null +++ b/media/food/Sprinkles/Nonpareils-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/Sprinkles/Nonpareils-Top.svg b/media/food/Sprinkles/Nonpareils-Top.svg new file mode 100644 index 00000000..3b048838 --- /dev/null +++ b/media/food/Sprinkles/Nonpareils-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/Sprinkles/Pearls-Angled.svg b/media/food/Sprinkles/Pearls-Angled.svg new file mode 100644 index 00000000..868a7ecc --- /dev/null +++ b/media/food/Sprinkles/Pearls-Angled.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/food/Sprinkles/Pearls-Front.svg b/media/food/Sprinkles/Pearls-Front.svg new file mode 100644 index 00000000..ccb6b907 --- /dev/null +++ b/media/food/Sprinkles/Pearls-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/Sprinkles/Pearls-Top.svg b/media/food/Sprinkles/Pearls-Top.svg new file mode 100644 index 00000000..3b048838 --- /dev/null +++ b/media/food/Sprinkles/Pearls-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/Sprinkles/Quins-Angled.svg b/media/food/Sprinkles/Quins-Angled.svg new file mode 100644 index 00000000..fcf75156 --- /dev/null +++ b/media/food/Sprinkles/Quins-Angled.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/food/Sprinkles/Quins-Front.svg b/media/food/Sprinkles/Quins-Front.svg new file mode 100644 index 00000000..56c53bfa --- /dev/null +++ b/media/food/Sprinkles/Quins-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/Sprinkles/Quins-Top.svg b/media/food/Sprinkles/Quins-Top.svg new file mode 100644 index 00000000..bff52fe0 --- /dev/null +++ b/media/food/Sprinkles/Quins-Top.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/presets/food.js b/presets/food.js index 96235abd..20e0b7e8 100644 --- a/presets/food.js +++ b/presets/food.js @@ -128,6 +128,7 @@ function makeFood() { /* ***Noodles*** */ results.push(makeModel({"name": "Noodles", "kind": "food", "forms": [{"name": "Egg Noodle", "views": [{"name": "Top", "height": 0.032999999821186066, "mass": 0.000699999975040555, "extra": 1.0016954381752703, "bottom": 0.0016897085823988345}, {"name": "Front", "height": 0.011669180355966091, "mass": 0.000699999975040555, "extra": 1.001628943629906, "bottom": 0.0016236539483931555}, {"name": "Angled", "height": 0.011669180355966091, "mass": 0.000699999975040555, "extra": 1.0039921006053496, "bottom": 0.003960479341396986}, {"name": "Side", "height": 0.011669180355966091, "mass": 0.000699999975040555, "extra": 1.0040804752644092, "bottom": 0.004047444271937919}]}]})); /* ***Seeds*** */ results.push(makeModel({"name": "Seeds", "kind": "food", "forms": [{"name": "Corn Kernel", "views": [{"name": "Top", "height": 0.013000001199543476, "mass": 0.00044133333722129464, "extra": 1.002910640340875, "bottom": 0.002893794749403287}, {"name": "Front", "height": 0.005000000353902578, "mass": 0.00044133333722129464, "extra": 1.0054957130415634, "bottom": 0.005435964044576862}, {"name": "Side", "height": 0.005000000353902578, "mass": 0.00044133333722129464, "extra": 1.0069798441153546, "bottom": 0.006883749123728984}]}]})); /* ***Sugar Cubes*** */ results.push(makeModel({"name": "Sugar Cubes", "kind": "food", "forms": [{"name": "Sugar Cube", "views": [{"name": "Front", "height": 0.015239999629557133, "volume": 3.5396055658854918e-06, "mass": 0.004, "extra": 1.007730762304922, "bottom": 0.0076130529001503305}, {"name": "Angled", "height": 0.015239999629557133, "volume": 3.5396055658854918e-06, "mass": 0.004, "extra": 1.0094043887147335, "bottom": 0.009230769230769232}, {"name": "Corner", "height": 0.015239999629557133, "volume": 3.5396055658854918e-06, "mass": 0.004, "extra": 1.0110356536502547, "bottom": 0.01079734219269103}]}]})); + /* ***Sprinkles*** */ results.push(makeModel({"name": "Sprinkles", "kind": "food", "forms": [{"name": "Jimmies", "views": [{"name": "Top", "height": 0.0066678402945399284, "volume": 1.2678742658850777e-08, "mass": 1.584842832356347e-05, "extra": 1.0078031212484995, "bottom": 0.0076832151300236405}, {"name": "Front", "height": 0.0015906915068626404, "volume": 1.2678742658850777e-08, "mass": 1.584842832356347e-05, "extra": 1.0076827507092336, "bottom": 0.007566487829752757}, {"name": "Angled", "height": 0.0015906915068626404, "volume": 1.2678742658850777e-08, "mass": 1.584842832356347e-05, "extra": 1.018181818181818, "bottom": 0.017543859649122806}]}, {"name": "Nonpareils", "views": [{"name": "Top", "height": 0.0010000000474974513, "volume": 5.058757400078902e-10, "mass": 6.323446750098629e-07, "extra": 1.0077121252305168, "bottom": 0.007594978381711155}, {"name": "Front", "height": 0.0010000000474974513, "volume": 5.058757400078902e-10, "mass": 6.323446750098629e-07, "extra": 1.00771212337909, "bottom": 0.007594976586103275}, {"name": "Angled", "height": 0.0010000000474974513, "volume": 5.058757400078902e-10, "mass": 6.323446750098629e-07, "extra": 1.009641713262591, "bottom": 0.009459305441137543}]}, {"name": "Pearls", "views": [{"name": "Top", "height": 0.0030000002589076757, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.0077121252305168, "bottom": 0.007594978381711155}, {"name": "Front", "height": 0.0030000002589076757, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.00771212337909, "bottom": 0.007594976586103275}, {"name": "Angled", "height": 0.0030000002589076757, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.009641713262591, "bottom": 0.009459305441137543}]}, {"name": "Beads", "views": [{"name": "Top", "height": 0.0060000005178153515, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.0077121252305168, "bottom": 0.007594978381711155}, {"name": "Front", "height": 0.0060000005178153515, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.00771212337909, "bottom": 0.007594976586103275}, {"name": "Angled", "height": 0.0060000005178153515, "volume": 1.3658646678033168e-08, "mass": 1.707330834754146e-05, "extra": 1.009641713262591, "bottom": 0.009459305441137543}]}, {"name": "Quins", "views": [{"name": "Top", "height": 0.00457199988886714, "volume": 7.834371457087559e-09, "mass": 9.79296432135945e-06, "extra": 1.007682171789495, "bottom": 0.0075659262983537225}, {"name": "Front", "height": 0.0005079999682493508, "volume": 7.834371457087559e-09, "mass": 9.79296432135945e-06, "extra": 1.064516129032258, "bottom": 0.05714285714285714}, {"name": "Angled", "height": 0.0005079999682493508, "volume": 7.834371457087559e-09, "mass": 9.79296432135945e-06, "extra": 1.0815752812939523, "bottom": 0.07013303687224692}]}]})); /* ***INSERT HERE*** */ results.sort((b1, b2) => { diff --git a/scripts/blender/addons/macrovision/ops.py b/scripts/blender/addons/macrovision/ops.py index b5c01ca1..6c91f07c 100644 --- a/scripts/blender/addons/macrovision/ops.py +++ b/scripts/blender/addons/macrovision/ops.py @@ -355,7 +355,7 @@ class MVExport(bpy.types.Operator): if mass_mode == "MANUAL": mass = read_sci(coll.mv_entity_mass) elif mass_mode == "DENSITY": - mass = volume * read_sci(coll.mv_entity_mass) * 1000 + mass = volume * read_sci(coll.mv_entity_density) * 1000 if volume is not None: view_data["volume"] = volume * (scale_factor ** 3)