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

remove blade draw sound

Browse Source
This commit is contained in:
Kevin Ngo
2018-10-12 02:21:08 -07:00
parent abeb18d7fb
commit 4a2ad1220c
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/saber-controls.js
View File

@@ -25,9 +25,6 @@ AFRAME.registerComponent('saber-controls', {
update: function (oldData) {
if (!oldData.bladeEnabled && this.data.bladeEnabled) {
this.bladeEl.emit('drawblade');
if (!oldData.isPaused) {
this.bladeEl.emit('drawbladesound');
}
}
},

6
src/index.html
View File

@@ -32,7 +32,7 @@
pool__beat-dot-blue="mixin: dotBlueBeat; size: 10; container: #beatContainer"
pool__beat-dot-red="mixin: dotRedBeat; size: 10; container: #beatContainer"
pool__beat-mine="mixin: mine; size: 10; container: #beatContainer"
pool__wall="mixin: wall; size: 10; container: #beatContainer"
pool__wall="mixin: wall; size: 10; container: #beatContainer"
proxy-event__menuleft="event: menuchallengeunselect; to: .menuAnimation"
proxy-event__menuright="event: menuchallengeselect; to: .menuAnimation"
proxy-event__cleargame1="event: pausemenuexit; as: cleargame; to: a-scene"
@@ -55,7 +55,6 @@
<a-asset-item id="sabercutParticles" src="assets/models/sabercut.json"></a-asset-item>
<audio id="hoverSound" src="assets/sounds/hover.ogg"></audio>
<audio id="saberDraw" src="assets/sounds/saberDraw.ogg"></audio>
<img id="backglowTexture" src="assets/img/stage/backglow.png">
<img id="cursorMeshImg" src="assets/models/laser/laser.png">
@@ -89,7 +88,7 @@
<a-mixin id="gameoverAnimation" animation__gameover="dur: 1000; easing: easeOutQuad"></a-mixin>
<a-mixin id="mine" mixin="beat" beat="type: mine"></a-mixin>
<a-mixin id="wall" geometry wall material="shader: wall-shader; tex: #noiseTexture; repeat: 2 2; transparent: true; side: double">
<a-mixin id="badBeat"
geometry="primitive: plane"
material="shader: flat; transparent: true"
@@ -168,7 +167,6 @@
class="blade"
geometry="primitive: box; height: 0.9; depth: 0.02; width: 0.02"
material="shader: flat; color: {{ bladeColor }}"
play-sound="event: drawbladesound; sound: #saberDraw; volume: 0.5"
position="0 -0.55 0"></a-entity>
</a-entity>
<a-entity