chemicalcrux
/
macrovision
1
0
Fork 0
Koodi Ongelmat 5 Pull-pyynnöt 0 Julkaisut 10 Wiki Activity
Selaa lähdekoodia

Add some buildings. Increase default view size

tags/v0.0.2
Fen Dweller 6 vuotta sitten
vanhempi
6535cef446
commit
3e1c704328
12 muutettua tiedostoa jossa 170 lisäystä ja 14 poistoa
Yhdistetty näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      macrovision.html
  2. +1
    -3
      macrovision.js
  3. +25
    -0
      media/LICENSES.md
  4. +13
    -0
      media/buildings/burj-khalifa.svg
  5. +12
    -0
      media/buildings/canton-tower.svg
  6. +10
    -0
      media/buildings/chrysler-building.svg
  7. +13
    -0
      media/buildings/cn-tower.svg
  8. +19
    -7
      media/buildings/eiffel-tower.svg
  9. +16
    -0
      media/buildings/empire-state-building.svg
  10. +19
    -0
      media/buildings/taipei-101.svg
  11. +38
    -2
      presets/buildings.js
  12. +3
    -1
      presets/characters.js

+ 1
- 1
macrovision.html Näytä tiedosto

@@ -18,7 +18,7 @@
<link rel="icon" href="https://crux.sexy/images/macrovision.ico"> <link rel="icon" href="https://crux.sexy/images/macrovision.ico">
</head> </head>


<body>
<body class="toggle-bottom-name toggle-entity-name">
<div id="menubar"> <div id="menubar">
</div> </div>
<div id="main-area"> <div id="main-area">


+ 1
- 3
macrovision.js Näytä tiedosto

@@ -27,7 +27,7 @@ const unitChoices = {
] ]
} }
const config = { const config = {
height: math.unit(10, "meters"),
height: math.unit(1500, "meters"),
minLineSize: 50, minLineSize: 50,
maxLineSize: 250 maxLineSize: 250
} }
@@ -418,7 +418,6 @@ function updateViewOptions(entity, view, changed) {
const select = document.querySelector("#options-view-" + key + "-select"); const select = document.querySelector("#options-view-" + key + "-select");
const currentUnit = select.value; const currentUnit = select.value;
const convertedAmount = entity.views[view][key].to(currentUnit); const convertedAmount = entity.views[view][key].to(currentUnit);
console.log(convertedAmount);
input.value = math.round(convertedAmount.value, 5); input.value = math.round(convertedAmount.value, 5);
} }
@@ -528,7 +527,6 @@ document.addEventListener("DOMContentLoaded", () => {
}) })


