Kaynağa Gözat

Remove old scenes; fix display of all filtered entities

master
Fen Dweller 5 yıl önce
ebeveyn
işleme
68ccb09f8f
2 değiştirilmiş dosya ile 9 ekleme ve 38 silme
  1. +9
    -4
      macrovision.js
  2. +0
    -34
      presets/scenes.js

+ 9
- 4
macrovision.js Dosyayı Görüntüle

@@ -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);


+ 0
- 34
presets/scenes.js Dosyayı Görüntüle

@@ -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);
}

Yükleniyor…
İptal
Kaydet