Skip to content

Commit e9f4c86

Browse files
committed
add secret page
1 parent 610ca0f commit e9f4c86

8 files changed

Lines changed: 55 additions & 1 deletion

File tree

3d-showcase.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@
104104
<div id="content-load-hider" style="position: fixed; top: 0; bottom: 0;left: 0;right: 0; z-index: 11; background-color: black;"></div>
105105

106106
<nav-header>
107-
<span slot="about-info">Desktop Controls: WASD & Mouse</span>
107+
<span slot="about-info">
108+
<p>An interactive museum of 3d models that Sam has created in both CAD software and Blender.</p>
109+
<p>Desktop Controls: WASD & Mouse</p>
110+
</span>
108111
</nav-header>
109112

110113
<script type="module" src="controllers/3d-showcase.js"></script>

build.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ distribute('lib')
3737
distribute('nav-header')
3838
distribute('page-fade')
3939
distribute('project-display')
40+
distribute('trek')
4041
distribute('3d-showcase.html')
4142
distribute('home-ala-homestar.html')
4243
distribute('home-console.html')

trek/Assets License.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
These are not free-ly distributed nor under the CC0 license the rest of assets are.

trek/index.html

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Anime UI</title>
6+
<meta name="description" content="Star Trek Misfits">
7+
<script src="../../lib/aframe/aframe-master.min.js"></script>
8+
<script src="https://unpkg.com/aframe-event-set-component@5.x.x/dist/aframe-event-set-component.min.js"></script>
9+
</head>
10+
<body>
11+
<a-scene renderer="colorManagement: true;" xr-mode-ui="XRMode: xr" inspector="" keyboard-shortcuts="" screenshot="" device-orientation-permission-ui="">
12+
<a-assets>
13+
<a-asset-item id="ship" src="ship.glb"></a-asset-item>
14+
<a-asset-item id="station" src="station.glb"></a-asset-item>
15+
<a-asset-item id="shuttle" src="shuttle.glb"></a-asset-item>
16+
<a-asset-item id="runabout" src="runabout.glb"></a-asset-item>
17+
18+
<img id="sky" src="../img/photosphere/galaxy-sky.jpg" alt="sky">
19+
</a-assets>
20+
21+
<a-entity position="4 0 4" rotation="0 0 0">
22+
<a-camera position="0 0 0" near="0.1" camera="" rotation="" look-controls="" wasd-controls=""></a-camera>
23+
</a-entity>
24+
25+
<a-entity position="6 -1 -40" scale="1 1 1" rotation="15 35 0">
26+
<a-entity gltf-model="#station" animation="property: rotation; from: 0 0 0; to: 0 360 0; loop: true; elasticity:1000; dur: 500000; easing: linear;"></a-entity>
27+
</a-entity>
28+
29+
<a-entity position="5 0 0" scale="0.03 0.03 0.03" rotation="0 0 0">
30+
<a-entity gltf-model="#shuttle" animation="property: rotation; from: 0 0 -45; to: 0 0 15; loop: true; dir: alternate; easing: linear; dur: 25000"></a-entity>
31+
</a-entity>
32+
33+
<a-entity position="2.5 0 -1" scale="0.4 0.4 0.4" rotation="0 180 0">
34+
<a-entity gltf-model="#runabout" animation="property: rotation; from: 0 0 -45; to: 0 0 15; loop: true; dir: alternate; easing: linear; dur: 25000"></a-entity>
35+
</a-entity>
36+
37+
38+
<a-entity position="4 0 -2" scale="1 1 1" rotation="0 0 0">
39+
<a-entity gltf-model="#ship" animation="property: rotation; from: 0 0 -5; to: 0 0 5; loop: true; dir: alternate; easing: linear; dur: 25000"></a-entity>
40+
</a-entity>
41+
42+
<a-entity light="type: directional; color: #ccc; intensity: 0.4" position="0 1 4" rotation="45 0 0"></a-entity>
43+
<a-entity light="type: directional; color: #ccc; intensity: 0.4" position="0 1 -4" rotation="-45 0 0"></a-entity>
44+
<a-entity light="type: ambient; color: #ccf; intensity: 1"></a-entity>
45+
46+
<a-sky src="#sky" color="#888" material="" geometry="" scale=""></a-sky>
47+
</a-scene>
48+
</body>
49+
</html>

trek/runabout.glb

2.17 MB
Binary file not shown.

trek/ship.glb

7.36 MB
Binary file not shown.

trek/shuttle.glb

15.7 MB
Binary file not shown.

trek/station.glb

1.98 MB
Binary file not shown.

0 commit comments

Comments
 (0)