From a5282e7d1548170b2e690adaed73273131f26e83 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Fri, 14 Feb 2020 16:23:23 -0500 Subject: [PATCH] Fix Fen's back view; add full view; start work on pre-set scenes --- macrovision.html | 1 + media/LICENSES.md | 6 ++ media/characters/fen/full.svg | 172 ++++++++++++++++++++++++++++++++++ presets/characters.js | 14 ++- presets/presets.js | 0 presets/scenes.js | 28 ++++++ 6 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 media/characters/fen/full.svg delete mode 100644 presets/presets.js create mode 100644 presets/scenes.js diff --git a/macrovision.html b/macrovision.html index f26e8961..294e8c65 100644 --- a/macrovision.html +++ b/macrovision.html @@ -13,6 +13,7 @@ + diff --git a/media/LICENSES.md b/media/LICENSES.md index ff4789e8..1522b823 100644 --- a/media/LICENSES.md +++ b/media/LICENSES.md @@ -45,6 +45,12 @@ https://www.furaffinity.net/view/13680521/ * back.svg +**http://furaffinity.net/user/meep** + +https://www.furaffinity.net/view/34622252/ + +* full.svg + ## Sofia **https://www.furaffinity.net/user/fauxlacine** diff --git a/media/characters/fen/full.svg b/media/characters/fen/full.svg new file mode 100644 index 00000000..cfd0f82b --- /dev/null +++ b/media/characters/fen/full.svg @@ -0,0 +1,172 @@ + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 372a3621..b7ab548a 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -53,12 +53,20 @@ characterMakers["Fen"] = () => { "Fen", "chemicalcrux", { - body: { + back: { height: math.unit(2.2428, "meter"), weight: math.unit(124.738, "kg"), - name: "Body", + name: "Back", + image: { + source: "./media/characters/fen/back.svg" + } + }, + full: { + height: math.unit(1.34, "meter"), + weight: math.unit(225, "kg"), + name: "Full", image: { - source: "./media/characters/236.svg" + source: "./media/characters/fen/full.svg" } } }, diff --git a/presets/presets.js b/presets/presets.js deleted file mode 100644 index e69de29b..00000000 diff --git a/presets/scenes.js b/presets/scenes.js new file mode 100644 index 00000000..e96ad761 --- /dev/null +++ b/presets/scenes.js @@ -0,0 +1,28 @@ +const scenes = {}; + +scenes["military"] = () => { + removeAllEntities(); + + let entity = availableEntitiesByName["Asana (Mech)"].constructor(); + displayEntity(entity, entity.defaultView, 0, 1); + + entity = availableEntitiesByName["Napalm"].constructor(); + displayEntity(entity, entity.defaultView, 0, 1); + + entity = availableEntitiesByName["Leopard 2 Rev. 1"].constructor(); + displayEntity(entity, entity.defaultView, 0, 1); + + + const order = Object.keys(entities).sort((a, b) => { + const entA = entities[a]; + const entB = entities[b]; + const viewA = document.querySelector("#entity-" + a).dataset.view; + const viewB = document.querySelector("#entity-" + b).dataset.view; + const heightA = entA.views[viewA].height.to("meter").value; + const heightB = entB.views[viewB].height.to("meter").value; + return heightA - heightB; + }); + + arrangeEntities(order); + fitWorld(); +} \ No newline at end of file