Skip to content

hand-controls: rotates models to match WebXR definition (fix #4848) #5261

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 2 commits into from
Mar 20, 2023
Merged

hand-controls: rotates models to match WebXR definition (fix #4848) #5261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838ac20
hand-controls: rotates model to match WebXR definition
DougReeder Mar 17, 2023
1d54ec6
hand-controls: only rotates hands if hasWebXR true
DougReeder Mar 20, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/hand-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,18 @@ module.exports.Component = registerComponent('hand-controls', {
var handmodelUrl = MODEL_URLS[handModelStyle + hand.charAt(0).toUpperCase() + hand.slice(1)];
this.loader.load(handmodelUrl, function (gltf) {
var mesh = gltf.scene.children[0];
var handModelOrientation = hand === 'left' ? Math.PI / 2 : -Math.PI / 2;
var handModelOrientationZ = hand === 'left' ? Math.PI / 2 : -Math.PI / 2;
// The WebXR standard defines the grip space such that a cylinder held in a closed hand points
// along the Z axis. The models currently have such a cylinder point along the X-Axis.
var handModelOrientationX = el.sceneEl.hasWebXR ? -Math.PI / 2 : 0;
mesh.mixer = new THREE.AnimationMixer(mesh);
self.clips = gltf.animations;
el.setObject3D('mesh', mesh);

var handMaterial = mesh.children[1].material;
handMaterial.color = new THREE.Color(handColor);
mesh.position.set(0, 0, 0);
mesh.rotation.set(0, 0, handModelOrientation);
mesh.rotation.set(handModelOrientationX, 0, handModelOrientationZ);
el.setAttribute('magicleap-controls', controlConfiguration);
el.setAttribute('vive-controls', controlConfiguration);
el.setAttribute('oculus-touch-controls', controlConfiguration);
Expand Down