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

unnamespace menu.active -> menuActive

Browse Source
This commit is contained in:
Kevin Ngo
2018-10-15 16:44:38 -07:00
parent e6589b304d
commit 455fef5658
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/state/index.js
View File

@@ -41,7 +41,7 @@ AFRAME.registerState({
isSongLoading: false, // Either fetching or decoding.
isVictory: false, // Victory screen.
keyboardActive: false, // Whether search is open.
menu: {active: true},
menuActive: true,
menuDifficulties: [],
menuSelectedChallenge: {
author: '',
@@ -127,7 +127,7 @@ AFRAME.registerState({
state.isGameOver = false;
state.isPaused = false;
state.isVictory = false;
state.menu.active = true;
state.menuActive = true;
state.challenge.id = '';
},
@@ -185,7 +185,7 @@ AFRAME.registerState({
Object.assign(state.challenge, state.menuSelectedChallenge);
// Reset menu.
state.menu.active = false;
state.menuActive = false;
state.menuSelectedChallenge.id = '';
state.keyboardActive = false;
@@ -261,10 +261,10 @@ AFRAME.registerState({
*/
computeState: (state) => {
state.isPlaying =
!state.menu.active && !state.isPaused && !state.isVictory && !state.isGameOver &&
!state.menuActive && !state.isPaused && !state.isVictory && !state.isGameOver &&
!state.challenge.isLoading && !state.isSongLoading;
const anyMenuOpen = state.menu.active || state.isPaused || state.isVictory || state.isGameOver;
const anyMenuOpen = state.menuActive || state.isPaused || state.isVictory || state.isGameOver;
state.leftRaycasterActive = anyMenuOpen && state.activeHand === 'left' && state.inVR;
state.rightRaycasterActive = anyMenuOpen && state.activeHand === 'right' && state.inVR;