From 45dfe03dd45c3d11eb00df3d36d9717fa301f615 Mon Sep 17 00:00:00 2001
From: Kevin Ngo <me@ngokevin.com>
Date: Fri, 7 Dec 2018 15:59:50 -0800
Subject: [PATCH] remove tutorial bloom container

---
 src/templates/tutorial.html | 53 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/templates/tutorial.html b/src/templates/tutorial.html
index 88ae1c4..6bd298f 100644
--- a/src/templates/tutorial.html
+++ b/src/templates/tutorial.html
@@ -1,10 +1,17 @@
 <a-entity
   id="tutorial"
   class="overlay"
-  position="-2.2 1.3 -0.5"
-  rotation="0 60 0"
-  scale="0.7 0.7 0.7"
-  bind__visible="menuActive">
+  bind__visible="menuActive"
+  position="-2.2 1.2 -0.5"
+  rotation="0 60 0">
+
+  <a-entity id="tutorialSlice" mixin="slice" slice9="left: 70; width: 3.3; height: 1.52; padding: 0.12; opacity: 0.9" position="0 -0.193 -0.01"></a-entity>
+
+  <a-entity
+    id="tutorialTitle"
+    mixin="font"
+    text="align: center; value: HOW TO PLAY; color: #aaa; wrapCount: 30; width: 3"
+    position="0 0.4 0"></a-entity>
 
   <a-entity id="tutorialHeaders" position="0 -0.1 0">
     <a-entity id="tutorialNumberRings" position="0 0.32 0.001" geometry-merger="preserveOriginal: false" material="shader: flat; color: #ffffff">
@@ -19,27 +26,6 @@
     <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>
 
-  <a-entity
-    obj-model="obj: #tutorial3Obj"
-    material="side: double; shader: flat; transparent: true; src: #tutorialImg"
-    position="1.1 -0.55 0.2"
-    scale="0.9 0.9 0.9"
-    bind__animation="enabled: menuActive"
-    animation="property: object3D.rotation.y; from: -60; to: -10; dur: 5000; dir: alternate; easing: easeInOutCubic; loop: true"></a-entity>
-</a-entity>
-
-<a-entity id="tutorialBloom"
-  position="-2.2 1.3 -0.5"
-  rotation="0 60 0"
-  scale="0.7 0.7 0.7"
-  bind__visible="menuActive">
-  <a-entity
-    mixin="font"
-    text="align: center; value: HOW TO PLAY; wrapCount: 30; width: 3"
-    position="0 0.6 0"></a-entity>
-
-  <a-entity mixin="slice" slice9="left: 70; width: 3.3; height: 1.6; padding: 0.12; opacity: 0.9" position="0 0 -0.01"></a-entity>
-
   <a-entity
     id="tutorial1"
     obj-model="obj: #tutorial1Obj"
@@ -49,15 +35,16 @@
     bind__animation="enabled: menuActive"
     animation="property: object3D.rotation.y; from: -20; to: 55; dur: 5000; dir: alternate; easing: easeInOutCubic; loop: true"></a-entity>
 
-  <a-entity position="0 -0.2 0.2" scale="1.1 1.1 1.1">
+  <a-entity id="tutorial2" position="0 -0.2 0.2" scale="1.1 1.1 1.1">
     <a-entity
-      id="tutorial3"
+      id="tutorial2Wall"
       bind__animation="enabled: menuActive"
       geometry="width: 0.3; height: 0.04; depth: 0.3"
       animation="property: object3D.position.z; from: -0.5; to: -0.1; dur: 2000; easing: linear; loop: true; easing: easeInOutCubic"
       material="shader: wallShader; tex: #noiseTexture; repeat: 1 2; transparent: true"></a-entity>
 
     <a-entity
+      id="tutorial2Mine1"
       bind__animation="enabled: menuActive"
       obj-model="obj: #mineObj"
       scale="0.2 0.2 0.2"
@@ -66,6 +53,7 @@
       material="emissive: #080808; color: #222; roughness: 0.38; metalness: 0.7;"></a-entity>
 
     <a-entity
+      id="tutorial2Mine2"
       bind__animation="enabled: menuActive"
       obj-model="obj: #mineObj"
       scale="0.2 0.2 0.2"
@@ -74,7 +62,7 @@
       material="emissive: #080808; color: #222; roughness: 0.38; metalness: 0.7;"></a-entity>
 
     <a-entity
-      id="tutorial2"
+      id="tutorial2Mine3"
       bind__animation="enabled: menuActive"
       obj-model="obj: #tutorial2Obj"
       material="side: double; shader: flat; transparent: true; src: #tutorialImg"
@@ -82,4 +70,13 @@
       position="0.098 -0.36 0"
       scale="0.9 0.9 0.9"></a-entity>
   </a-entity>
+
+  <a-entity
+    id="tutorial3"
+    obj-model="obj: #tutorial3Obj"
+    material="side: double; shader: flat; transparent: true; src: #tutorialImg"
+    position="1.1 -0.55 0.2"
+    scale="0.6 0.9 0.9"
+    bind__animation="enabled: menuActive"
+    animation="property: object3D.rotation.y; from: -60; to: -10; dur: 5000; dir: alternate; easing: easeInOutCubic; loop: true"></a-entity>
 </a-entity>