Skip to content

Commit c68275f

Browse files
authored
Merge pull request #113 from lunarcloud/development
2025 Developments
2 parents 13d3ed4 + 625b7d4 commit c68275f

19 files changed

+171
-24
lines changed

3d-showcase.html

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,61 @@
3838
<a-asset-item id="kmc-vr-large-bottle" src="gltf/kmc-vr-large-bottle.glb"></a-asset-item>
3939
<a-asset-item id="shipwreck" src="gltf/shipwreck.glb"></a-asset-item>
4040

41+
<a-asset-item id="trek-hugo-class-ship" src="gltf/trek/sta-sarelle-expanse-hugo-class-ship.glb"></a-asset-item>
42+
<a-asset-item id="trek-starbase-364-narendra-station" src="gltf/trek/starbase-364-narendra-station.glb"></a-asset-item>
43+
<a-asset-item id="trek-cetacean" src="gltf/trek/starfleet-cetacean.glb"></a-asset-item>
44+
<a-asset-item id="trek-edosian" src="gltf/trek/starfleet-edosian.glb"></a-asset-item>
45+
<a-asset-item id="trek-exocomp" src="gltf/trek/starfleet-exocomp.glb"></a-asset-item>
46+
<a-asset-item id="trek-medusan" src="gltf/trek/starfleet-medusan-hover-suit.glb"></a-asset-item>
47+
<a-asset-item id="trek-phaser" src="gltf/trek/sta-sarelle-phaser.glb"></a-asset-item>
48+
4149
<img id="sky" src="img/photosphere/galaxy-sky.jpg" alt="sky">
4250
</a-assets>
4351

4452
<a-entity text="anchor: center; width: 1.5; color: black; value: Desktop Controls: WASD & Mouse"
4553
position="0 0. -2.8" rotation="-90 0 0"></a-entity>
4654

47-
<a-entity gltf-model="#meeple-airship" shadow position="-1 0.1 -5" scale="0.5 0.5 0.5" rotation="0 25 0">
55+
<a-entity gltf-model="#meeple-airship" shadow position="-0.75 0.1 -3.25" scale="0.1 0.1 0.1" rotation="0 25 0">
4856
<a-entity gltf-model="#meeple-robot" position="1.75 1.6 1" rotation="0 15 0"></a-entity>
4957
<a-entity gltf-model="#meeple-lady1" position="0 1.6 1.5" rotation="0 0 0"></a-entity>
5058
<a-entity gltf-model="#meeple-gent1" position="-1.75 1.6 1" rotation="0 -15 0"></a-entity>
5159
</a-entity>
5260

53-
<a-entity id="projects-entity" position="-3 1.6 -1.5" rotation="0 90 0" scale="8 4 1"></a-entity>
61+
<a-entity id="projects-entity" position="-3 1.6 -6" rotation="0 60 0" scale="8 4 1"></a-entity>
5462
<!--
5563
scale="5 2 1"></a-entity>
5664
-->
5765

