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

fix not being to have more than one trail in scene (fixes #80)

Browse Source
This commit is contained in:
Kevin Ngo
2018-10-10 04:32:21 -07:00
parent cd36389842
commit ec256a76ba
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/beat-loader.js
View File

@@ -122,7 +122,7 @@ AFRAME.registerComponent('beat-loader', {
this.beatsHeadStart -= delta; this.beatsHeadStart -= delta;
} }
} }
this.lastTime = lastTime + delta; this.lastTime = lastTime + delta;
}, },

5
src/components/trail.js
View File

@@ -1,7 +1,8 @@
AFRAME.registerComponent('trail', { AFRAME.registerComponent('trail', {
schema: { schema: {
color: {type: 'color'}, color: {type: 'color'},
enabled: {default: false} enabled: {default: false},
hand: {type: 'string'}
}, },
init: function () { init: function () {
@@ -61,7 +62,7 @@ AFRAME.registerComponent('trail', {
mesh.vertices = vertices; mesh.vertices = vertices;
//mesh.scale.set(0.4, 0.4, 0.4); //mesh.scale.set(0.4, 0.4, 0.4);
//mesh.rotation.set(0, 0, Math.PI / 2.0); //mesh.rotation.set(0, 0, Math.PI / 2.0);
this.el.sceneEl.setObject3D('trail', mesh); this.el.sceneEl.setObject3D(`trail__${this.data.hand}`, mesh);
}, },
addLayer: function (length) { addLayer: function (length) {

2
src/index.html
View File

@@ -136,7 +136,7 @@
saber-controls="hand: {{ hand }}" saber-controls="hand: {{ hand }}"
thumb-controls thumb-controls
thumb-controls-debug="enabled: false; hand: {{ hand }}; controllerType: vive-controls" thumb-controls-debug="enabled: false; hand: {{ hand }}; controllerType: vive-controls"
trail="color: {{ bladeColor }}"> trail="color: {{ bladeColor }}; hand: {{ hand }}">
<a-entity <a-entity
id="{{ hand }}Laser" id="{{ hand }}Laser"
bind__visible="activeHand === '{{ hand }}'" bind__visible="activeHand === '{{ hand }}'"