juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #188 from supermedium/tutorialside

Browse Source 
tutorial on side
This commit is contained in:
Kevin Ngo
2018-11-20 02:36:49 -08:00
committed by GitHub
parent 7495a3a466 1d9a9d8473
commit 200007dbfc
3 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/state/index.js
View File

@@ -97,8 +97,7 @@ AFRAME.registerState({
songNameTexts: '', // All names in search results merged together.
songSubNameTexts: '' // All sub names in search results merged together.
},
searchResultsPage: [],
tutorialActive: false
searchResultsPage: []
},
handlers: {
@@ -382,16 +381,6 @@ AFRAME.registerState({
state.isSongLoading = true;
},
tutorialclose: (state) => {
state.menuActive = true;
state.tutorialActive = false;
},
tutorialopen: (state) => {
state.menuActive = false;
state.tutorialActive = true;
},
'enter-vr': (state) => {
state.inVR = true;
},

14
src/templates/menu.html
View File

@@ -309,7 +309,7 @@
proxy-event__accept="event: superkeyboardinput; to: a-scene; as: keyboardclose">
</a-entity>
<a-entity id="genreButtons" position="-0.68 0.2 -1.9">
<a-entity id="genreButtons" position="-0.55 0.2 -1.9">
<a-entity id="genreButton"
mixin="bigMenuButton"
bind-toggle__raycastable="menuActive && !genreMenuOpen && !isSearching && !genre"
@@ -337,7 +337,7 @@
<a-entity mixin="font" text="align: center; color: #AAA; wrapCount: 20; value: BACK" position="0 -0.07 0.01"></a-entity>
</a-entity>
<a-entity id="searchButtons" position="0.40 0.2 -1.9">
<a-entity id="searchButtons" position="0.55 0.2 -1.9">
<a-entity id="searchButton"
mixin="bigMenuButton"
bind-toggle__raycastable="menuActive && !genreMenuOpen && !isSearching && !search.query"
@@ -354,13 +354,3 @@
<a-entity mixin="font" text="align: center; color: #AAA; wrapCount: 20; value: CLEAR SEARCH" position="0 -0.07 0.01"></a-entity>
</a-entity>
</a-entity>
<a-entity id="tutorialButton"
position="1.08 0.2 -1.9"
mixin="bigMenuButton"
bind-toggle__raycastable="menuActive && !isSearching && !genreMenuOpen"
bind__visible="menuActive && !isSearching && !genreMenuOpen"
slice9="width: 0.2"
proxy-event="event: click; to: a-scene; as: tutorialopen">
<a-entity mixin="font" text="align: center; color: #AAA; wrapCount: 20; value: ?" position="0 -0.07 0.01"></a-entity>
</a-entity>

22
src/templates/tutorial.html
View File

@@ -1,18 +1,19 @@
<a-entity
id="tutorial"
class="overlay"
position="0 1.5 -1.7"
position="-2.2 1.3 -0.5"
rotation="0 60 0"
scale="0.7 0.7 0.7"
bind__visible="tutorialActive">
bind__visible="menuActive">
<a-entity position="0 0.32 0.001" geometry-merger="preserveOriginal: false" material="shader: flat; color: #ffffff">
<a-entity position="-1.17 0 0" geometry="primitive: ring; radiusInner: 0.08; radiusOuter: 0.095; segmentsPhi: 1; segmentsTheta: 30; buffer: false"></a-entity>
<a-entity position="0 0 0" geometry="primitive: ring; radiusInner: 0.08; radiusOuter: 0.095; segmentsPhi: 1; segmentsTheta: 30; buffer: false"></a-entity>
<a-entity position="1.17 0 0" geometry="primitive: ring; radiusInner: 0.08; radiusOuter: 0.095; segmentsPhi: 1; segmentsTheta: 30; buffer: false"></a-entity>
</a-entity>
<a-entity mixin="font" text="align: center; value: 1 2 3; baseline: top; wrapCount: 50; letterSpacing: 180; width: 3" position="0 0.27 0"></a-entity>
<a-entity mixin="font" text="baseline: top; lineHeight: 50; align: center; value: SLICE THE BEATS\nMIND COLOR AND DIRECTION!; wrapCount: 28" position="-1.17 0.1 0"></a-entity>
<a-entity mixin="font" text="baseline: top; lineHeight: 50; align: center; value: SLICE THE BEATS\nMIND COLOR AND DIRECTION!; wrapCount: 30" position="-1.17 0.1 0"></a-entity>
<a-entity mixin="font" text="baseline: top; lineHeight: 50; align: center; value: DODGE WALLS,\nAVOID CUTTING MINES; wrapCount: 28" position="0 0.1 0"></a-entity>
<a-entity mixin="font" text="baseline: top; lineHeight: 50; align: center; value: MORE SWING,\nMORE POINTS!; wrapCount: 28" position="1.17 0.1 0"></a-entity>
<a-entity mixin="font" text="baseline: top; lineHeight: 50; align: center; value: LONGER SWING,\nMORE POINTS!; wrapCount: 28" position="1.17 0.1 0"></a-entity>
<a-entity
obj-model="obj: #tutorial3Obj"
@@ -25,9 +26,10 @@
</a-entity>
<a-entity id="tutorialBloom"
position="0 1.5 -1.7"
position="-2.2 1.3 -0.5"
rotation="0 60 0"
scale="0.7 0.7 0.7"
bind__visible="tutorialActive">
bind__visible="menuActive">
<a-entity
mixin="font"
text="align: center; value: HOW TO PLAY; color: #aaa; wrapCount: 30; width: 3"
@@ -77,12 +79,4 @@
scale="0.9 0.9 0.9"
></a-entity>
</a-entity>
<a-entity id="tutorialClose"
mixin="bigMenuButton"
position="0 -0.840 0"
bind-toggle__raycastable="tutorialActive"
proxy-event="event: click; to: a-scene; as: tutorialclose">
<a-entity mixin="font" text="align: center; color: #AAA; wrapCount: 15; value: OK" position="0 -0.09 0.01"></a-entity>
</a-entity>
</a-entity>