Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docs/components/tracked-controls.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ This component elects the appropriate controller, applies pose to
the entity, observes buttons state and emits appropriate events. For non-6DOF controllers,
a primitive arm model is used to emulate positional data.

tracked-controls sets two components that handles different Web API versions for VR:

- tracked-controls-webvr
- tracked-controls-webxr

## Example

Note that due to recent browser-specific changes, Vive controllers may be returned
Expand Down
2 changes: 1 addition & 1 deletion docs/components/webxr.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ important that the viewer (camera) and controllers are consistent.
For consistency when used in components, this name is available as
`sceneEl.systems.webxr.sessionReferenceSpaceType`, and the corresponding
reference space object is available during the XR session as
`sceneEl.systems['tracked-controls-webxr'].referenceSpace`.
`sceneEl.systems['tracked-controls'].referenceSpace`.

### requiredFeatures

Expand Down
4 changes: 2 additions & 2 deletions examples/showcase/layer-cubemap/cubemap-switcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ AFRAME.registerComponent('cubemap-switcher', {
},

checkInput: function () {
var leftHandControls = this.leftHandEl.components['tracked-controls-webxr'];
var rightHandControls = this.rightHandEl.components['tracked-controls-webxr'];
var leftHandControls = this.leftHandEl.components['tracked-controls'];
var rightHandControls = this.rightHandEl.components['tracked-controls'];
if (leftHandControls) { leftHandControls.updateButtons(); }
if (rightHandControls) { rightHandControls.updateButtons(); }
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AFRAME.registerComponent('ar-controls', {
},

updateControllers: function () {
var controllers = this.el.systems['tracked-controls-webxr'].controllers;
var controllers = this.el.systems['tracked-controls'].controllers;
var i;
var xrSession = this.el.xrSession;
if (!xrSession) { return; }
Expand Down
2 changes: 1 addition & 1 deletion examples/showcase/tracked-controls/components/grab.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Updates its position to move along the controller.
*/
AFRAME.registerComponent('grab', {
after: ['tracked-controls-webxr'],
after: ['tracked-controls'],
before: ['aabb-collider'],
init: function () {
this.GRABBED_STATE = 'grabbed';
Expand Down
Loading