Skip to content

Commit 02da1ad

Browse files
benscottbenscott
committed
Changes for aframe5
1 parent d46369f commit 02da1ad

File tree

1 file changed

+86
-13
lines changed

1 file changed

+86
-13
lines changed

‎www/index.html

Lines changed: 86 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
<img id="stfc-logo" src="images/stfc-logo.png" preload="auto">
4141
<img id="mars" src="images/mars.png" preload="auto">
4242

43-
<!-- Mixins -->
44-
<a-mixin id="info-point" template="src: #info-point-tpl; type: handlebars" look-at="[camera]"></a-mixin>
45-
<a-mixin id="sky" radius="80" segments-width="10"></a-mixin>
46-
<a-mixin id="title" template="src: #title-tpl; type: handlebars"></a-mixin>
47-
<a-mixin id="credit" template="src: #credit-tpl; type: handlebars"></a-mixin>
48-
4943
<!-- Templates -->
5044
<!-- Info point template -->
5145
<script id="info-point-tpl" type="text/handlebars">
@@ -68,31 +62,110 @@
6862

6963
<!-- credit template -->
7064
<script id="credit-tpl" type="text/handlebars">
71-
<a-entity position="-1.4 -5 2" scale="0.8 0.8 0.8" rotation="-65 0 0" bmfont-text="text: Image credit: {{ credit }}; color: #E5E5E5; lineHeight: 32; align: center; width: 700;fnt:./fonts/arial.fnt; fntImage:./fonts/arial.png">
65+
<a-entity position="0 -5 2" rotation="-65 0 0" text="value: Image credit: {{ credit }}; color: #E5E5E5; align: center; width: 2.0">
7266
</script>
7367

68+
<!-- Mixins -->
69+
<a-mixin id="info-point" template="src: #info-point-tpl; type: handlebars" look-at="[camera]"></a-mixin>
70+
<a-mixin id="sky" radius="80" segments-width="10"></a-mixin>
71+
<a-mixin id="title" template="src: #title-tpl; type: handlebars"></a-mixin>
72+
<a-mixin id="credit" template="src: #credit-tpl; type: handlebars"></a-mixin>
73+
7474
</a-assets>
7575

7676
<a-entity class="slide" visible="true">
7777
<a-sky color="#333" mixin="sky"></a-sky>
78+
<a-entity mixin="credit" data-credit="UGS"></a-entity>
7879
<a-image position="-0.03 0 -1" src="#mars" width="5" height="5" scale="1 1 1"></a-image>
80+
<!-- container entity -->
7981
<a-entity position="0 0.8 0">
8082
<a-image position="0 0 0" src="#logo" width="2.5" height="0.7" scale="0.5 0.5 0.5">
8183
</a-image>
82-
<a-text position="0 -0.5 0" text="align: center; width: 2.0; lineHeight: 50; wrapCount: 45;
84+
<a-text position="0 -0.54 0" text="align: center; width: 2.0; lineHeight: 50; wrapCount: 45;
8385
value: Get up close and personal with the red planet, using just your phone. Download the free app, grab a viewing device and take a whistle-stop tour of Mars. Immerse yourself in a rover eye view of the search for life.">
8486
</a-text>
85-
<a-text position="0 -0.98 0" text="color: #FF9800; align: center; width: 2.0; value: CLICK ANYWHERE TO BEGIN; ">
86-
</a-text>
87-
</a-entity>
87+
<a-text position="0 -0.98 0" text="color: #FF9800; align: center; width: 2.0; value: CLICK ANYWHERE TO BEGIN; "></a-text>
88+
<!-- Credits #1 -->
89+
<a-text position="0 -1.22 0" text="value: Science Lead: Dr Peter Grindrod; color: #E5E5E5; lineHeight: 42; align: center; width: 1.3">
90+
</a-text>
91+
<a-text position="0 -1.30 0" text="value: Birkbeck, University of London; color: #cbcbcb; lineHeight: 42; align: center; width: 1.3">
92+
</a-text>
93+
<!-- Credits #2 -->
94+
<a-text position="0 -1.42 0" text="value: Public Engagement Lead: Ivvet Modinou; color: #E5E5E5; lineHeight: 42; align: center; width: 1.3">
95+
</a-text>
96+
<a-text position="0 -1.50 0" text="value: British Science Association; color: #ccc; lineHeight: 42; align: center; width: 1.3">
97+
</a-text>
98+
<!-- Credits #3 -->
99+
<a-text position="0 -1.62 0" text="value: Development Lead: Ben Scott; color: #E5E5E5; lineHeight: 42; align: center; width: 1.3">
100+
</a-text>
101+
<a-text position="0 -1.70 0" text="value: Sparkd Ltd.; color: #ccc; lineHeight: 42; align: center; width: 1.3">
102+
</a-text>
103+
<a-text position="0 -1.95 0" text="value: Funded by:; color: #ccc; lineHeight: 42; align: center; width: 1.3">
104+
</a-text>
105+
<a-image position="-0.0.5 -2.1 0" src="#stfc-logo" width="0.95" height="0.3"></a-image>
106+
</a-entity> <!-- container entity -->
107+
<a-entity position="0 0 40" text="value: It's behind you!; color: #ccc; align: center; width: 30" look-at="[camera]"></a-entity>
88108
</a-entity>
89109

