diff --git a/examples/jsm/webxr/XRHandOculusMeshModel.js b/examples/jsm/webxr/XRHandOculusMeshModel.js index 8b931e385127a..a075a2fd6e82b 100644 --- a/examples/jsm/webxr/XRHandOculusMeshModel.js +++ b/examples/jsm/webxr/XRHandOculusMeshModel.js @@ -12,7 +12,7 @@ class XRHandOculusMeshModel { const low = options && options.model === "lowpoly" ? "_low" : ""; loader.setPath( path ); - loader.load( `fbx/OculusHand_${handedness === "right" ? "R" : "L"}${low}.fbx`, object => { + loader.load( `OculusHand_${handedness === "right" ? "R" : "L"}${low}.fbx`, object => { this.handModel.add( object ); // Hack because of the scale of the skinnedmesh diff --git a/examples/webxr_vr_handinput.html b/examples/webxr_vr_handinput.html index 92c20f4a85bb0..9f894e4c503d3 100644 --- a/examples/webxr_vr_handinput.html +++ b/examples/webxr_vr_handinput.html @@ -101,7 +101,7 @@ scene.add( controller2 ); var controllerModelFactory = new XRControllerModelFactory(); - var handModelFactory = new XRHandModelFactory().setPath( "./models/" ); + var handModelFactory = new XRHandModelFactory().setPath( "./models/fbx/" ); // Hand 1 controllerGrip1 = renderer.xr.getControllerGrip( 0 ); diff --git a/examples/webxr_vr_handinput_profiles.html b/examples/webxr_vr_handinput_profiles.html index b3e9c053a2347..459f70ea65792 100644 --- a/examples/webxr_vr_handinput_profiles.html +++ b/examples/webxr_vr_handinput_profiles.html @@ -103,7 +103,7 @@ scene.add( controller2 ); var controllerModelFactory = new XRControllerModelFactory(); - var handModelFactory = new XRHandModelFactory().setPath( "./models/" ); + var handModelFactory = new XRHandModelFactory().setPath( "./models/fbx/" ); // Hand 1 diff --git a/examples/webxr_vr_handinput_simple.html b/examples/webxr_vr_handinput_simple.html index badfc4cde311f..71e7626ec0ab3 100644 --- a/examples/webxr_vr_handinput_simple.html +++ b/examples/webxr_vr_handinput_simple.html @@ -91,7 +91,7 @@ scene.add( controller2 ); var controllerModelFactory = new XRControllerModelFactory(); - var handModelFactory = new XRHandModelFactory().setPath( "./models/" ); + var handModelFactory = new XRHandModelFactory().setPath( "./models/fbx/" ); // Hand 1 controllerGrip1 = renderer.xr.getControllerGrip( 0 ); diff --git a/src/renderers/webxr/WebXRController.js b/src/renderers/webxr/WebXRController.js index 0f7c73170981c..632cafbd0d0c7 100644 --- a/src/renderers/webxr/WebXRController.js +++ b/src/renderers/webxr/WebXRController.js @@ -1,9 +1,9 @@ -import { Group } from '../../objects/Group.js'; - /** * @author Mugen87 / https://github.com/Mugen87 */ +import { Group } from '../../objects/Group.js'; + function WebXRController() { this._targetRay = null; @@ -142,6 +142,7 @@ Object.assign( WebXRController.prototype, { if ( inputSource.hand ) { handPose = true; + for ( let i = 0; i <= window.XRHand.LITTLE_PHALANX_TIP; i ++ ) { if ( inputSource.hand[ i ] ) { @@ -169,6 +170,7 @@ Object.assign( WebXRController.prototype, { const distanceToPinch = 0.02; const threshold = 0.005; + if ( hand.inputState.pinching && distance > distanceToPinch + threshold ) { hand.inputState.pinching = false;