window.addEventListener("wheel", e => { window.addEventListener("wheel", e => {
console.log(e);


const dir = e.deltaY < 0 ? 0.9 : 1.1; const dir = e.deltaY < 0 ? 0.9 : 1.1;




+ 25
- 0
media/LICENSES.md Näytä tiedosto

@@ -0,0 +1,25 @@
These silhouettes come from a variety of sources. This file documents their origins and licenses.

# Buildings

**Kryostat, Донор [CC BY-SA (https://creativecommons.org/licenses/by-sa/3.0)]**

https://commons.wikimedia.org/wiki/File:TallestBuildings.svg

* burj-khalifa.svg
* canton-tower.svg
* cn-tower.svg
* taipei-101.svg
* empire-state-building.svg
* eiffel-tower.svg
* chrysler-building.svg

# Characters

## Fen

**http://furaffinity.net/user/deerpuff**

https://www.furaffinity.net/view/13680521/

* back.svg

+ 13
- 0
media/buildings/burj-khalifa.svg Näytä tiedosto

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 161.66 828" style="enable-background:new 0 0 161.66 828;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;stroke:#000000;stroke-width:2.1912;stroke-linecap:round;}
</style>
<path id="path3164" class="st0" d="M80.46,1.1v70.82l-3.63,2.86v60.64l-2.67,3.18l-0.64,58.35l-4.77,5.4v57.43l-2.21,4.45
L65.9,429.48l-8.93,2.19l-0.64,119.04l-8.27,2.98v110.8L43,665.51l-0.64,77.69l-6.97,1.13v45.74h-7.67v10.13h-6.37v7.6H1.1v19.1
h159.47v-19.1h-15.88v-7.6h-10.2v-8.9l-6.65-0.32l-0.95-68.29l-6.97-0.75l0.95-91.68l-7.32-1.71l-0.64-112.99l-6.41-1.71
l-1.25-127.92l-5.07-6.99c0-98.4,0-59.93,0-93.39l-5.73-9.21l-0.64-0.3h1.03v-35.95l-3.88-3.49l-0.64-34.23h-0.89V159.2l-3.57-6.35
l-0.95,2.79h0.96V97.23l-3.31-2.86l-0.32-19.6V1.1L80.46,1.1L80.46,1.1z"/>
</svg>

+ 12
- 0
media/buildings/canton-tower.svg Näytä tiedosto

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 102.28 610" style="enable-background:new 0 0 102.28 610;" xml:space="preserve">
<style type="text/css">
.st0{stroke:#000000;stroke-width:0.8962;stroke-linecap:square;}
</style>
<path id="path3732" class="st0" d="M44.1,0.45l1.09,1.51c0,0,3.11,139.43,3.16,139.56c12.62,0.35,20.93,6.72,24.37,18.3
c0,0-14.86,104.12-6.51,194.57c8.01,86.71,35.54,255.15,35.54,255.15H0.57c0,0,26.24-107.83,33.53-286.45
c-1.42-90.31-14.58-161.78-14.58-161.78c2.25-10.48,8.81-15.8,19.43-19.01C39,142.19,41.11,1.96,41.11,1.96l1.09-1.51L44.1,0.45
L44.1,0.45z"/>
</svg>

+ 10
- 0
media/buildings/chrysler-building.svg Näytä tiedosto

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 67.87 318.72" style="enable-background:new 0 0 67.87 318.72;" xml:space="preserve">
<style type="text/css">
.st0{stroke:#000000;stroke-width:0.5822;stroke-linecap:square;}
</style>
<path id="path3766" class="st0" d="M33.59,28.88L22.02,91.1v21.51l-6.14,3.45V225.3h-3.14v11.68H7.5v23.26h-7.2v58.18h67.29v-58.18
h-7.2v-23.26h-5.25V225.3h-3.14V116.06l-6.14-3.45V91.1L34.29,28.88L33.84,0L33.59,28.88z"/>
</svg>

+ 13
- 0
media/buildings/cn-tower.svg Näytä tiedosto

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 70.5 553" style="enable-background:new 0 0 70.5 553;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;stroke:#000000;stroke-width:2.1244;}
</style>
<path id="path3940" class="st0" d="M33.66,1.06l-0.4,55.3l-2.19,0.86l-0.46,44.01c-4.01,3.19-9.97,6.37-1.73,9.56v62.74L27.55,174
v11.75l-8.7,0.46v7.83c-20.81,14.33-7.54,23.91-4.32,25.69c-6.83,3.63-5.68,7.26-0.93,10.89l10.95,0.4
c-3.04,101.21-5.62,202.44-19.32,303.65H1.06v9.23h3.45v8.03h60.54v-8.03h4.38v-9.23h-5.11c-13.7-101.21-16.28-202.44-19.32-303.65
l10.89-0.4c4.75-3.63,5.96-7.26-0.86-10.89c3.22-1.78,16.43-11.36-4.38-25.69v-7.83l-8.7-0.46V174l-1.33-0.46V110.8
c8.24-3.19,2.28-6.37-1.73-9.56l-0.46-44.01l-2.12-0.86l-0.46-55.3h-0.86h-0.46L33.66,1.06L33.66,1.06z"/>
</svg>

+ 19
- 7
media/buildings/eiffel-tower.svg
File diff suppressed because it is too large
Näytä tiedosto


+ 16
- 0
media/buildings/empire-state-building.svg Näytä tiedosto

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 120.76 449" style="enable-background:new 0 0 120.76 449;" xml:space="preserve">
<path id="path4385" d="M58.47,0v67.87c0,0-0.06,0-0.75,0c-0.69,0-1.74,0.91-1.74,1.75c0,0.84,0,23.49,0,24.44
c0,0.95-1.05,0.76-1.05,1.77c0,1.02,0,21.31,0,22.06c0,0.75-0.83,0.92-0.83,1.69c0,0.88,0,7.96,0,7.96l-6.09,16.5c0,0-2.54,0-3.38,0
s-1.74,0.87-1.74,1.69c0,0.82,0,4.26,0,4.26s-1.68,0-2.55,0c-0.87,0-1.74,0.85-1.74,1.69s0,23.7,0,23.7s-1.66,0-2.52,0
c-0.86,0-1.74,0.81-1.74,1.69c0,0.89,0,27.54,0,28.75c0,1.21-2.57,1.75-2.57,2.57c0,0.81,0,137.96,0,137.96s-3.39,0-4.27,0
s-1.74,0.84-1.74,1.69c0,0.85,0,30.47,0,30.47s-8.53,0-9.42,0c-0.88,0-1.74,0.85-1.74,1.72c0,0.87,0,45.68,0,45.68s-12.01,0-12.88,0
c-0.86,0-1.72,0.84-1.72,1.69c0,0.85,0,20.84,0,20.84L60.11,449h0.54l60.11-0.56c0,0,0-19.99,0-20.84c0-0.86-0.85-1.69-1.72-1.69
c-0.86,0-12.87,0-12.87,0s0-44.81,0-45.68c0-0.87-0.86-1.72-1.74-1.72c-0.88,0-9.42,0-9.42,0s0-29.61,0-30.47
c0-0.86-0.87-1.69-1.74-1.69c-0.88,0-4.27,0-4.27,0s0-137.14,0-137.96c0-0.81-2.6-1.35-2.6-2.57c0-1.22,0-27.86,0-28.75
c0-0.89-0.85-1.69-1.72-1.69c-0.86,0-2.52,0-2.52,0s0-22.85,0-23.7S81.28,150,80.41,150c-0.87,0-2.58,0-2.58,0s0-3.43,0-4.26
c0-0.82-0.88-1.69-1.72-1.69c-0.84,0-3.41,0-3.41,0l-6.09-16.5c0,0,0-7,0-7.96c0-0.78-0.81-0.95-0.81-1.69c0-0.75,0-21.04,0-22.06
c0-1.02-1.05-0.83-1.05-1.77c0-0.95,0-23.6,0-24.44s-1.05-1.75-1.74-1.75s-0.75,0-0.75,0V0h-1.64h-0.54H58.47L58.47,0z"/>
</svg>

+ 19
- 0
media/buildings/taipei-101.svg Näytä tiedosto

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 89.57 509" style="enable-background:new 0 0 89.57 509;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;stroke:#000000;stroke-width:2.1474;}
</style>
<path id="path3959" class="st0" d="M43,1.07v40.46h-1.68H37.9l-0.34,17.38h-8.39l-0.34,3.15l2.82,0.6L32,71.07
c-0.51,5.38,1.12,6.41,2.15,8.72l-0.27,11.54l-7.18,19.59l8.39,0.67H16.1v4.5l-1.68-0.07v0.2L6.5,116.5l0.87,2.62h2.15l3.09,20.27
l1.88,0.27l0.07,12.21l-8.05,0.27l0.87,2.62h2.15l3.09,20.27l2.01,0.27v8.72l-8.12,0.27l0.87,2.62h2.15l3.09,20.27l2.15,0.27v10.47
l-8.25,0.27l0.87,2.68h2.15l3.09,20.27l2.21,0.27l0.07,8.19L6.5,249.9l0.87,2.62h2.15l3.09,20.27l2.35,0.34v9.93l-8.46,0.27
l0.87,2.68h2.15l3.09,20.27l2.42,0.34l0.07,8.99l-8.59,0.34l0.87,2.62h2.15l3.09,20.27l2.55,0.34l0.07,11.68l-8.72,0.34l0.87,2.62
h2.15l3.09,20.27l2.68,0.34v4.97L1.2,507.93H32h25.57h30.8L74.28,379.35v-4.97l2.68-0.34l3.09-20.27h2.15l0.87-2.62l-8.72-0.34
l0.07-11.68l2.55-0.34l3.09-20.27h2.15l0.87-2.62l-8.59-0.34l0.07-8.99l2.42-0.34l3.09-20.27h2.15l0.87-2.68l-8.46-0.27v-9.93
l2.35-0.34l3.09-20.27h2.15l0.87-2.62l-8.39-0.34l0.07-8.19l2.21-0.27l3.09-20.27h2.15l0.87-2.68l-8.25-0.27v-10.47l2.15-0.27
l3.09-20.27h2.15l0.87-2.62l-8.12-0.27v-8.72l2.01-0.27l3.09-20.27h2.15l0.87-2.62l-8.05-0.27l0.07-12.21l1.88-0.27l3.09-20.27h2.15
l0.87-2.62l-7.92-0.27v-0.2l-1.68,0.07v-4.5H54.48l8.39-0.67l-7.18-19.59l-0.27-11.54c1.02-2.31,2.66-3.34,2.15-8.72l0.34-8.39
l2.82-0.6l-0.34-3.15H52l-0.34-17.38h-3.42h-2.15V1.07L43,1.07L43,1.07z"/>
</svg>

+ 38
- 2
presets/buildings.js Näytä tiedosto

@@ -10,21 +10,57 @@ function makeBuilding(name, height, image) {
} }
}, },
image: image, image: image,
name: name
name: "building"
}, },
}; };


return makeEntity("Eiffel Tower", "Building", views);
return makeEntity(name, "Building", views);
} }


