diff --git a/src/components/laser-controls.js b/src/components/laser-controls.js index 260e4629544..9198aa78660 100644 --- a/src/components/laser-controls.js +++ b/src/components/laser-controls.js @@ -93,11 +93,6 @@ registerComponent('laser-controls', { raycaster: {origin: {x: 0, y: 0.0005, z: 0}} }, - 'oculus-touch-controls': { - cursor: {downEvents: ['triggerdown'], upEvents: ['triggerup']}, - raycaster: {origin: {x: 0, y: 0, z: 0}} - }, - 'meta-touch-controls': { cursor: {downEvents: ['triggerdown'], upEvents: ['triggerup']}, raycaster: {origin: {x: 0, y: 0, z: 0}} diff --git a/src/components/meta-touch-controls.js b/src/components/meta-touch-controls.js index a015bc2e375..61359cf00d2 100644 --- a/src/components/meta-touch-controls.js +++ b/src/components/meta-touch-controls.js @@ -340,7 +340,7 @@ var componentConfig = { this.applyOffset(evt.detail.model); this.el.emit('controllermodelready', { - name: 'oculus-touch-controls', + name: 'meta-touch-controls', model: this.data.model, rayOrigin: this.displayModel[this.data.hand].rayOrigin });