diff --git a/media/attribution.js b/media/attribution.js index 2e9f43a1..46f52568 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -20453,6 +20453,13 @@ const attributionData = { "chemicalcrux" ] }, + { + prefix: "./media/objects/Rulers/", + all: null, + authors: [ + "chemicalcrux" + ] + }, { prefix: "./media/real-buildings/", all: "https://wiki.openstreetmap.org/wiki/Blender", diff --git a/media/objects/Rulers/Wooden Ruler-Edge.svg b/media/objects/Rulers/Wooden Ruler-Edge.svg new file mode 100644 index 00000000..ceab23f0 --- /dev/null +++ b/media/objects/Rulers/Wooden Ruler-Edge.svg @@ -0,0 +1,48 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + diff --git a/media/objects/Rulers/Wooden Ruler-End.svg b/media/objects/Rulers/Wooden Ruler-End.svg new file mode 100644 index 00000000..ce37e651 --- /dev/null +++ b/media/objects/Rulers/Wooden Ruler-End.svg @@ -0,0 +1,48 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + diff --git a/media/objects/Rulers/Wooden Ruler-Top.svg b/media/objects/Rulers/Wooden Ruler-Top.svg new file mode 100644 index 00000000..e6242c76 --- /dev/null +++ b/media/objects/Rulers/Wooden Ruler-Top.svg @@ -0,0 +1,66 @@ + + + + +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 dae595f8..fea90165 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -909,6 +909,7 @@ function makeObjects() { /* ***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}]}]})); + /* ***Rulers*** */ results.push(makeModel({"name": "Rulers", "kind": "objects", "forms": [{"name": "Wooden Ruler", "views": [{"name": "Top", "height": 0.30797499418258667, "mass": 1.5666666513425298e-05, "extra": 1.0012004801920769, "bottom": 0.0011976047904191617}, {"name": "Edge", "height": 0.003634304739534855, "mass": 1.5666666513425298e-05, "extra": 1.0459056530118458, "bottom": 0.04204540909090908}, {"name": "End", "height": 0.003634304739534855, "mass": 1.5666666513425298e-05, "extra": 1.0054553851294097, "bottom": 0.005396505102040825}]}]})); /* ***INSERT HERE*** */ return results; }