90110
<a-entity class="slide" visible="false">
91111
<a-sky src="#scene-1" mixin="sky"></a-sky>
92-
<a-entity mixin="title" data-text="1. Spirit"></a-entity>
112+
<a-entity mixin="title" data-text="1. Spirit"></a-entity>
93113
<a-entity position="1.6 -0.1 -0.5" scale="1.1 1.1 1.1" mixin="info-point" data-text="Landing Site" data-num="1"></a-entity>
94114
<a-entity position="-3.6 1.4 8" scale="2.5 2.5 2.5" mixin="info-point" data-text="McCool Hill" data-num="2"></a-entity>
95-
<a-entity position="3 0.19 1" scale="1.1 1.1 1.1" mixin="info-point" data-text="Husband Hill" data-num="3"></a-entity>
115+
<a-entity position="3 0.19 1" scale="1.1 1.1 1.1" mixin="info-point" data-text="Husband Hill" data-num="3"></a-entity>
116+
<a-entity mixin="credit" data-credit="NASA/JPL/Cornell"></a-entity>
117+
</a-entity>
118+
119+
<a-entity class="slide" visible="false">
120+
<a-sky src="#scene-2" mixin="sky"></a-sky>
121+
<a-entity mixin="title" data-text="2. V1"></a-entity>
122+
<a-entity position="-2.1 -1.6 0" scale="1.2 1.2 1.2" mixin="info-point" data-text="Sandy Flats" data-num="1"></a-entity>
123+
<a-entity mixin="credit" data-credit="NASA/JPL"></a-entity>
124+
</a-entity>
125+
126+
<a-entity class="slide" visible="false">
127+
<a-sky src="#scene-3" mixin="sky"></a-sky>
128+
<a-entity mixin="title" data-text="3. Pathfinder"></a-entity>
129+
<a-entity position="-2 -0.4 1.2" mixin="info-point" data-text="Yogi" data-num="1"></a-entity>
130+
<a-entity position="-3 0.25 7" scale="1.8 1.8 1.8" mixin="info-point" data-text="Twin Peaks" data-num="2"></a-entity>
131+
<a-entity position="8 -3 20" scale="8 8 8" mixin="info-point" data-text="Chimp" data-num="3"></a-entity>
132+
<a-entity mixin="credit" data-credit="NASA/JPL"></a-entity>
133+
</a-entity>
134+
135+
<a-entity class="slide" visible="false">
136+
<a-sky src="#scene-4" mixin="sky"></a-sky>
137+
<a-entity mixin="title" data-text="4. Opportunity"></a-entity>
138+
<a-entity position="6 -0.3 -1" scale="2 2 2" mixin="info-point" data-text="Bounce Rock" data-num="1"></a-entity>
139+
<a-entity position="-3 -0.28 2.5" scale="1.2 1.2 1.2" mixin="info-point" data-text="Shoemaker's Patio" data-num="2"></a-entity>
140+
<a-entity position="-1.7 -0.17 0" scale="1 1 1" mixin="info-point" data-text="Big Dig" data-num="3"></a-entity>
141+
<a-entity mixin="credit" data-credit="NASA/JPL/Cornell"></a-entity>
142+
</a-entity>
143+
144+
<a-entity class="slide" visible="false">
145+
<a-sky src="#scene-5" mixin="sky"></a-sky>
146+
<a-entity mixin="title" data-text="5. Phoenix"></a-entity>
147+
<a-entity position="1.32 -0.75 0" scale="1 1 1" mixin="info-point" data-text="Sleeping Beauty" data-num="1"></a-entity>
148+
<a-entity position="0.9 -1.8 3.8" scale="1.2 1.2 1.2" mixin="info-point" data-text="Snow White" data-num="2"></a-entity>
149+
<a-entity position="2 -2 1.8" scale="1.2 1.2 1.2" mixin="info-point" data-text="Dodo-Goldilocks" data-num="3"></a-entity>
150+
<a-entity mixin="credit" data-credit="NASA/JPL/UA/Texas A&amp;M"></a-entity>
151+
</a-entity>
152+
153+
<a-entity class="slide" visible="false">
154+
<a-sky src="#scene-6" mixin="sky"></a-sky>
155+
<a-entity mixin="title" data-text="6. MSL 1"></a-entity>
156+
<a-entity position="-1.6 0.2 7" scale="2 2 2" mixin="info-point" data-text="Namib" data-num="1"></a-entity>
157+
<a-entity position="-3.4 0.6 0" scale="1.5 1.5 1.5" mixin="info-point" data-text="Aeolis Mons" data-num="2"></a-entity>
158+
<a-entity position="-0.2 0.2 0" scale="0.8 0.8 0.8" mixin="info-point" data-text="Hematite Ridge" data-num="3"></a-entity>
159+
<a-entity mixin="credit" data-credit="NASA/JPL/MSSS"></a-entity>
160+
</a-entity>
161+
162+
<a-entity class="slide" visible="false">
163+
<a-entity mixin="title" data-text="7. Spirit"></a-entity>
164+
<a-sky src="#scene-1" mixin="sky"></a-sky>
165+
<a-entity position="-0.6 -0.05 3.7" scale="0.8 0.8 0.8" mixin="info-point" data-text="Tyrone" data-num="1"></a-entity>
166+
<a-entity position="1.5 -0.15 1" scale="0.8 0.8 0.8" mixin="info-point" data-text="Home Plate" data-num="2"></a-entity>
167+
<a-entity position="-0.6 -1 2.8" scale="0.7 0.7 0.7" mixin="info-point" data-text="Bear Island" data-num="3"></a-entity>
168+
<a-entity mixin="credit" data-credit="NASA/JPL/Cornell"></a-entity>
96169
</a-entity>
97170

98171
<a-entity position="0 0 2">

0 commit comments

Comments
 (0)