diff --git a/macrovision.js b/macrovision.js index 82119e40..dd115b0a 100644 --- a/macrovision.js +++ b/macrovision.js @@ -4426,6 +4426,9 @@ function prepareEntities() { availableEntities["objects"].sort((x, y) => { return x.name.localeCompare(y.name) }); + availableEntities["furniture"].sort((x, y) => { + return x.name.localeCompare(y.name) + }); const holder = document.querySelector("#spawners"); const filterHolder = document.querySelector("#filters"); diff --git a/media/attribution.js b/media/attribution.js index d51cbea3..72c05afd 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -19686,6 +19686,17 @@ const attributionData = { "chemicalcrux" ] }, + { + prefix: "./media/furniture/Tables", + all: null, + authors: [ + "chemicalcrux" + ], + citations: [ + "https://www.dimensions.com/element/rectangular-picnic-table", + "https://www.dimensions.com/element/cafe-tables" + ] + }, { prefix: "./media/landmarks/", files: [ diff --git a/media/furniture/Tables/Picnic Table-Angled.svg b/media/furniture/Tables/Picnic Table-Angled.svg new file mode 100644 index 00000000..b7a12272 --- /dev/null +++ b/media/furniture/Tables/Picnic Table-Angled.svg @@ -0,0 +1,265 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Picnic Table-Bottom.svg b/media/furniture/Tables/Picnic Table-Bottom.svg new file mode 100644 index 00000000..ee130d2c --- /dev/null +++ b/media/furniture/Tables/Picnic Table-Bottom.svg @@ -0,0 +1,217 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Picnic Table-Front.svg b/media/furniture/Tables/Picnic Table-Front.svg new file mode 100644 index 00000000..99ef04c0 --- /dev/null +++ b/media/furniture/Tables/Picnic Table-Front.svg @@ -0,0 +1,124 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Picnic Table-Side.svg b/media/furniture/Tables/Picnic Table-Side.svg new file mode 100644 index 00000000..9f2c27b0 --- /dev/null +++ b/media/furniture/Tables/Picnic Table-Side.svg @@ -0,0 +1,154 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Picnic Table-Top.svg b/media/furniture/Tables/Picnic Table-Top.svg new file mode 100644 index 00000000..9c41e5f5 --- /dev/null +++ b/media/furniture/Tables/Picnic Table-Top.svg @@ -0,0 +1,253 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Small Folding Table-Angled.svg b/media/furniture/Tables/Small Folding Table-Angled.svg new file mode 100644 index 00000000..2c08a997 --- /dev/null +++ b/media/furniture/Tables/Small Folding Table-Angled.svg @@ -0,0 +1,88 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Small Folding Table-Bottom.svg b/media/furniture/Tables/Small Folding Table-Bottom.svg new file mode 100644 index 00000000..ce799411 --- /dev/null +++ b/media/furniture/Tables/Small Folding Table-Bottom.svg @@ -0,0 +1,85 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Small Folding Table-Front.svg b/media/furniture/Tables/Small Folding Table-Front.svg new file mode 100644 index 00000000..8677fda1 --- /dev/null +++ b/media/furniture/Tables/Small Folding Table-Front.svg @@ -0,0 +1,67 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Small Folding Table-Side.svg b/media/furniture/Tables/Small Folding Table-Side.svg new file mode 100644 index 00000000..443166ca --- /dev/null +++ b/media/furniture/Tables/Small Folding Table-Side.svg @@ -0,0 +1,73 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/media/furniture/Tables/Small Folding Table-Top.svg b/media/furniture/Tables/Small Folding Table-Top.svg new file mode 100644 index 00000000..94892615 --- /dev/null +++ b/media/furniture/Tables/Small Folding Table-Top.svg @@ -0,0 +1,48 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + diff --git a/presets/furniture.js b/presets/furniture.js index 5bd802c9..3673979c 100644 --- a/presets/furniture.js +++ b/presets/furniture.js @@ -36,6 +36,9 @@ function makeFurniture() { ) ) + /* ***Tables*** */ results.push(makeModel({"name": "Tables", "kind": "furniture", "forms": [{"name": "Picnic Table", "views": [{"name": "Front", "height": 0.7535526156425476, "extra": 1.0058282909930716, "bottom": 0.005761135840809958}, {"name": "Angled", "height": 0.7535526156425476, "extra": 1.0092250922509225, "bottom": 0.009057971014492754}, {"name": "Side", "height": 0.7535526156425476, "extra": 1.0073926822157433, "bottom": 0.007284971260779868}, {"name": "Top", "height": 1.8287999629974365, "extra": 1.003046218487395, "bottom": 0.003027771977448346}, {"name": "Bottom", "height": 1.8287999629974365, "extra": 1.003046218487395, "bottom": 0.003027771977448346}]}, {"name": "Small Folding Table", "views": [{"name": "Front", "height": 0.8018024563789368, "extra": 1.0033813096412243, "bottom": 0.0033585967302146766}, {"name": "Angled", "height": 0.8018024563789368, "extra": 1.0040256234915528, "bottom": 0.003993471069651093}, {"name": "Side", "height": 0.8018024563789368, "extra": 1.003167808219178, "bottom": 0.0031478645567465553}, {"name": "Top", "height": 0.6096000075340271, "extra": 1.004279089376054, "bottom": 0.004242778915687869}, {"name": "Bottom", "height": 0.6096000075340271, "extra": 1.004279089376054, "bottom": 0.004242778915687869}]}]})); + /* ***INSERT HERE*** */ + results.sort((b1, b2) => { e1 = b1.constructor(); e2 = b2.constructor();