From 43ab0a2d75ccbe47327284ce8231c845dfc127ec Mon Sep 17 00:00:00 2001
From: "Diego F. Goberna" <diego@feiss.be>
Date: Wed, 19 Sep 2018 01:10:11 +0200
Subject: [PATCH] fixes #10 - now smoke does not mix with lasers

---
 package-lock.json           | 31 ++++++++++++++++++-------------
 src/components/materials.js |  2 +-
 src/templates/stage.html    |  4 ++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 012b631..8a0a1b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,6 +94,11 @@
       "resolved": "https://registry.npmjs.org/aframe-animation-timeline-component/-/aframe-animation-timeline-component-1.5.0.tgz",
       "integrity": "sha512-mVxIH5qjik3qnbmeuXnYWFyKkcdLdZEQIFIFky1Z3QY8gZFsbCgocImwAx9UV9DTsIywa/lt3nXyNrpgOQgNCg=="
     },
+    "aframe-audioanalyser-component": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/aframe-audioanalyser-component/-/aframe-audioanalyser-component-3.0.3.tgz",
+      "integrity": "sha1-7/GajmB5Ul3ZR99LpDG5vKI+fQc="
+    },
     "aframe-cubemap-component": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/aframe-cubemap-component/-/aframe-cubemap-component-0.1.4.tgz",
@@ -154,18 +159,18 @@
       "integrity": "sha512-sth2BuNuw1Z7wb4HclkD3EJDJ5cYDFOkKCPobih63kw+L8ulhx0G1qEcCMg5JFEvK/Xn7SwpJMKfhJHMlGypMg=="
     },
     "aframe-super-keyboard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aframe-super-keyboard/-/aframe-super-keyboard-2.0.0.tgz",
-      "integrity": "sha512-GYRMEm0mu8QO1+x0BawM1dMedlzlGidivtsvOxo3MVUnwJTrnE4TokzOP7PxO+IO5Zxl7VDTcloJ/vEskm/ZUQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/aframe-super-keyboard/-/aframe-super-keyboard-2.0.2.tgz",
+      "integrity": "sha512-KaqZFjczuFdwL2i3CB9S2A73rzx6G+KpaODwgzozeAeEHvyLQCYpfkyXN4NcwBfnd11d0uHYDxpl3KzyIDzndg==",
       "requires": {
         "uglify-js": "^3.3.23",
         "uglifyjs": "^2.4.11"
       },
       "dependencies": {
         "commander": {
-          "version": "2.16.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
-          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
         },
         "source-map": {
           "version": "0.6.1",
@@ -173,11 +178,11 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "uglify-js": {
-          "version": "3.4.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.5.tgz",
-          "integrity": "sha512-Fm52gLqJqFBnT+Sn411NPDnsgaWiYeRLw42x7Va/mS8TKgaepwoGY7JLXHSEef3d3PmdFXSz1Zx7KMLL89E2QA==",
+          "version": "3.4.9",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
           "requires": {
-            "commander": "~2.16.0",
+            "commander": "~2.17.1",
             "source-map": "~0.6.1"
           }
         }
@@ -5961,9 +5966,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
       "optional": true
     },
     "nanomatch": {
diff --git a/src/components/materials.js b/src/components/materials.js
index 722ac10..eecbbbf 100644
--- a/src/components/materials.js
+++ b/src/components/materials.js
@@ -9,7 +9,7 @@ AFRAME.registerSystem('materials', {
 AFRAME.registerComponent('materials', {
   schema: {
     default: 'black',
-    oneOf: ['black', 'red', 'blueneon']
+    oneOf: ['black', 'default', 'neon']
   },
   update: function () {
     this.el.object3D.traverse(o => o.material = this.system[this.data]);
diff --git a/src/templates/stage.html b/src/templates/stage.html
index 4414721..13f222e 100644
--- a/src/templates/stage.html
+++ b/src/templates/stage.html
@@ -37,9 +37,9 @@
   <a-entity class="laser" mixin="laser" position="10 2 -38"></a-entity>
   <a-entity class="laser" mixin="laser" position="14 -1.5 -36"></a-entity>
 
-  <a-entity geometry="primitive: cylinder; radius: 10; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: false; depthTest: false; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.4 0" animation="property: rotation.y; from: 0; to: 360; dur: 200000; easing: linear; loop: true"></a-entity>
+  <a-entity id="smoke1" geometry="primitive: cylinder; radius: 10; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: true; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.4 0" animation="property: rotation.y; from: 0; to: 360; dur: 200000; easing: linear; loop: true"></a-entity>
 
-  <a-entity geometry="primitive: cylinder; radius: 20; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: false; depthTest: false; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.8 0" animation="property: rotation.y; from: 0; to: 360; dur: 243000; easing: linear; loop: true"></a-entity>
+  <a-entity id="smoke2" geometry="primitive: cylinder; radius: 20; height: 15; openEnded: true; segmentsHeight: 1; segmentsRadial: 9" additive material="repeat: 2 1; side: double; fog: true; src: #smokeTexture; shader: flat; transparent: true; color: #111" position="0 1.8 0" animation="property: rotation.y; from: 0; to: 360; dur: 243000; easing: linear; loop: true"></a-entity>
 
   <a-entity light="type: directional; intensity: 3" position="0 10 10"></a-entity>
   </a-entity>