From e23e283b8742a68952535d9dfff191dcdb6f19ac Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 3 Apr 2021 13:20:40 -0400 Subject: [PATCH] Add tin cans --- media/attribution.js | 7 +++ media/objects/tin-cans/No. 1 (11 Oz.).svg | 67 ++++++++++++++++++++ media/objects/tin-cans/No. 10 (110 Oz.).svg | 68 +++++++++++++++++++++ media/objects/tin-cans/No. 2 (20 Oz.).svg | 68 +++++++++++++++++++++ media/objects/tin-cans/No. 3 (52 Oz.).svg | 66 ++++++++++++++++++++ media/objects/tin-cans/No. 5 (60 Oz.).svg | 68 +++++++++++++++++++++ presets/objects.js | 12 ++++ 7 files changed, 356 insertions(+) create mode 100644 media/objects/tin-cans/No. 1 (11 Oz.).svg create mode 100644 media/objects/tin-cans/No. 10 (110 Oz.).svg create mode 100644 media/objects/tin-cans/No. 2 (20 Oz.).svg create mode 100644 media/objects/tin-cans/No. 3 (52 Oz.).svg create mode 100644 media/objects/tin-cans/No. 5 (60 Oz.).svg diff --git a/media/attribution.js b/media/attribution.js index 7d5c4175..eee9fb19 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -15736,6 +15736,13 @@ const attributionData = { "chemicalcrux" ] }, + { + prefix: "./media/objects/tin-cans/", + all: null, + authors: [ + "chemicalcrux" + ] + }, { prefix: "./media/real-buildings/", all: "https://wiki.openstreetmap.org/wiki/Blender", diff --git a/media/objects/tin-cans/No. 1 (11 Oz.).svg b/media/objects/tin-cans/No. 1 (11 Oz.).svg new file mode 100644 index 00000000..e03b007c --- /dev/null +++ b/media/objects/tin-cans/No. 1 (11 Oz.).svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/objects/tin-cans/No. 10 (110 Oz.).svg b/media/objects/tin-cans/No. 10 (110 Oz.).svg new file mode 100644 index 00000000..7f18c332 --- /dev/null +++ b/media/objects/tin-cans/No. 10 (110 Oz.).svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/objects/tin-cans/No. 2 (20 Oz.).svg b/media/objects/tin-cans/No. 2 (20 Oz.).svg new file mode 100644 index 00000000..9d2dcdfd --- /dev/null +++ b/media/objects/tin-cans/No. 2 (20 Oz.).svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/objects/tin-cans/No. 3 (52 Oz.).svg b/media/objects/tin-cans/No. 3 (52 Oz.).svg new file mode 100644 index 00000000..78c04d42 --- /dev/null +++ b/media/objects/tin-cans/No. 3 (52 Oz.).svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/objects/tin-cans/No. 5 (60 Oz.).svg b/media/objects/tin-cans/No. 5 (60 Oz.).svg new file mode 100644 index 00000000..abe5f3a5 --- /dev/null +++ b/media/objects/tin-cans/No. 5 (60 Oz.).svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/objects.js b/presets/objects.js index ebc06b66..d6b54564 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -741,6 +741,18 @@ function makeObjects() { "" )) + results.push(makeHeight( + [ + ["No. 1 (11 Oz.)", 4, "inches", "./media/objects/tin-cans/No. 1 (11 Oz.).svg"], + ["No. 2 (20 Oz.)", 4 + 9/16, "inches", "./media/objects/tin-cans/No. 2 (20 Oz.).svg"], + ["No. 3 (52 Oz.)", 7, "inches", "./media/objects/tin-cans/No. 3 (52 Oz.).svg"], + ["No. 5 (60 Oz.)", 5 + 5/8, "inches", "./media/objects/tin-cans/No. 5 (60 Oz.).svg"], + ["No. 10 (110 Oz.)", 7, "inches", "./media/objects/tin-cans/No. 10 (110 Oz.).svg"], + ], + "Tin Cans", + "" + )) + results.sort((b1, b2) => { e1 = b1.constructor();