58-
<a-entity gltf-model="#ataito-bucket" position="1.5 0.25 -3.5" scale="0.25 0.25 0.25" rotation="0 45 0"></a-entity>
59-
<a-entity gltf-model="#kmc-vr-large-bottle" position="0.5 0 -3.5" scale="3 3 3" rotation="0 45 0"></a-entity>
60-
<a-entity gltf-model="#shipwreck" shadow position="2.5 3 -5.5" scale="1 1 1" rotation="45 45 0"></a-entity>
66+
<a-entity position="0.5 0.1 -3.5" scale="0.01 0.01 0.01">
67+
<a-light type="point" color="#cc4400" position="30 5 0" intensity="1"></a-light>
68+
<a-light type="point" color="#aaaa00" position="-30 5 40" intensity="1"></a-light>
69+
<a-entity gltf-model="#trek-cetacean" position="-45 0 40" rotation="0 30 0"></a-entity>
70+
<a-entity gltf-model="#trek-edosian" position="-20 0 0" rotation="0 90 0"></a-entity>
71+
<a-entity gltf-model="#trek-exocomp" position="0 0 40" rotation="0 -45 0"></a-entity>
72+
<a-entity gltf-model="#trek-medusan" position="30 0 0" rotation="0 0 0"></a-entity>
73+
</a-entity>
74+
75+
<a-entity gltf-model="#trek-phaser" scale="0.5 0.5 0.5" position="1.45 0.125 -3.25" rotation="10 30 80"></a-entity>
76+
77+
<a-entity position="5 2 -3.5" scale="0.025 0.025 0.025" rotation="-15 50 20">
78+
<a-entity gltf-model="#trek-hugo-class-ship"
79+
animation="property: rotation; from: 0 0 -45; to: 0 0 15; loop: true; dir: alternate; easing: linear; dur: 25000" ></a-entity>
80+
</a-entity>
81+
82+
<a-entity position="15 5 -25" scale="0.25 0.25 0.25" rotation="15 35 0">
83+
<a-entity gltf-model="#trek-starbase-364-narendra-station"
84+
animation="property: rotation; from: 0 0 0; to: 0 360 0; loop: true; elasticity:1000; dur: 50000; easing: linear;"></a-entity>
85+
</a-entity>
86+
87+
<a-entity gltf-model="#ataito-bucket" position="2 0.25 -3.5" scale="0.25 0.25 0.25" rotation="0 45 0"></a-entity>
88+
89+
<a-entity gltf-model="#kmc-vr-large-bottle" position="-2 0 -3.5" scale="3 3 3" rotation="0 -45 0"></a-entity>
90+
91+
92+
<a-entity position="1.5 3.5 -8" scale="1 1 1" rotation="45 45 0">
93+
<a-entity gltf-model="#shipwreck" shadow
94+
animation="property: rotation; from: 0 0 0; to: 0 -360 0; loop: true; elasticity:1000; dur: 50000; easing: linear;"></a-entity>
95+
</a-entity>
6196

6297
<a-plane position="0 0 -4.5" rotation="-90 0 0" width="6" height="3.5" color="#61615e"></a-plane>
6398

css/home-console.css

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,45 @@ body[loaded] #main {
310310
}
311311
}
312312
}
313+
314+
& tertiary {
315+
grid-row: 5;
316+
grid-column: 1 / 3;
317+
width: 100%;
318+
overflow-x: scroll;
319+
scroll-snap-type: x mandatory;
320+
321+
&::-webkit-scrollbar {
322+
width: 0;
323+
}
324+
325+
& > ul {
326+
display: flex;
327+
width: fit-content;
328+
329+
& > li {
330+
display: block;
331+
position: relative;
332+
scroll-snap-align: start;
333+
scroll-snap-stop: always;
334+
width: 25dvw;
335+
aspect-ratio: 4/3;
336+
337+
& > a {
338+
position: absolute;
339+
inset: 1em;
340+
background-position: center 75%;
341+
background-size: 50%;
342+
background-repeat: no-repeat;
343+
filter: grayscale(0.5);
344+
345+
&:focus {
346+
background-size: 75%;
347+
}
348+
}
349+
}
350+
}
351+
}
313352
}
314353

315354
footer {
11.7 MB
Binary file not shown.

gltf/trek/sta-sarelle-phaser.glb

84 KB
Binary file not shown.
1.94 MB
Binary file not shown.

gltf/trek/starfleet-cetacean.glb

11.1 MB
Binary file not shown.

gltf/trek/starfleet-edosian.glb

10.1 MB
Binary file not shown.

gltf/trek/starfleet-exocomp.glb

822 KB
Binary file not shown.
11.9 MB
Binary file not shown.

home-ala-homestar.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ <h1>S★S</h1>
3636
</a>
3737
</li>
3838
<li>
39-
<a hover-style="busted" href="#">
40-
?
39+
<a hover-style="busted" href="https://itch.io/profile/samsarette">
40+
Itch
4141
<audio src="audio/518616__taman21__guitar-notes-c.mp3" preload></audio>
4242
</a>
4343
</li>
4444
<li>
45-
<a hover-style="focus-in" href="#">
46-
?
45+
<a hover-style="focus-in" href="https://github.com/lunarcloud">
46+
GitHub
4747
<audio src="audio/518616__taman21__guitar-notes-d.mp3" preload></audio>
4848
</a>
4949
</li>

0 commit comments

Comments
 (0)