From 2e6f744e029f127d90fb097e4c46d78e76202258 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Tue, 14 Dec 2021 09:15:06 -0500 Subject: [PATCH] Move doors to the building category --- media/{objects => buildings}/Doors/6 Panel Door-Angled.svg | 0 media/{objects => buildings}/Doors/6 Panel Door-Front.svg | 0 media/{objects => buildings}/Doors/6 Panel Door-Side.svg | 0 media/{objects => buildings}/Doors/6 Panel Door-Top.svg | 0 media/{objects => buildings}/Doors/Fire Door-Angled.svg | 0 media/{objects => buildings}/Doors/Fire Door-Front.svg | 0 media/{objects => buildings}/Doors/Fire Door-Side.svg | 0 media/{objects => buildings}/Doors/Fire Door-Top.svg | 0 media/{objects => buildings}/Doors/French Door-Angled.svg | 0 media/{objects => buildings}/Doors/French Door-Front.svg | 0 media/{objects => buildings}/Doors/French Door-Side.svg | 0 media/{objects => buildings}/Doors/French Door-Top.svg | 0 media/{objects => buildings}/Doors/Interior Door-Angled.svg | 0 media/{objects => buildings}/Doors/Interior Door-Front.svg | 0 media/{objects => buildings}/Doors/Interior Door-Side.svg | 0 media/{objects => buildings}/Doors/Interior Door-Top.svg | 0 presets/buildings.js | 1 + presets/objects.js | 1 - 18 files changed, 1 insertion(+), 1 deletion(-) rename media/{objects => buildings}/Doors/6 Panel Door-Angled.svg (100%) rename media/{objects => buildings}/Doors/6 Panel Door-Front.svg (100%) rename media/{objects => buildings}/Doors/6 Panel Door-Side.svg (100%) rename media/{objects => buildings}/Doors/6 Panel Door-Top.svg (100%) rename media/{objects => buildings}/Doors/Fire Door-Angled.svg (100%) rename media/{objects => buildings}/Doors/Fire Door-Front.svg (100%) rename media/{objects => buildings}/Doors/Fire Door-Side.svg (100%) rename media/{objects => buildings}/Doors/Fire Door-Top.svg (100%) rename media/{objects => buildings}/Doors/French Door-Angled.svg (100%) rename media/{objects => buildings}/Doors/French Door-Front.svg (100%) rename media/{objects => buildings}/Doors/French Door-Side.svg (100%) rename media/{objects => buildings}/Doors/French Door-Top.svg (100%) rename media/{objects => buildings}/Doors/Interior Door-Angled.svg (100%) rename media/{objects => buildings}/Doors/Interior Door-Front.svg (100%) rename media/{objects => buildings}/Doors/Interior Door-Side.svg (100%) rename media/{objects => buildings}/Doors/Interior Door-Top.svg (100%) diff --git a/media/objects/Doors/6 Panel Door-Angled.svg b/media/buildings/Doors/6 Panel Door-Angled.svg similarity index 100% rename from media/objects/Doors/6 Panel Door-Angled.svg rename to media/buildings/Doors/6 Panel Door-Angled.svg diff --git a/media/objects/Doors/6 Panel Door-Front.svg b/media/buildings/Doors/6 Panel Door-Front.svg similarity index 100% rename from media/objects/Doors/6 Panel Door-Front.svg rename to media/buildings/Doors/6 Panel Door-Front.svg diff --git a/media/objects/Doors/6 Panel Door-Side.svg b/media/buildings/Doors/6 Panel Door-Side.svg similarity index 100% rename from media/objects/Doors/6 Panel Door-Side.svg rename to media/buildings/Doors/6 Panel Door-Side.svg diff --git a/media/objects/Doors/6 Panel Door-Top.svg b/media/buildings/Doors/6 Panel Door-Top.svg similarity index 100% rename from media/objects/Doors/6 Panel Door-Top.svg rename to media/buildings/Doors/6 Panel Door-Top.svg diff --git a/media/objects/Doors/Fire Door-Angled.svg b/media/buildings/Doors/Fire Door-Angled.svg similarity index 100% rename from media/objects/Doors/Fire Door-Angled.svg rename to media/buildings/Doors/Fire Door-Angled.svg diff --git a/media/objects/Doors/Fire Door-Front.svg b/media/buildings/Doors/Fire Door-Front.svg similarity index 100% rename from media/objects/Doors/Fire Door-Front.svg rename to media/buildings/Doors/Fire Door-Front.svg diff --git a/media/objects/Doors/Fire Door-Side.svg b/media/buildings/Doors/Fire Door-Side.svg similarity index 100% rename from media/objects/Doors/Fire Door-Side.svg rename to media/buildings/Doors/Fire Door-Side.svg diff --git a/media/objects/Doors/Fire Door-Top.svg b/media/buildings/Doors/Fire Door-Top.svg similarity index 100% rename from media/objects/Doors/Fire Door-Top.svg rename to media/buildings/Doors/Fire Door-Top.svg diff --git a/media/objects/Doors/French Door-Angled.svg b/media/buildings/Doors/French Door-Angled.svg similarity index 100% rename from media/objects/Doors/French Door-Angled.svg rename to media/buildings/Doors/French Door-Angled.svg diff --git a/media/objects/Doors/French Door-Front.svg b/media/buildings/Doors/French Door-Front.svg similarity index 100% rename from media/objects/Doors/French Door-Front.svg rename to media/buildings/Doors/French Door-Front.svg diff --git a/media/objects/Doors/French Door-Side.svg b/media/buildings/Doors/French Door-Side.svg similarity index 100% rename from media/objects/Doors/French Door-Side.svg rename to media/buildings/Doors/French Door-Side.svg diff --git a/media/objects/Doors/French Door-Top.svg b/media/buildings/Doors/French Door-Top.svg similarity index 100% rename from media/objects/Doors/French Door-Top.svg rename to media/buildings/Doors/French Door-Top.svg diff --git a/media/objects/Doors/Interior Door-Angled.svg b/media/buildings/Doors/Interior Door-Angled.svg similarity index 100% rename from media/objects/Doors/Interior Door-Angled.svg rename to media/buildings/Doors/Interior Door-Angled.svg diff --git a/media/objects/Doors/Interior Door-Front.svg b/media/buildings/Doors/Interior Door-Front.svg similarity index 100% rename from media/objects/Doors/Interior Door-Front.svg rename to media/buildings/Doors/Interior Door-Front.svg diff --git a/media/objects/Doors/Interior Door-Side.svg b/media/buildings/Doors/Interior Door-Side.svg similarity index 100% rename from media/objects/Doors/Interior Door-Side.svg rename to media/buildings/Doors/Interior Door-Side.svg diff --git a/media/objects/Doors/Interior Door-Top.svg b/media/buildings/Doors/Interior Door-Top.svg similarity index 100% rename from media/objects/Doors/Interior Door-Top.svg rename to media/buildings/Doors/Interior Door-Top.svg diff --git a/presets/buildings.js b/presets/buildings.js index 592c5b18..b4ecfb3e 100644 --- a/presets/buildings.js +++ b/presets/buildings.js @@ -344,6 +344,7 @@ function makeBuildings() { /* ***Utility Poles*** */ results.push(makeModel({"name": "Utility Poles", "kind": "buildings", "forms": [{"name": "Utility Pole", "views": [{"name": "Front", "height": 10.825987815856934, "extra": 1.0017812424969987, "bottom": 0.001774919373365673}, {"name": "Angled", "height": 10.825987815856934, "extra": 1.0016084333733493, "bottom": 0.0016032758485862602}, {"name": "Side", "height": 10.825987815856934, "extra": 1.0016086734693879, "bottom": 0.001603514407218507}, {"name": "Top", "height": 0.7558963298797607, "extra": 1.008390140625, "bottom": 0.00825167519445341}]}]})); /* ***Transmission Towers*** */ results.push(makeModel({"name": "Transmission Towers", "kind": "buildings", "forms": [{"name": "Lattice Tower", "views": [{"name": "Front", "height": 46.617923736572266, "extra": 1.0011498212012875, "bottom": 0.0011471830904092298}, {"name": "Angled", "height": 46.617923736572266, "extra": 1.0010523109243699, "bottom": 0.0010501008591581864}, {"name": "Side", "height": 46.617923736572266, "extra": 1.001149673061723, "bottom": 0.0011470356297943348}, {"name": "Top", "height": 8.258213996887207, "extra": 1.0025463078703705, "bottom": 0.0025334062060477845}]}, {"name": "Concrete Tower", "views": [{"name": "Front", "height": 24.613733291625977, "extra": 1.0011611044417765, "bottom": 0.0011584143616551604}, {"name": "Angled", "height": 24.613733291625977, "extra": 1.0011987954902433, "bottom": 0.0011959281437125874}, {"name": "Side", "height": 24.613733291625977, "extra": 1.0012004801920769, "bottom": 0.0011976047904191617}, {"name": "Top", "height": 2.0, "extra": 1.0047247101394032, "bottom": 0.004680482295089333}]}]})); /* ***Fences*** */ results.push(makeModel({"name": "Fences", "kind": "buildings", "forms": [{"name": "Picket", "views": [{"name": "Front", "height": 1.198826789855957, "extra": 1.0032463354037267, "bottom": 0.003225393982374819}, {"name": "Angled", "height": 1.198826789855957, "extra": 1.0030113600426571, "bottom": 0.0029933320416477963}, {"name": "Corner", "height": 1.198826789855957, "extra": 1.0043504818571962, "bottom": 0.004312954992306321}, {"name": "Side", "height": 1.198826789855957, "extra": 1.0012004801920769, "bottom": 0.0011976047904191617}, {"name": "Top", "height": 0.12314067780971527, "extra": 1.0294348106917595, "bottom": 0.027798333333333345}]}, {"name": "Wrought Iron", "views": [{"name": "Front", "height": 0.9687931537628174, "extra": 1.0031269052863436, "bottom": 0.003107471746679822}, {"name": "Angled", "height": 0.9687931537628174, "extra": 1.0039823942771011, "bottom": 0.003950925987021264}, {"name": "Corner", "height": 0.9687931537628174, "extra": 1.0022842993630574, "bottom": 0.002273910777177546}, {"name": "Side", "height": 0.9687931537628174, "extra": 1.0009630172676205, "bottom": 0.0009611660286552252}, {"name": "Top", "height": 0.07901737093925476, "extra": 1.0543478819116272, "bottom": 0.049019653258358886}]}]})); + /* ***Doors*** */ results.push(makeModel({"name": "Doors", "kind": "buildings", "forms": [{"name": "6 Panel Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Angled", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Side", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Top", "height": 0.03492499887943268, "mass": 11.793399810791016}]}, {"name": "French Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Angled", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Side", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Top", "height": 0.03492499887943268, "mass": 31.75149917602539}]}, {"name": "Fire Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Angled", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Side", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Top", "height": 0.10518216341733932, "mass": 54.54545593261719}]}]})); /* ***INSERT HERE*** */ results.sort((b1, b2) => { diff --git a/presets/objects.js b/presets/objects.js index 236edae4..1a33e580 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -896,7 +896,6 @@ function makeObjects() { /* ***Pipettes*** */ results.push(makeModel({"name": "Pipettes", "kind": "objects", "forms": [{"name": "Transfer Pipette", "views": [{"name": "Front", "height": 0.1491980254650116, "volume": 0.20819799602031708}, {"name": "Top", "height": 0.010719738900661469, "volume": 0.20819799602031708}, {"name": "Bottom", "height": 0.010719738900661469, "volume": 0.20819799602031708}]}]})); /* ***Straws*** */ results.push(makeModel({"name": "Straws", "kind": "objects", "forms": [{"name": "Normal", "views": [{"name": "Front", "height": 0.2159000039100647}, {"name": "Top", "height": 0.006095999851822853}]}, {"name": "Wide", "views": [{"name": "Front", "height": 0.2159000039100647}, {"name": "Top", "height": 0.008127997629344463}]}, {"name": "Smoothie", "views": [{"name": "Front", "height": 0.2159000039100647}, {"name": "Top", "height": 0.00914399977773428}]}, {"name": "Boba", "views": [{"name": "Front", "height": 0.2159000039100647}, {"name": "Top", "height": 0.012191999703645706}]}]})); /* ***Coins*** */ results.push(makeModel({"name": "Coins", "kind": "objects", "forms": [{"name": "U.S. Dollar", "views": [{"name": "Top", "height": 0.026492198929190636, "mass": 0.008100000210106373, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0020000000949949026, "mass": 0.008100000210106373, "extra": 1.0400310285689658, "bottom": 0.037063637505278635}]}, {"name": "U.S. Half Dollar", "views": [{"name": "Top", "height": 0.03060699999332428, "mass": 0.011339999735355377, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.00215000007301569, "mass": 0.011339999735355377, "extra": 1.0423728813559323, "bottom": 0.0390625}]}, {"name": "U.S. Quarter", "views": [{"name": "Top", "height": 0.024257000535726547, "mass": 0.005669999867677689, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0017500000540167093, "mass": 0.005669999867677689, "extra": 1.0429166666666667, "bottom": 0.03952417498081355}]}, {"name": "U.S. Dime", "views": [{"name": "Top", "height": 0.017906999215483665, "mass": 0.002268000040203333, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0013500000350177288, "mass": 0.002268000040203333, "extra": 1.0400310285689658, "bottom": 0.037063637505278635}]}, {"name": "U.S. Nickel", "views": [{"name": "Top", "height": 0.021208999678492546, "mass": 0.004999999888241291, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0019500000635161996, "mass": 0.004999999888241291, "extra": 1.0324675324675325, "bottom": 0.03048780487804878}]}, {"name": "U.S. Penny", "views": [{"name": "Top", "height": 0.019050000235438347, "mass": 0.0024999999441206455, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0015200000489130616, "mass": 0.0024999999441206455, "extra": 1.0390151515151516, "bottom": 0.0361911454673226}]}, {"name": "UK \u00a35", "views": [{"name": "Top", "height": 0.028400002047419548, "mass": 0.028279999271035194, "extra": 1.0030011776020675, "bottom": 0.0029832709501544947}, {"name": "Side", "height": 0.0028900043107569218, "mass": 0.028279999271035194, "extra": 1.0295230294117648, "bottom": 0.02787700229446234}]}, {"name": "UK \u00a32", "views": [{"name": "Top", "height": 0.028400002047419548, "mass": 0.012000000104308128, "extra": 1.0030011776020675, "bottom": 0.0029832709501544947}, {"name": "Side", "height": 0.0025000039022415876, "mass": 0.012000000104308128, "extra": 1.0352739726027398, "bottom": 0.032949456174024346}]}, {"name": "UK \u00a31", "views": [{"name": "Top", "height": 0.023430000990629196, "mass": 0.008750000037252903, "extra": 1.0030307842552622, "bottom": 0.0030125236368478067}, {"name": "Side", "height": 0.0028000001329928637, "mass": 0.008750000037252903, "extra": 1.025, "bottom": 0.023809523809523808}]}, {"name": "UK 50p", "views": [{"name": "Top", "height": 0.027300003916025162, "mass": 0.00800000037997961, "extra": 1.0030018608559939, "bottom": 0.0029839460741609334}, {"name": "Side", "height": 0.0017800000496208668, "mass": 0.00800000037997961, "extra": 1.0476851851851852, "bottom": 0.04353338968723577}]}, {"name": "UK 20p", "views": [{"name": "Top", "height": 0.021400000900030136, "mass": 0.004999999888241291, "extra": 1.0030018608559939, "bottom": 0.0029839460741609334}, {"name": "Side", "height": 0.0017000001389533281, "mass": 0.004999999888241291, "extra": 1.0390151515151516, "bottom": 0.0361911454673226}]}, {"name": "UK 10p", "views": [{"name": "Top", "height": 0.024500001221895218, "mass": 0.006500000134110451, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0018500001169741154, "mass": 0.006500000134110451, "extra": 1.0400310285689658, "bottom": 0.037063637505278635}]}, {"name": "UK 5p", "views": [{"name": "Top", "height": 0.018000001087784767, "mass": 0.0032500000670552254, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0017000001389533281, "mass": 0.0032500000670552254, "extra": 1.0316455696202531, "bottom": 0.02976190476190476}]}, {"name": "UK 2p", "views": [{"name": "Top", "height": 0.02590000070631504, "mass": 0.007120000198483467, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.00203000009059906, "mass": 0.007120000198483467, "extra": 1.0396153846153846, "bottom": 0.036707056307911656}]}, {"name": "UK 1p", "views": [{"name": "Top", "height": 0.0203000009059906, "mass": 0.0035600000992417336, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0016500001074746251, "mass": 0.0035600000992417336, "extra": 1.036764705882353, "bottom": 0.03424657534246575}]}, {"name": "Canadian Two Dollar", "views": [{"name": "Top", "height": 0.02800000086426735, "mass": 0.007300000172108412, "extra": 1.0030011776020675, "bottom": 0.0029832709501544947}, {"name": "Side", "height": 0.0018000000854954123, "mass": 0.007300000172108412, "extra": 1.0462962962962963, "bottom": 0.0423728813559322}]}, {"name": "Canadian Dollar", "views": [{"name": "Top", "height": 0.026500001549720764, "mass": 0.0062699997797608376, "extra": 1.0030313886069266, "bottom": 0.003013120727238904}, {"name": "Side", "height": 0.0019500007620081306, "mass": 0.0062699997797608376, "extra": 1.0422131147540985, "bottom": 0.03892668178382468}]}, {"name": "2 Euro", "views": [{"name": "Top", "height": 0.02575000189244747, "mass": 0.008500000461935997, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0022000002209097147, "mass": 0.008500000461935997, "extra": 1.036267605633803, "bottom": 0.033814839133289594}]}, {"name": "1 Euro", "views": [{"name": "Top", "height": 0.023250000551342964, "mass": 0.007499999832361937, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0023300000466406345, "mass": 0.007499999832361937, "extra": 1.0297619047619047, "bottom": 0.028089887640449437}]}, {"name": "500 Yen", "views": [{"name": "Top", "height": 0.026500001549720764, "mass": 0.0071000000461936, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0018100000452250242, "mass": 0.0071000000461936, "extra": 1.0442448684210526, "bottom": 0.04064794267092912}]}, {"name": "50 Yen", "views": [{"name": "Top", "height": 0.021000003442168236, "mass": 0.004000000189989805, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0015100002055987716, "mass": 0.004000000189989805, "extra": 1.0418242916666667, "bottom": 0.038595807081677744}]}, {"name": "5 Yen", "views": [{"name": "Top", "height": 0.02200000174343586, "mass": 0.0037499999161809683, "extra": 1.0030240564934132, "bottom": 0.003005876612039225}, {"name": "Side", "height": 0.0015100002055987716, "mass": 0.0037499999161809683, "extra": 1.045175438596491, "bottom": 0.041432019308125435}]}]})); - /* ***Doors*** */ results.push(makeModel({"name": "Doors", "kind": "objects", "forms": [{"name": "6 Panel Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Angled", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Side", "height": 2.0320000648498535, "mass": 11.793399810791016}, {"name": "Top", "height": 0.03492499887943268, "mass": 11.793399810791016}]}, {"name": "French Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Angled", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Side", "height": 2.0320000648498535, "mass": 31.75149917602539}, {"name": "Top", "height": 0.03492499887943268, "mass": 31.75149917602539}]}, {"name": "Fire Door", "views": [{"name": "Front", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Angled", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Side", "height": 2.0320000648498535, "mass": 54.54545593261719}, {"name": "Top", "height": 0.10518216341733932, "mass": 54.54545593261719}]}]})); /* ***Cards*** */ results.push(makeModel({"name": "Cards", "kind": "objects", "forms": [{"name": "Credit Card", "views": [{"name": "Front", "height": 0.053975000977516174, "mass": 11.793399810791016, "extra": 1.0047993079868203, "bottom": 0.00475367924528303}, {"name": "Back", "height": 0.053975000977516174, "mass": 11.793399810791016, "extra": 1.0047993079868203, "bottom": 0.00475367924528303}, {"name": "Edge", "height": 0.0015578659949824214, "mass": 11.793399810791016, "extra": 1.1704167, "bottom": 0.127097594675073}]}]})); /* ***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}]}]}));