From 2349dd90c7d27d88e442442eb496563ca0fe8b30 Mon Sep 17 00:00:00 2001
From: "Diego F. Goberna" <diego@feiss.be>
Date: Fri, 16 Nov 2018 18:48:52 +0100
Subject: [PATCH] tutorial on side

---
 src/state/index.js          | 13 +------------
 src/templates/menu.html     | 14 ++------------
 src/templates/tutorial.html | 18 ++++++------------
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/state/index.js b/src/state/index.js
index 9f2adce..e1bfbce 100644
--- a/src/state/index.js
+++ b/src/state/index.js
@@ -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;
     },
diff --git a/src/templates/menu.html b/src/templates/menu.html
index 7037280..2380e66 100644
--- a/src/templates/menu.html
+++ b/src/templates/menu.html
@@ -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>
diff --git a/src/templates/tutorial.html b/src/templates/tutorial.html
index 20e848b..7c5d757 100644
--- a/src/templates/tutorial.html
+++ b/src/templates/tutorial.html
@@ -1,9 +1,10 @@
 <a-entity
   id="tutorial"
   class="overlay"
-  position="0 1.5 -1.7"
+  position="1.8 1.5 0"
+  rotation="0 -90 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>
@@ -25,9 +26,10 @@
 </a-entity>
 
 <a-entity id="tutorialBloom"
-  position="0 1.5 -1.7"
+  position="1.8 1.5 0"
+  rotation="0 -90 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>