From a3a11e9207342080aa4dd96beb7fc2515d0697c2 Mon Sep 17 00:00:00 2001 From: Kevin Ngo Date: Sun, 22 Jul 2018 23:58:29 +0200 Subject: [PATCH] pause btn --- package-lock.json | 16 ++++++++-------- package.json | 2 +- src/components/recenter.js | 6 ++++++ src/components/song-preview.js | 4 ++-- src/index.html | 14 +++++++++++--- src/state/index.js | 8 ++++---- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1cd8cc..eeac3f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,8 @@ }, "aframe": { "version": "0.8.2", - "resolved": "github:aframevr/aframe#2afb6ac191f1a44edbbfe6f0e733380356a9e0c8", + "resolved": "https://registry.npmjs.org/aframe/-/aframe-0.8.2.tgz", + "integrity": "sha512-kp0c3f17moiilChTsD95q+USB7/12LuusGERSmO2X7Cgq6q6evVv9Oe7qRMZ6Baf26gS0T9Z7umc/e1alqcEVA==", "requires": { "@tweenjs/tween.js": "^16.8.0", "browserify-css": "^0.8.2", @@ -75,7 +76,7 @@ "present": "0.0.6", "promise-polyfill": "^3.1.0", "style-attr": "^1.0.2", - "three": "0.94.0", + "three": "github:supermedium/three.js#5ef2887ab3621cae54fa129a500424d6caa25b62", "three-bmfont-text": "^2.1.0", "webvr-polyfill": "^0.10.5" } @@ -119,9 +120,9 @@ "integrity": "sha512-ZZxD95DeMN7/NpLOe7Es3WCXNB37aIqttqI3meaTm00+OY0Q5q/1NkVsupthIlECO99iQg1evBhzRBfxj4wFWg==" }, "aframe-layout-component": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/aframe-layout-component/-/aframe-layout-component-5.0.1.tgz", - "integrity": "sha512-vL7xsIMl0sm3hs4AT6WsLkUI+zvnPpHehQQR0uPNmQRMpxDiOl+wzXCCKINeuqlczjNDDRMMJZb8qrnn1Ziucg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/aframe-layout-component/-/aframe-layout-component-5.2.0.tgz", + "integrity": "sha512-XbkMasvaTs/fc7h+dk9r9/y47nOE9FDE9kVP/byaO0i67z4uFuDaOtsAf7Gbwc04HB/7NsIEONMzSwZ3nru+iQ==", "requires": { "aframe": "^0.8.2", "karma-chrome-launcher": "^2.2.0" @@ -10105,9 +10106,8 @@ "dev": true }, "three": { - "version": "0.94.0", - "resolved": "https://registry.npmjs.org/three/-/three-0.94.0.tgz", - "integrity": "sha1-TObbfyv795wtc0RKpuPPwIoy12I=" + "version": "github:supermedium/three.js#5ef2887ab3621cae54fa129a500424d6caa25b62", + "from": "github:supermedium/three.js#r90fixMTLLoader" }, "three-bmfont-text": { "version": "2.3.0", diff --git a/package.json b/package.json index 2b3bc60..69c5c66 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "aframe-event-set-component": "^4.0.1", "aframe-gltf-part-component": "1.1.0", "aframe-haptics-component": "^1.4.1", - "aframe-layout-component": "^5.0.1", + "aframe-layout-component": "^5.2.0", "aframe-orbit-controls": "^1.2.0", "aframe-particle-system-component": "^1.0.11", "aframe-proxy-event-component": "^1.1.1", diff --git a/src/components/recenter.js b/src/components/recenter.js index 20660c2..0d7d0e2 100644 --- a/src/components/recenter.js +++ b/src/components/recenter.js @@ -2,6 +2,10 @@ * Pivot the scene when user enters VR to face the links. */ AFRAME.registerComponent('recenter', { + schema: { + enabled: {default: true} + }, + init: function() { var sceneEl = this.el.sceneEl; this.matrix = new THREE.Matrix4(); @@ -18,9 +22,11 @@ AFRAME.registerComponent('recenter', { }); // User can also recenter the menu manually. sceneEl.addEventListener('menudown', () => { + if (!this.data.enabled) { return; } this.recenter(); }); sceneEl.addEventListener('thumbstickdown', () => { + if (!this.data.enabled) { return; } this.recenter(); }); }, diff --git a/src/components/song-preview.js b/src/components/song-preview.js index d89c977..777588c 100644 --- a/src/components/song-preview.js +++ b/src/components/song-preview.js @@ -47,7 +47,7 @@ AFRAME.registerComponent('song-preview-system', { this.audioStore[challengeId] = audio; if (this.preloadQueue.length === 0) { - preloadMetatata(audio); + this.preloadMetadata(audio); } else { this.preloadQueue.push(audio); } @@ -56,7 +56,7 @@ AFRAME.registerComponent('song-preview-system', { preloadMetadata: function (audio) { audio.addEventListener('loadedmetadata', () => { if (this.preloadQueue.length) { - preloadMetadata(this.preloadQueue[0]); + this.preloadMetadata(this.preloadQueue[0]); } }); audio.preload = 'metadata'; diff --git a/src/index.html b/src/index.html index 329c355..77e47f7 100644 --- a/src/index.html +++ b/src/index.html @@ -23,7 +23,7 @@ - + {% include './templates/environment.html' %} {% include './templates/gameUi.html' %} {% include './templates/menu.html' %} @@ -31,8 +31,16 @@ - - + + { + state.menu.active = true; + }, + /** * Start challenge. * Transfer staged challenge to the active challenge. @@ -131,10 +135,6 @@ AFRAME.registerState({ computeSearchPagination(state); }, - togglemenu: (state) => { - state.menu.active = !state.menu.active; - }, - 'enter-vr': (state) => { state.inVR = true; },