From 68ccb09f8f65eda14ab580ab6b2b5b7fbec3e7e0 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Sat, 23 May 2020 16:48:34 -0400
Subject: [PATCH] Remove old scenes; fix display of all filtered entities

---
 macrovision.js    | 13 +++++++++----
 presets/scenes.js | 34 ----------------------------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/macrovision.js b/macrovision.js
index 83589bf1..554c97e4 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -1031,11 +1031,14 @@ function testClick(event) {
 }
 
 function arrangeEntities(order) {
-    let x = 0.1;
-
+    fitWorld();
+    const worldWidth = config.height.toNumber("meters") / canvasHeight * canvasWidth;
+    let x = -worldWidth * 0.45 + config.x;
+    console.log(x);
     order.forEach(key => {
         document.querySelector("#entity-" + key).dataset.x = x;
-        x += 0.8 / (order.length - 1);
+        document.querySelector("#entity-" + key).dataset.y = config.y;
+        x += worldWidth * 0.9 / (order.length - 1);
     });
 
     updateSizes();
@@ -2622,11 +2625,13 @@ function prepareEntities() {
                 }
             }
 
+            const worldWidth = config.height.toNumber("meters") / canvasHeight * canvasWidth;
+
             makers.map(element => {
                 const category = document.querySelector("#category-picker").value;
                 const maker = availableEntities[category][element.value];
                 const entity = maker.constructor()
-                displayEntity(entity, entity.view, 0.1 + 0.8 * index / (count - 1), 1);
+                displayEntity(entity, entity.view, -worldWidth * 0.45 + config.x + worldWidth * 0.9 * index / (count - 1), config.y);
                 index += 1;
             });
             updateSizes(true);
diff --git a/presets/scenes.js b/presets/scenes.js
index 6df04156..88e9bca4 100644
--- a/presets/scenes.js
+++ b/presets/scenes.js
@@ -116,7 +116,6 @@ function makeOwnerScene(owners) {
         });
 
         arrangeEntities(getSortedEntities());
-        fitWorld(true);
     }
 }
 
@@ -149,37 +148,4 @@ function makeOwnerSceneViews(owners) {
         arrangeEntities(getSortedEntities());
         fitWorld(true);
     }
-}
-
-scenes["Kurri"] = makeOwnerScene(["kurrikage"]);
-
-scenes["Neopuc"] = () => {
-    availableEntities["characters"].filter(x => {
-        const entity = x.constructor();
-        const owners = ownersOf(entity.views[entity.view].image.source);
-        if (owners)
-            return owners.indexOf("neopuc") != -1;
-        else
-            return false;
-    }).map(maker => {
-        return maker.constructor();
-    }).sort((e1, e2) => {
-        return e1.sizes[e1.sizes.length - 1].height.toNumber() - e2.sizes[e2.sizes.length - 1].height.toNumber()
-    }).reduce((size, entity) => {
-        entity.views[entity.view].height = math.unit(100 * Math.sqrt(size) * (entity.name == "Ilisha Devya" ? 2 : 1), "meters");
-        displayEntity(entity, entity.view, 0, 1);
-        return size + 1;
-    }, 1)
-
-    arrangeEntities(getSortedEntities());
-    fitWorld(true);
-}
-
-scenes["Fidverse"] = () => {
-    makeOwnerSceneViews(["fidchell", "cam"])();
-    document.querySelector("#entity-" + (entityIndex - 1)).dataset.x = 0.5;
-    document.querySelector("#entity-" + (entityIndex - 2)).dataset.x = 0.25;
-    document.querySelector("#entity-" + (entityIndex - 3)).dataset.x = 0.75;
-    updateSizes();
-    fitWorld(true, 1);
 }
\ No newline at end of file