From d9f7563214dbe658591dce76997ca59a7210921f Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sun, 12 Dec 2021 14:24:50 -0500 Subject: [PATCH] Update batteries with new 3D models This adds a CR1632 button cell --- media/attribution.js | 2 +- media/objects/batteries/AA-Bottom.svg | 55 ++++++++++++++++++++ media/objects/batteries/AA-Front.svg | 61 +++++++++++++++++++++++ media/objects/batteries/AA-Top.svg | 58 +++++++++++++++++++++ media/objects/batteries/AAA-Bottom.svg | 55 ++++++++++++++++++++ media/objects/batteries/AAA-Front.svg | 61 +++++++++++++++++++++++ media/objects/batteries/AAA-Top.svg | 58 +++++++++++++++++++++ media/objects/batteries/CR1632-Bottom.svg | 55 ++++++++++++++++++++ media/objects/batteries/CR1632-Front.svg | 52 +++++++++++++++++++ media/objects/batteries/CR1632-Top.svg | 48 ++++++++++++++++++ presets/objects.js | 10 +--- 11 files changed, 505 insertions(+), 10 deletions(-) create mode 100644 media/objects/batteries/AA-Bottom.svg create mode 100644 media/objects/batteries/AA-Front.svg create mode 100644 media/objects/batteries/AA-Top.svg create mode 100644 media/objects/batteries/AAA-Bottom.svg create mode 100644 media/objects/batteries/AAA-Front.svg create mode 100644 media/objects/batteries/AAA-Top.svg create mode 100644 media/objects/batteries/CR1632-Bottom.svg create mode 100644 media/objects/batteries/CR1632-Front.svg create mode 100644 media/objects/batteries/CR1632-Top.svg diff --git a/media/attribution.js b/media/attribution.js index 1bab48b8..d58d9816 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -20193,7 +20193,7 @@ const attributionData = { ] }, { - prefix: "./media/objects/batteries/", + prefix: "./media/objects/Batteries/", all: null, authors: [ "chemicalcrux" diff --git a/media/objects/batteries/AA-Bottom.svg b/media/objects/batteries/AA-Bottom.svg new file mode 100644 index 00000000..563d3e83 --- /dev/null +++ b/media/objects/batteries/AA-Bottom.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/AA-Front.svg b/media/objects/batteries/AA-Front.svg new file mode 100644 index 00000000..1685c6f9 --- /dev/null +++ b/media/objects/batteries/AA-Front.svg @@ -0,0 +1,61 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/AA-Top.svg b/media/objects/batteries/AA-Top.svg new file mode 100644 index 00000000..6c955658 --- /dev/null +++ b/media/objects/batteries/AA-Top.svg @@ -0,0 +1,58 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/AAA-Bottom.svg b/media/objects/batteries/AAA-Bottom.svg new file mode 100644 index 00000000..08873f52 --- /dev/null +++ b/media/objects/batteries/AAA-Bottom.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/AAA-Front.svg b/media/objects/batteries/AAA-Front.svg new file mode 100644 index 00000000..adcb6053 --- /dev/null +++ b/media/objects/batteries/AAA-Front.svg @@ -0,0 +1,61 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/AAA-Top.svg b/media/objects/batteries/AAA-Top.svg new file mode 100644 index 00000000..128c6d38 --- /dev/null +++ b/media/objects/batteries/AAA-Top.svg @@ -0,0 +1,58 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/CR1632-Bottom.svg b/media/objects/batteries/CR1632-Bottom.svg new file mode 100644 index 00000000..aa5d844d --- /dev/null +++ b/media/objects/batteries/CR1632-Bottom.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/media/objects/batteries/CR1632-Front.svg b/media/objects/batteries/CR1632-Front.svg new file mode 100644 index 00000000..edcecd18 --- /dev/null +++ b/media/objects/batteries/CR1632-Front.svg @@ -0,0 +1,52 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/objects/batteries/CR1632-Top.svg b/media/objects/batteries/CR1632-Top.svg new file mode 100644 index 00000000..9c8649a8 --- /dev/null +++ b/media/objects/batteries/CR1632-Top.svg @@ -0,0 +1,48 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + diff --git a/presets/objects.js b/presets/objects.js index fd94975d..c1cb5c45 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -803,15 +803,6 @@ function makeObjects() { "" )); - results.push(makeHeight( - [ - ["AA", 50, "mm"], - ["AAA", 44.1, "mm"] - ], - "Batteries", - "" - )); - results.push(makeHeight( [ ["Regular", 32, "mm"], @@ -910,6 +901,7 @@ function makeObjects() { /* ***Optical Discs*** */ results.push(makeModel({"name": "Optical Discs", "kind": "objects", "forms": [{"name": "Compact Disc", "views": [{"name": "Top", "height": 0.12000000476837158, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Edge", "height": 0.0012000000569969416, "extra": 1.16776865625, "bottom": 0.12561884619752997}, {"name": "Bottom", "height": 0.12000000476837158, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}]}]})); /* ***Staples*** */ results.push(makeModel({"name": "Staples", "kind": "objects", "forms": [{"name": "Standard Staple", "views": [{"name": "Front", "height": 0.00634999992325902}, {"name": "Angled", "height": 0.00634999992325902}, {"name": "Side", "height": 0.00634999992325902}, {"name": "Top", "height": 0.0003969999961555004}]}]})); /* ***Rulers*** */ results.push(makeModel({"name": "Rulers", "kind": "objects", "forms": [{"name": "Wooden Ruler", "views": [{"name": "Top", "height": 0.30797499418258667, "extra": 1.0012004801920769, "bottom": 0.0011976047904191617}, {"name": "Edge", "height": 0.003634304739534855, "extra": 1.0459056530118458, "bottom": 0.04204540909090908}, {"name": "End", "height": 0.003634304739534855, "extra": 1.0054553851294097, "bottom": 0.005396505102040825}]}]})); + /* ***Batteries*** */ results.push(makeModel({"name": "Batteries", "kind": "objects", "forms": [{"name": "AA", "views": [{"name": "Front", "height": 0.05000000447034836, "mass": 0.02369000017642975, "extra": 1.0017708583433373, "bottom": 0.001764608599614688}, {"name": "Top", "height": 0.014079931192100048, "mass": 0.02369000017642975, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Bottom", "height": 0.014079931192100048, "mass": 0.02369000017642975, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}]}, {"name": "AAA", "views": [{"name": "Front", "height": 0.04421994090080261, "mass": 0.011660000309348106, "extra": 1.001845738295318, "bottom": 0.0018389498549771523}, {"name": "Top", "height": 0.010320000350475311, "mass": 0.011660000309348106, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Bottom", "height": 0.010320000350475311, "mass": 0.011660000309348106, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}]}, {"name": "CR1632", "views": [{"name": "Front", "height": 0.0029999995604157448, "mass": 0.0019000000320374966, "extra": 1.0089968471337578, "bottom": 0.00883782206552017}, {"name": "Top", "height": 0.01591000147163868, "mass": 0.0019000000320374966, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Bottom", "height": 0.01591000147163868, "mass": 0.0019000000320374966, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}]}]})); /* ***INSERT HERE*** */ return results; }