function makeBuildings() { function makeBuildings() {
const results = []; const results = [];
results.push(makeBuilding(
"Burj Khalifa",
math.unit(829.8, "meter"),
{source: "./media/buildings/burj-khalifa.svg"}
));
results.push(makeBuilding(
"Canton Tower",
math.unit(604, "meter"),
{source: "./media/buildings/canton-tower.svg"}
));
results.push(makeBuilding(
"CN Tower",
math.unit(553.3, "meter"),
{source: "./media/buildings/cn-tower.svg"}
));
results.push(makeBuilding(
"Taipei 101",
math.unit(509.2, "meter"),
{source: "./media/buildings/taipei-101.svg"}
));
results.push(makeBuilding(
"Empire State Building",
math.unit(443.2, "meter"),
{source: "./media/buildings/empire-state-building.svg"}
));
results.push(makeBuilding( results.push(makeBuilding(
"Eiffel Tower", "Eiffel Tower",
math.unit(324, "meter"), math.unit(324, "meter"),
{source: "./media/buildings/eiffel-tower.svg"} {source: "./media/buildings/eiffel-tower.svg"}
)); ));
results.push(makeBuilding(
"Chrysler Building",
math.unit(318.9, "meter"),
{source: "./media/buildings/chrysler-building.svg"}
));


return results; return results;
} }

+ 3
- 1
presets/characters.js Näytä tiedosto

@@ -52,7 +52,9 @@ function makeFen() {
} }
}; };


return makeEntity("Fen", "Fen", views);
const entity = makeEntity("Fen", "Fen", views);
entity.views.body.height = math.unit(1, "km");
return entity;
} }
function makeMan() { function makeMan() {
const views = { const views = {


Write Preview
Loading…
Peruuta
Tallenna