hooking up loading, flow, audio

This commit is contained in:
Kevin Ngo
2018-07-21 10:21:30 +02:00
parent 2c19dfe50a
commit 3abd6ba9cf
17 changed files with 221 additions and 170 deletions

View File

@@ -5,29 +5,25 @@
<script src="vendor/aframe.dev.js"></script>
<script src="build/build.js"></script>
</head>
<body>
<audio id="hoverSound" src="/assets/sounds/hover.ogg"></audio>
<a-scene bind__beat-loader="challengeId: challenge.id"
bind__preview-song="challengeId: menuSelectedChallenge.id"
challenge-loader
<a-scene bind__beat-loader="challengeId: challenge.id; difficulty: challenge.difficulty"
bind__preview-song="challengeId: menuSelectedChallenge.id; previewStartTime: menuSelectedChallenge.previewStartTime"
bind__song="challengeId: challenge.id; isPlaying: !menu.active && !challenge.isLoading"
console-shortcuts
search>
<a-assets timeout="10000">
<a-mixin id="raycaster" raycaster="objects: [raycastable]; far: 2"></a-mixin>
<audio id="hoverSound" src="/assets/sounds/hover.ogg"></audio>
<img id="gridImg" src="assets/img/grid.png">
<img id="playImg" src="assets/img/play.png">
<img id="resultImg" src="assets/img/result.png">
<img id="gridImg" src="assets/img/grid.png">
<img id="sliceImg" src="assets/img/slice.png">
<a-mixin id="slice" slice9="color: #050505; src: #sliceImg; left: 50; right: 52; top: 50; bottom: 52; padding: 0.04"></a-mixin>
<a-mixin id="font" text="font: exo2semibold; letterSpacing: -1"></a-mixin>
<a-mixin id="raycaster" raycaster="objects: [raycastable]; far: 2"></a-mixin>
<a-mixin id="slice" slice9="color: #050505; src: #sliceImg; left: 50; right: 52; top: 50; bottom: 52; padding: 0.04"></a-mixin>
<a-mixin id="textFont" text="font: exo2semibold; letterSpacing: -1"></a-mixin>
</a-assets>
<a-entity id="dustParticles" particle-system="maxAge: 100; positionSpread: 5 5 5; type: 2; rotationAxis: x; rotationAngle: 0.001; accelerationValue: 0.001 0.001 0.001; accelerationSpread: 0.001 0.001 0.001; velocityValue: 0.001 0.001 0.001; velocitySpread: 0.0125 0.0125 0.0125; color: #ffffff; size: 0.1; opacity: 0.85; direction: 0; particleCount: 150; texture: assets/img/smokeparticle.png"></a-entity>
<a-entity id="container">
<a-entity id="container" recenter>
{% include './templates/environment.html' %}
{% include './templates/gameUi.html' %}
{% include './templates/menu.html' %}
@@ -39,7 +35,8 @@
<a-entity id="rightHand" controller="hand: right"></a-entity>
</a-entity>
<a-entity id="mouseCursor" mixin="raycaster" cursor="rayOrigin: mouse" debug-cursor bind__isPlaying="!inVR"></a-entity>
<a-entity id="mouseCursor" mixin="raycaster" cursor="rayOrigin: mouse" debug-cursor
bind__raycaster="enabled: !inVR"></a-entity>
</a-scene>
</body>
</html>