Skip to content

Commit c1c9dd3

Browse files
committed
tweaks
1 parent 4b67cb2 commit c1c9dd3

5 files changed

Lines changed: 57 additions & 13 deletions

File tree

3d-showcase.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<link rel="icon" type="image/x-icon" href="favicon.ico">
1212
<link rel="stylesheet" href="css/common.css">
1313

14-
<script src="lib/aframe/aframe-master.min.js" crossorigin="anonymous"></script>
15-
1614
<script src="lib/custom-elements.js"></script> <!-- Safari polyfill -->
15+
<script src="lib/aframe/aframe-master.min.js"></script>
1716
</head>
1817
<body>
1918
<main style="height: 100dvh; width: 100%; position: fixed; top: 0; left: 0; right: 0; bottom: 0; z-index: 12;">
@@ -243,7 +242,7 @@
243242
</div>
244243
</aside>
245244

246-
<script src="https://html2canvas.hertzen.com/dist/html2canvas.min.js" crossorigin="anonymous"></script>
245+
<script src="lib/html2canvas.min.js" crossorigin="anonymous"></script>
247246
<script type="module" src="controllers/3d-showcase.js"></script>
248247
</body>
249248
</html>

copy-deps.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ function copyDependency (source, destination) {
2828
console.log(`Copied ${source} -> lib/${destination}`)
2929
}
3030

31+
// library to turn html doc into an image/canvas
32+
copyDependency('./node_modules/html2canvas/dist/html2canvas.min.js', 'html2canvas.min.js')
33+
3134
// custom element polyfill for safari
3235
copyDependency('./node_modules/@ungap/custom-elements/es.js', 'custom-elements.js')
3336

css/common.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,31 @@
1010
@font-face {
1111
font-family: 'Noto Emoji';
1212
font-style: normal;
13-
font-display: swap;
1413
font-weight: 400;
15-
src: url("https://cdn.jsdelivr.net/fontsource/fonts/noto-emoji@latest/emoji-400-normal.woff2") format('woff2'), url("https://cdn.jsdelivr.net/fontsource/fonts/noto-emoji@latest/emoji-400-normal.woff") format('woff');
14+
src: url("../font/noto-emoji_5.2.11_emoji-400-normal.woff2") format('woff2');
1615
}
1716

1817
@font-face {
1918
font-family: Lexend;
2019
font-style: normal;
21-
font-display: swap;
2220
font-weight: 400;
23-
src: url("https://cdn.jsdelivr.net/fontsource/fonts/lexend@latest/latin-400-normal.woff2") format('woff2'), url("https://cdn.jsdelivr.net/fontsource/fonts/lexend@latest/latin-400-normal.woff") format('woff');
21+
src: url("../font/lexend_5.2.10_latin-400-normal.woff2") format('woff2');
2422
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
2523
}
2624

2725
@font-face {
2826
font-family: Marcellus;
2927
font-style: normal;
30-
font-display: swap;
3128
font-weight: 400;
32-
src: url("https://cdn.jsdelivr.net/fontsource/fonts/marcellus@latest/latin-400-normal.woff2") format('woff2'), url("https://cdn.jsdelivr.net/fontsource/fonts/marcellus@latest/latin-400-normal.woff") format('woff');
29+
src: url("../font/marcellus_5.2.6_latin-400-normal.woff2") format('woff2');
3330
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
3431
}
3532

3633
@font-face {
3734
font-family: Geologica;
3835
font-style: normal;
39-
font-display: swap;
4036
font-weight: 400;
41-
src: url("https://cdn.jsdelivr.net/fontsource/fonts/geologica@latest/latin-400-normal.woff2") format('woff2'), url("https://cdn.jsdelivr.net/fontsource/fonts/geologica@latest/latin-400-normal.woff") format('woff');
37+
src: url("../font/geologica_5.2.7_latin-400-normal.woff2") format('woff2');
4238
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
4339
}
4440

package-lock.json

Lines changed: 46 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"@google/model-viewer": "^4.1.0",
4242
"@ungap/custom-elements": "^1.3.0",
4343
"aframe": "^1.7.1",
44-
"gameinputjs": "^13.2.7"
44+
"gameinputjs": "^13.2.7",
45+
"html2canvas": "^1.4.1"
4546
},
4647
"version-constraints": {
4748
"eslint": "Cannot upgrade to v10 until neostandard adds support (currently supports ^9.0.0). Track: https://github.com/neostandard/neostandard/issues/350",

0 commit comments

Comments
 (0)