From 0f1f7fd03f2d455ab4e0667b7a7d0dadc76c0c9b Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Mon, 13 Dec 2021 15:51:35 -0500 Subject: [PATCH] Add CR2032 batteries --- media/objects/Batteries/AA-Top.svg | 2 +- media/objects/Batteries/AAA-Bottom.svg | 17 ++++--- media/objects/Batteries/AAA-Front.svg | 21 +++++---- media/objects/Batteries/AAA-Top.svg | 4 +- media/objects/Batteries/CR2032-Bottom.svg | 55 +++++++++++++++++++++++ media/objects/Batteries/CR2032-Front.svg | 55 +++++++++++++++++++++++ media/objects/Batteries/CR2032-Top.svg | 48 ++++++++++++++++++++ presets/objects.js | 2 +- 8 files changed, 184 insertions(+), 20 deletions(-) create mode 100644 media/objects/Batteries/CR2032-Bottom.svg create mode 100644 media/objects/Batteries/CR2032-Front.svg create mode 100644 media/objects/Batteries/CR2032-Top.svg diff --git a/media/objects/Batteries/AA-Top.svg b/media/objects/Batteries/AA-Top.svg index 229087b0..789379e0 100644 --- a/media/objects/Batteries/AA-Top.svg +++ b/media/objects/Batteries/AA-Top.svg @@ -31,7 +31,7 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019 transform="matrix(0.1,0,0,-0.1,-164.75,1835.5382)"> + d="m 9750,18354 c -63,-2 -216,-11 -340,-19 -2498,-177 -4791,-1469 -6235,-3515 -881,-1249 -1392,-2680 -1511,-4230 -22,-292 -22,-888 0,-1180 107,-1400 537,-2710 1270,-3870 1342,-2123 3566,-3532 6056,-3835 360,-43 604,-57 1010,-57 406,0 650,14 1010,57 2340,285 4456,1550 5815,3475 881,1249 1392,2680 1511,4230 22,292 22,888 0,1180 -119,1550 -630,2981 -1511,4230 -1443,2044 -3737,3339 -6230,3514 -218,16 -644,25 -845,20 z" /> + id="defs22" /> Created by potrace 1.16, written by Peter Selinger 2001-2019 @@ -35,18 +35,21 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019 + d="m 9675,18300 c -1606,-65 -3157,-591 -4465,-1515 -401,-283 -712,-547 -1080,-915 -466,-466 -827,-916 -1162,-1450 -729,-1163 -1145,-2434 -1254,-3835 -22,-286 -22,-884 0,-1170 109,-1401 525,-2672 1254,-3835 335,-534 696,-984 1162,-1450 466,-466 916,-827 1450,-1162 1163,-729 2434,-1145 3835,-1254 286,-22 884,-22 1170,0 1832,143 3463,817 4850,2005 218,187 659,628 846,846 995,1162 1639,2518 1899,3995 87,500 123,911 123,1440 0,404 -14,631 -59,1005 -211,1758 -996,3424 -2217,4709 -84,88 -151,163 -150,168 2,4 -1,7 -5,5 -5,-1 -78,64 -163,145 -1387,1316 -3195,2112 -5114,2252 -255,19 -675,26 -920,16 z m 617,-3440 c 1399,-93 2645,-740 3515,-1826 622,-776 985,-1721 1053,-2742 61,-917 -168,-1900 -627,-2697 -450,-780 -1048,-1378 -1828,-1828 -797,-459 -1780,-688 -2697,-627 -1399,93 -2645,740 -3515,1826 -622,776 -985,1721 -1053,2742 -61,917 168,1900 627,2697 450,780 1048,1378 1828,1828 797,459 1780,688 2697,627 z" /> + + id="path14" + d="m 9685,14809 c -543,-37 -1108,-173 -1607,-389 -102,-44 -386,-188 -488,-247 -730,-423 -1340,-1033 -1763,-1763 -111,-191 -240,-462 -321,-673 -356,-920 -420,-1926 -185,-2884 144,-589 404,-1156 755,-1650 667,-936 1657,-1608 2777,-1882 757,-186 1537,-186 2294,0 588,144 1156,404 1650,755 497,354 937,817 1263,1329 170,266 323,569 434,858 356,920 420,1926 185,2884 -144,589 -404,1156 -755,1650 -543,763 -1311,1359 -2187,1697 -647,250 -1371,361 -2052,315 z" /> diff --git a/media/objects/Batteries/AAA-Front.svg b/media/objects/Batteries/AAA-Front.svg index a2acac7e..f38bb155 100644 --- a/media/objects/Batteries/AAA-Front.svg +++ b/media/objects/Batteries/AAA-Front.svg @@ -5,14 +5,14 @@ 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="svg20" + id="svg22" preserveAspectRatio="xMidYMid meet" viewBox="0 0 393 1672.3" height="1672.3pt" width="393pt" version="1.0"> + id="defs26" /> Created by potrace 1.16, written by Peter Selinger 2001-2019 @@ -31,28 +31,31 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019 transform="matrix(0.1,0,0,-0.1,-803.5,1836.15)"> + d="m 9419,18345 c -42,-23 -49,-62 -49,-261 v -183 l -597,-3 -598,-3 -42,-24 c -24,-14 -55,-43 -70,-65 l -28,-41 V 9910 2055 l 24,-38 c 13,-21 42,-50 64,-65 l 40,-27 339,-3 338,-3 v -93 c 0,-110 12,-151 51,-171 42,-22 2176,-22 2218,0 39,20 51,61 51,171 v 93 l 338,3 339,3 40,27 c 22,15 51,44 64,65 l 24,38 v 7855 7855 l -28,41 c -15,22 -46,51 -70,65 l -42,24 -597,3 -598,3 v 183 c 0,202 -7,239 -51,261 -41,22 -1121,22 -1160,0 z" /> + d="m 8184,17839 c -42,-12 -82,-54 -94,-99 -7,-25 -9,-2641 -8,-7856 l 3,-7819 22,-31 c 49,-69 -103,-64 1893,-64 1996,0 1844,-5 1893,64 l 22,31 v 7840 c 0,7664 0,7841 -19,7871 -10,17 -33,40 -50,50 -30,18 -87,19 -1831,21 -1052,1 -1813,-2 -1831,-8 z" /> + + id="path18" + d="m 8892,1815 c 2,-80 7,-108 18,-115 20,-13 2160,-13 2180,0 11,7 16,35 18,115 l 4,105 H 10000 8888 Z" /> diff --git a/media/objects/Batteries/AAA-Top.svg b/media/objects/Batteries/AAA-Top.svg index c8beb78a..4426fff7 100644 --- a/media/objects/Batteries/AAA-Top.svg +++ b/media/objects/Batteries/AAA-Top.svg @@ -39,7 +39,7 @@ Created by potrace 1.16, written by Peter Selinger 2001-2019 transform="matrix(0.1,0,0,-0.1,-164.75,1835.5382)"> + d="M 9675,18300 C 8069,18235 6518,17709 5210,16785 4564,16328 3951,15746 3460,15120 2535,13943 1935,12494 1756,11005 c -45,-374 -59,-601 -59,-1005 0,-529 36,-940 123,-1440 453,-2582 2111,-4810 4450,-5980 996,-498 2009,-777 3145,-866 286,-22 884,-22 1170,0 1401,109 2672,525 3835,1254 534,335 984,696 1450,1162 466,466 827,916 1162,1450 729,1163 1145,2434 1254,3835 22,286 22,884 0,1170 -89,1136 -368,2149 -866,3145 -1171,2339 -3398,3997 -5980,4450 -566,99 -1207,143 -1765,120 z m 556,-5710 c 497,-50 945,-223 1334,-515 139,-104 291,-247 281,-263 -15,-24 -39,-11 -119,64 -329,307 -774,533 -1222,623 -188,38 -277,46 -505,46 -130,0 -263,-6 -315,-13 -593,-85 -1077,-323 -1486,-731 -408,-409 -646,-893 -731,-1486 -7,-52 -13,-185 -13,-315 0,-228 8,-317 46,-505 90,-449 316,-893 624,-1222 74,-80 88,-110 56,-121 -10,-3 -12,0 -8,12 5,11 1,16 -13,16 -23,0 -127,112 -235,255 -291,387 -465,837 -515,1334 -35,351 21,780 145,1117 48,129 157,355 229,474 201,329 527,655 856,856 119,72 345,181 474,229 178,66 432,123 641,144 118,12 358,12 476,1 z" /> + d="m 9780,15757 c -3,-2 -68,-7 -145,-11 -77,-4 -151,-8 -165,-10 -14,-2 -54,-6 -90,-10 -63,-7 -249,-32 -300,-41 -14,-2 -43,-7 -65,-10 -22,-4 -74,-13 -115,-22 -41,-8 -86,-17 -100,-20 -21,-3 -155,-34 -210,-48 -58,-14 -179,-47 -200,-55 -14,-4 -97,-32 -185,-60 -88,-28 -174,-58 -192,-66 -17,-8 -36,-14 -42,-14 -6,0 -20,-4 -31,-10 -11,-5 -29,-14 -40,-20 -11,-5 -25,-10 -31,-10 -33,0 -608,-275 -689,-329 -14,-9 -50,-30 -80,-45 -30,-16 -62,-35 -71,-42 -8,-8 -18,-14 -21,-14 -3,0 -38,-22 -79,-48 -41,-27 -88,-57 -105,-68 -56,-34 -119,-77 -124,-84 -3,-3 -34,-26 -70,-51 -35,-24 -71,-49 -80,-56 -63,-49 -227,-179 -236,-188 -6,-5 -33,-28 -60,-50 -168,-140 -489,-464 -653,-660 -796,-947 -1257,-2085 -1346,-3315 -15,-208 -13,-673 4,-870 15,-176 41,-382 61,-485 6,-27 17,-88 24,-135 17,-101 85,-386 115,-485 104,-337 186,-561 301,-815 373,-824 969,-1581 1690,-2146 832,-651 1842,-1066 2880,-1183 96,-11 207,-23 245,-27 105,-10 656,-12 765,-4 52,5 129,11 170,14 154,12 393,44 525,71 17,4 62,13 100,20 94,18 127,25 147,31 9,3 25,7 35,9 154,32 547,151 708,214 110,43 231,92 250,100 11,6 52,23 90,40 99,42 380,187 485,249 19,12 58,33 87,47 29,15 57,33 64,41 6,8 17,14 24,14 7,0 18,6 24,14 7,8 31,24 54,36 23,12 65,39 92,60 28,20 65,45 83,56 17,10 32,22 32,26 0,4 6,8 13,8 6,0 26,11 42,25 37,30 39,32 98,75 80,59 170,130 213,168 23,21 61,53 84,72 145,119 507,480 580,577 8,11 40,49 70,83 30,35 61,72 69,84 8,12 17,23 20,26 14,12 127,157 156,199 17,25 47,69 65,96 19,28 40,56 47,63 7,7 13,17 13,22 0,5 6,15 13,22 15,16 67,96 67,103 0,3 5,11 10,18 17,20 80,120 96,152 8,17 25,48 39,70 13,22 32,56 41,75 9,19 19,37 23,40 7,6 151,293 151,302 0,4 24,57 54,120 29,62 56,124 60,138 4,14 11,34 16,45 5,11 20,52 35,90 15,39 32,84 40,100 11,25 33,94 41,130 1,6 16,53 33,105 34,107 107,376 116,430 3,19 10,49 14,65 8,26 30,139 45,228 3,15 10,53 15,85 6,31 15,100 21,152 6,52 13,114 16,137 30,229 38,773 14,1048 -49,585 -167,1103 -372,1640 -189,493 -475,1004 -787,1405 -36,47 -82,106 -101,131 -71,95 -322,368 -456,499 -990,961 -2229,1518 -3613,1624 -166,12 -621,22 -631,13 z m 451,-3167 c 497,-50 945,-223 1334,-515 139,-104 291,-247 281,-263 -15,-24 -39,-11 -119,64 -329,307 -774,533 -1222,623 -188,38 -277,46 -505,46 -130,0 -263,-6 -315,-13 -593,-85 -1077,-323 -1486,-731 -408,-409 -646,-893 -731,-1486 -7,-52 -13,-185 -13,-315 0,-228 8,-317 46,-505 90,-449 316,-893 624,-1222 74,-80 88,-110 56,-121 -10,-3 -12,0 -8,12 5,11 1,16 -13,16 -23,0 -127,112 -235,255 -291,387 -465,837 -515,1334 -35,351 21,780 145,1117 48,129 157,355 229,474 201,329 527,655 856,856 119,72 345,181 474,229 178,66 432,123 641,144 118,12 358,12 476,1 z" /> diff --git a/media/objects/Batteries/CR2032-Bottom.svg b/media/objects/Batteries/CR2032-Bottom.svg new file mode 100644 index 00000000..f24eacda --- /dev/null +++ b/media/objects/Batteries/CR2032-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/CR2032-Front.svg b/media/objects/Batteries/CR2032-Front.svg new file mode 100644 index 00000000..231d3ea4 --- /dev/null +++ b/media/objects/Batteries/CR2032-Front.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/CR2032-Top.svg b/media/objects/Batteries/CR2032-Top.svg new file mode 100644 index 00000000..7c5212ab --- /dev/null +++ b/media/objects/Batteries/CR2032-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 746fcfe9..236edae4 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -901,7 +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.0017165366146457, "bottom": 0.0017106637806162154}, {"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.001890756302521, "bottom": 0.0018836333193804123}, {"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.009421889198884, "bottom": 0.009247628928647859}, {"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}]}]})); + /* ***Batteries*** */ results.push(makeModel({"name": "Batteries", "kind": "objects", "forms": [{"name": "AA", "views": [{"name": "Front", "height": 0.05000000447034836, "mass": 0.02369000017642975, "extra": 1.0017165366146457, "bottom": 0.0017106637806162154}, {"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.044222988188266754, "mass": 0.011660000309348106, "extra": 1.001890756302521, "bottom": 0.0018836333193804123}, {"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.009421889198884, "bottom": 0.009247628928647859}, {"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}]}, {"name": "CR2032", "views": [{"name": "Front", "height": 0.0029799621552228928, "mass": 0.0029700000304728746, "extra": 1.0114514097204386, "bottom": 0.01119501237341194}, {"name": "Top", "height": 0.01996004953980446, "mass": 0.0029700000304728746, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Bottom", "height": 0.01996004953980446, "mass": 0.0029700000304728746, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}]}]})); /* ***Poker Chips*** */ results.push(makeModel({"name": "Poker Chips", "kind": "objects", "forms": [{"name": "Poker Chip", "views": [{"name": "Top", "height": 0.039500001817941666, "mass": 0.007910000160336494, "extra": 1.0016588562572393, "bottom": 0.0016533708480855258}, {"name": "Edge", "height": 0.0033300002105534077, "mass": 0.007910000160336494, "extra": 1.0211183214285713, "bottom": 0.020262501393808655}]}]})); /* ***INSERT HERE*** */ return results;