Skip to content

Fix all controls to use id instead of idPrefix on tracked-controls #5774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmarcos merged 1 commit into from
Dec 15, 2025
Merged

Fix all controls to use id instead of idPrefix on tracked-controls #5774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/generic-tracked-controller-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export var Component = registerComponent('generic-tracked-controller-controls',
}
el.setAttribute('tracked-controls', {
hand: data.hand,
idPrefix: GAMEPAD_ID_PREFIX,
id: GAMEPAD_ID_PREFIX,
iterateControllerProfiles: true
});
if (!this.data.defaultModel) { return; }
Expand Down
2 changes: 1 addition & 1 deletion src/components/hp-mixed-reality-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export var Component = registerComponent('hp-mixed-reality-controls', {

el.setAttribute('tracked-controls', {
// TODO: verify expected behavior between reserved prefixes.
idPrefix: GAMEPAD_ID,
id: GAMEPAD_ID,
hand: data.hand,
controller: this.controllerIndex
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/magicleap-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export var Component = registerComponent('magicleap-controls', {

el.setAttribute('tracked-controls', {
// TODO: verify expected behavior between reserved prefixes.
idPrefix: GAMEPAD_ID_COMPOSITE,
id: GAMEPAD_ID_COMPOSITE,
hand: data.hand,
controller: this.controllerIndex
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/oculus-go-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export var Component = registerComponent('oculus-go-controls', {
var data = this.data;
el.setAttribute('tracked-controls', {
hand: data.hand,
idPrefix: GAMEPAD_ID_PREFIX
id: GAMEPAD_ID_PREFIX
});
if (!this.data.model) { return; }
this.el.setAttribute('gltf-model', OCULUS_GO_CONTROLLER_MODEL_URL);
Expand Down
2 changes: 1 addition & 1 deletion src/components/pico-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export var Component = registerComponent('pico-controls', {
var data = this.data;
el.setAttribute('tracked-controls', {
// TODO: verify expected behavior between reserved prefixes.
idPrefix: GAMEPAD_ID,
id: GAMEPAD_ID,
hand: data.hand,
controller: this.controllerIndex
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/tracked-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export var Component = registerComponent('tracked-controls', {
},

/**
* Handle update controller match criteria (such as `id`, `idPrefix`, `hand`, `controller`)
* Handle update controller match criteria (such as `id`, `hand`, `controller`)
*/
updateController: function () {
this.controller = controllerUtils.findMatchingControllerWebXR(
Expand Down
2 changes: 1 addition & 1 deletion src/components/valve-index-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export var Component = registerComponent('valve-index-controls', {

// If we have an OpenVR Gamepad, use the fixed mapping.
el.setAttribute('tracked-controls', {
idPrefix: GAMEPAD_ID_PREFIX,
id: GAMEPAD_ID_PREFIX,
// Hand IDs: 1 = right, 0 = left, 2 = anything else.
controller: data.hand === 'right' ? 1 : data.hand === 'left' ? 0 : 2,
hand: data.hand
Expand Down
2 changes: 1 addition & 1 deletion src/components/vive-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export var Component = registerComponent('vive-controls', {

// If we have an OpenVR Gamepad, use the fixed mapping.
el.setAttribute('tracked-controls', {
idPrefix: GAMEPAD_ID_PREFIX,
id: GAMEPAD_ID_PREFIX,
hand: data.hand,
controller: this.controllerIndex
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/vive-focus-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export var Component = registerComponent('vive-focus-controls', {
injectTrackedControls: function () {
var el = this.el;
el.setAttribute('tracked-controls', {
idPrefix: GAMEPAD_ID_PREFIX
id: GAMEPAD_ID_PREFIX
});
if (!this.data.model) { return; }
this.el.setAttribute('gltf-model', VIVE_FOCUS_CONTROLLER_MODEL_URL);
Expand Down
2 changes: 1 addition & 1 deletion src/components/windows-motion-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export var Component = registerComponent('windows-motion-controls', {
injectTrackedControls: function () {
var data = this.data;
this.el.setAttribute('tracked-controls', {
idPrefix: GAMEPAD_ID_PREFIX,
id: GAMEPAD_ID_PREFIX,
controller: data.pair,
hand: data.hand
});
Expand Down