Browse Source

Updated builds.

Mr.doob 7 years ago
parent
commit
65d6c6febc
3 changed files with 7 additions and 7 deletions
  1. 1 1
      build/three.js
  2. 5 5
      build/three.min.js
  3. 1 1
      build/three.module.js

+ 1 - 1
build/three.js

@@ -22003,7 +22003,7 @@
 
 
 					if ( inputPose !== null ) {
 					if ( inputPose !== null ) {
 
 
-						controller.matrix.elements = inputPose.gripMatrix;
+						controller.matrix.elements = inputPose.pointerMatrix;
 						controller.matrix.decompose( controller.position, controller.rotation, controller.scale );
 						controller.matrix.decompose( controller.position, controller.rotation, controller.scale );
 						controller.visible = true;
 						controller.visible = true;
 
 

+ 5 - 5
build/three.min.js

@@ -153,11 +153,11 @@ function(){b()&&e.submitFrame()};this.dispose=function(){"undefined"!==typeof wi
 h=null,l=null,n=null,y=[],m=[],t=new ba;t.layers.enable(1);t.viewport=new V;var q=new ba;q.layers.enable(2);q.viewport=new V;var k=new Ic([t,q]);k.layers.enable(1);k.layers.enable(2);this.enabled=!1;this.getController=function(a){var b=y[a];void 0===b&&(b=new Wb,b.matrixAutoUpdate=!1,b.visible=!1,y[a]=b);return b};this.getDevice=function(){return g};this.setDevice=function(a){void 0!==a&&(g=a);f.setCompatibleXRDevice(a)};this.setSession=function(b,e){h=b;null!==h&&(h.addEventListener("select",c),
 h=null,l=null,n=null,y=[],m=[],t=new ba;t.layers.enable(1);t.viewport=new V;var q=new ba;q.layers.enable(2);q.viewport=new V;var k=new Ic([t,q]);k.layers.enable(1);k.layers.enable(2);this.enabled=!1;this.getController=function(a){var b=y[a];void 0===b&&(b=new Wb,b.matrixAutoUpdate=!1,b.visible=!1,y[a]=b);return b};this.getDevice=function(){return g};this.setDevice=function(a){void 0!==a&&(g=a);f.setCompatibleXRDevice(a)};this.setSession=function(b,e){h=b;null!==h&&(h.addEventListener("select",c),
 h.addEventListener("selectstart",c),h.addEventListener("selectend",c),h.addEventListener("end",d),h.baseLayer=new XRWebGLLayer(h,f),h.requestFrameOfReference(e.frameOfReferenceType).then(function(b){l=b;a.setFramebuffer(h.baseLayer.framebuffer);p.setContext(h);p.start()}),m=h.getInputSources(),h.addEventListener("inputsourceschange",function(){m=h.getInputSources();console.log(m)}))};this.getCamera=function(a){if(b()){var c=a.parent,d=k.cameras;e(k,c);for(var f=0;f<d.length;f++)e(d[f],c);a.matrixWorld.copy(k.matrixWorld);
 h.addEventListener("selectstart",c),h.addEventListener("selectend",c),h.addEventListener("end",d),h.baseLayer=new XRWebGLLayer(h,f),h.requestFrameOfReference(e.frameOfReferenceType).then(function(b){l=b;a.setFramebuffer(h.baseLayer.framebuffer);p.setContext(h);p.start()}),m=h.getInputSources(),h.addEventListener("inputsourceschange",function(){m=h.getInputSources();console.log(m)}))};this.getCamera=function(a){if(b()){var c=a.parent,d=k.cameras;e(k,c);for(var f=0;f<d.length;f++)e(d[f],c);a.matrixWorld.copy(k.matrixWorld);
 a=a.children;f=0;for(c=a.length;f<c;f++)a[f].updateMatrixWorld(!0);return k}return a};this.isPresenting=b;var u=null,p=new Vd;p.setAnimationLoop(function(a,b){n=b.getDevicePose(l);if(null!==n)for(var c=h.baseLayer,d=b.views,e=0;e<d.length;e++){var f=d[e],g=c.getViewport(f),t=n.getViewMatrix(f),q=k.cameras[e];q.matrix.fromArray(t).getInverse(q.matrix);q.projectionMatrix.fromArray(f.projectionMatrix);q.viewport.set(g.x,g.y,g.width,g.height);0===e&&(k.matrix.copy(q.matrix),k.projectionMatrix.copy(q.projectionMatrix))}for(e=
 a=a.children;f=0;for(c=a.length;f<c;f++)a[f].updateMatrixWorld(!0);return k}return a};this.isPresenting=b;var u=null,p=new Vd;p.setAnimationLoop(function(a,b){n=b.getDevicePose(l);if(null!==n)for(var c=h.baseLayer,d=b.views,e=0;e<d.length;e++){var f=d[e],g=c.getViewport(f),t=n.getViewMatrix(f),q=k.cameras[e];q.matrix.fromArray(t).getInverse(q.matrix);q.projectionMatrix.fromArray(f.projectionMatrix);q.viewport.set(g.x,g.y,g.width,g.height);0===e&&(k.matrix.copy(q.matrix),k.projectionMatrix.copy(q.projectionMatrix))}for(e=
-0;e<y.length;e++){c=y[e];if(d=m[e])if(d=b.getInputPose(d,l),null!==d){c.matrix.elements=d.gripMatrix;c.matrix.decompose(c.position,c.rotation,c.scale);c.visible=!0;continue}c.visible=!1}u&&u(a)});this.setAnimationLoop=function(a){u=a};this.dispose=function(){};this.getStandingMatrix=function(){console.warn("THREE.WebXRManager: getStandingMatrix() is no longer needed.");return new THREE.Matrix4};this.submitFrame=function(){}}function $d(a){function b(){ka=new Of(F);ka.get("WEBGL_depth_texture");ka.get("OES_texture_float");
-ka.get("OES_texture_float_linear");ka.get("OES_texture_half_float");ka.get("OES_texture_half_float_linear");ka.get("OES_standard_derivatives");ka.get("OES_element_index_uint");ka.get("ANGLE_instanced_arrays");ha=new $e(F,ka);Sa=new Mf(F,ka,a);Y=new Kg(F,ka,ha);Y.scissor(W.copy(N).multiplyScalar(aa));Y.viewport(gb.copy(ea).multiplyScalar(aa));kb=new Rf(F);Ba=new zg;lb=new Lg(F,ka,Y,Ba,Sa,ha,kb);oa=new Ff(F);ta=new Pf(F,oa,kb);pa=new Uf(ta,kb);wa=new Tf(F);ma=new yg(z,ka,Sa);sa=new Dg;qa=new Ig;ja=
-new Kf(z,Y,pa,D);xa=new Lf(F,ka,kb);ya=new Qf(F,ka,kb);za=new Jg(z,F,Y,lb,Sa);kb.programs=ma.programs;z.context=F;z.capabilities=Sa;z.extensions=ka;z.properties=Ba;z.renderLists=sa;z.state=Y;z.info=kb}function c(a){a.preventDefault();console.log("THREE.WebGLRenderer: Context Lost.");G=!0}function d(){console.log("THREE.WebGLRenderer: Context Restored.");G=!1;b()}function e(a){a=a.target;a.removeEventListener("dispose",e);f(a);Ba.remove(a)}function f(a){var b=Ba.get(a).program;a.program=void 0;void 0!==
-b&&ma.releaseProgram(b)}function g(a,b,c){a.render(function(a){z.renderBufferImmediate(a,b,c)})}function h(a,b,c){if(!1!==a.visible){if(a.layers.test(b.layers))if(a.isLight)A.pushLight(a),a.castShadow&&A.pushShadow(a);else if(a.isSprite)a.frustumCulled&&!da.intersectsSprite(a)||A.pushSprite(a);else if(a.isImmediateRenderObject)c&&Vb.setFromMatrixPosition(a.matrixWorld).applyMatrix4(fa),K.push(a,null,a.material,Vb.z,null);else if(a.isMesh||a.isLine||a.isPoints)if(a.isSkinnedMesh&&a.skeleton.update(),
-!a.frustumCulled||da.intersectsObject(a)){c&&Vb.setFromMatrixPosition(a.matrixWorld).applyMatrix4(fa);var d=pa.update(a),e=a.material;if(Array.isArray(e))for(var f=d.groups,g=0,l=f.length;g<l;g++){var n=f[g],m=e[n.materialIndex];m&&m.visible&&K.push(a,d,m,Vb.z,n)}else e.visible&&K.push(a,d,e,Vb.z,null)}a=a.children;g=0;for(l=a.length;g<l;g++)h(a[g],b,c)}}function l(a,b,c,d){for(var e=0,f=a.length;e<f;e++){var g=a[e],h=g.object,l=g.geometry,m=void 0===d?g.material:d;g=g.group;if(c.isArrayCamera){M=
+0;e<y.length;e++){c=y[e];if(d=m[e])if(d=b.getInputPose(d,l),null!==d){c.matrix.elements=d.pointerMatrix;c.matrix.decompose(c.position,c.rotation,c.scale);c.visible=!0;continue}c.visible=!1}u&&u(a)});this.setAnimationLoop=function(a){u=a};this.dispose=function(){};this.getStandingMatrix=function(){console.warn("THREE.WebXRManager: getStandingMatrix() is no longer needed.");return new THREE.Matrix4};this.submitFrame=function(){}}function $d(a){function b(){ka=new Of(F);ka.get("WEBGL_depth_texture");
+ka.get("OES_texture_float");ka.get("OES_texture_float_linear");ka.get("OES_texture_half_float");ka.get("OES_texture_half_float_linear");ka.get("OES_standard_derivatives");ka.get("OES_element_index_uint");ka.get("ANGLE_instanced_arrays");ha=new $e(F,ka);Sa=new Mf(F,ka,a);Y=new Kg(F,ka,ha);Y.scissor(W.copy(N).multiplyScalar(aa));Y.viewport(gb.copy(ea).multiplyScalar(aa));kb=new Rf(F);Ba=new zg;lb=new Lg(F,ka,Y,Ba,Sa,ha,kb);oa=new Ff(F);ta=new Pf(F,oa,kb);pa=new Uf(ta,kb);wa=new Tf(F);ma=new yg(z,ka,
+Sa);sa=new Dg;qa=new Ig;ja=new Kf(z,Y,pa,D);xa=new Lf(F,ka,kb);ya=new Qf(F,ka,kb);za=new Jg(z,F,Y,lb,Sa);kb.programs=ma.programs;z.context=F;z.capabilities=Sa;z.extensions=ka;z.properties=Ba;z.renderLists=sa;z.state=Y;z.info=kb}function c(a){a.preventDefault();console.log("THREE.WebGLRenderer: Context Lost.");G=!0}function d(){console.log("THREE.WebGLRenderer: Context Restored.");G=!1;b()}function e(a){a=a.target;a.removeEventListener("dispose",e);f(a);Ba.remove(a)}function f(a){var b=Ba.get(a).program;
+a.program=void 0;void 0!==b&&ma.releaseProgram(b)}function g(a,b,c){a.render(function(a){z.renderBufferImmediate(a,b,c)})}function h(a,b,c){if(!1!==a.visible){if(a.layers.test(b.layers))if(a.isLight)A.pushLight(a),a.castShadow&&A.pushShadow(a);else if(a.isSprite)a.frustumCulled&&!da.intersectsSprite(a)||A.pushSprite(a);else if(a.isImmediateRenderObject)c&&Vb.setFromMatrixPosition(a.matrixWorld).applyMatrix4(fa),K.push(a,null,a.material,Vb.z,null);else if(a.isMesh||a.isLine||a.isPoints)if(a.isSkinnedMesh&&
+a.skeleton.update(),!a.frustumCulled||da.intersectsObject(a)){c&&Vb.setFromMatrixPosition(a.matrixWorld).applyMatrix4(fa);var d=pa.update(a),e=a.material;if(Array.isArray(e))for(var f=d.groups,g=0,l=f.length;g<l;g++){var n=f[g],m=e[n.materialIndex];m&&m.visible&&K.push(a,d,m,Vb.z,n)}else e.visible&&K.push(a,d,e,Vb.z,null)}a=a.children;g=0;for(l=a.length;g<l;g++)h(a[g],b,c)}}function l(a,b,c,d){for(var e=0,f=a.length;e<f;e++){var g=a[e],h=g.object,l=g.geometry,m=void 0===d?g.material:d;g=g.group;if(c.isArrayCamera){M=
 c;for(var y=c.cameras,t=0,k=y.length;t<k;t++){var q=y[t];if(h.layers.test(q.layers)){if("viewport"in q)Y.viewport(gb.copy(q.viewport));else{var r=q.bounds;Y.viewport(gb.set(r.x*ab,r.y*U,r.z*ab,r.w*U).multiplyScalar(aa))}n(h,b,q,l,m,g)}}}else M=null,n(h,b,c,l,m,g)}}function n(a,b,c,d,e,f){a.onBeforeRender(z,b,c,d,e,f);A=qa.get(b,M||c);a.modelViewMatrix.multiplyMatrices(c.matrixWorldInverse,a.matrixWorld);a.normalMatrix.getNormalMatrix(a.modelViewMatrix);if(a.isImmediateRenderObject){var h=a.isMesh&&
 c;for(var y=c.cameras,t=0,k=y.length;t<k;t++){var q=y[t];if(h.layers.test(q.layers)){if("viewport"in q)Y.viewport(gb.copy(q.viewport));else{var r=q.bounds;Y.viewport(gb.set(r.x*ab,r.y*U,r.z*ab,r.w*U).multiplyScalar(aa))}n(h,b,q,l,m,g)}}}else M=null,n(h,b,c,l,m,g)}}function n(a,b,c,d,e,f){a.onBeforeRender(z,b,c,d,e,f);A=qa.get(b,M||c);a.modelViewMatrix.multiplyMatrices(c.matrixWorldInverse,a.matrixWorld);a.normalMatrix.getNormalMatrix(a.modelViewMatrix);if(a.isImmediateRenderObject){var h=a.isMesh&&
 0>a.matrixWorld.determinant();Y.setMaterial(e,h);h=m(c,b.fog,e,a);I="";g(a,h,e)}else z.renderBufferDirect(c,b.fog,d,e,a,f);a.onAfterRender(z,b,c,d,e,f);A=qa.get(b,M||c)}function y(a,b,c){var d=Ba.get(a),g=A.state.lights;c=ma.getParameters(a,g.state,A.state.shadowsArray,b,S.numPlanes,S.numIntersection,c);var h=ma.getProgramCode(a,c),l=d.program,n=!0;if(void 0===l)a.addEventListener("dispose",e);else if(l.code!==h)f(a);else{if(d.lightsHash!==g.state.hash)Ba.update(a,"lightsHash",g.state.hash);else if(void 0!==
 0>a.matrixWorld.determinant();Y.setMaterial(e,h);h=m(c,b.fog,e,a);I="";g(a,h,e)}else z.renderBufferDirect(c,b.fog,d,e,a,f);a.onAfterRender(z,b,c,d,e,f);A=qa.get(b,M||c)}function y(a,b,c){var d=Ba.get(a),g=A.state.lights;c=ma.getParameters(a,g.state,A.state.shadowsArray,b,S.numPlanes,S.numIntersection,c);var h=ma.getProgramCode(a,c),l=d.program,n=!0;if(void 0===l)a.addEventListener("dispose",e);else if(l.code!==h)f(a);else{if(d.lightsHash!==g.state.hash)Ba.update(a,"lightsHash",g.state.hash);else if(void 0!==
 c.shaderID)return;n=!1}n&&(c.shaderID?(l=xb[c.shaderID],d.shader={name:a.type,uniforms:Ca.clone(l.uniforms),vertexShader:l.vertexShader,fragmentShader:l.fragmentShader}):d.shader={name:a.type,uniforms:a.uniforms,vertexShader:a.vertexShader,fragmentShader:a.fragmentShader},a.onBeforeCompile(d.shader,z),l=ma.acquireProgram(a,d.shader,c,h),d.program=l,a.program=l);c=l.getAttributes();if(a.morphTargets)for(h=a.numSupportedMorphTargets=0;h<z.maxMorphTargets;h++)0<=c["morphTarget"+h]&&a.numSupportedMorphTargets++;
 c.shaderID)return;n=!1}n&&(c.shaderID?(l=xb[c.shaderID],d.shader={name:a.type,uniforms:Ca.clone(l.uniforms),vertexShader:l.vertexShader,fragmentShader:l.fragmentShader}):d.shader={name:a.type,uniforms:a.uniforms,vertexShader:a.vertexShader,fragmentShader:a.fragmentShader},a.onBeforeCompile(d.shader,z),l=ma.acquireProgram(a,d.shader,c,h),d.program=l,a.program=l);c=l.getAttributes();if(a.morphTargets)for(h=a.numSupportedMorphTargets=0;h<z.maxMorphTargets;h++)0<=c["morphTarget"+h]&&a.numSupportedMorphTargets++;

+ 1 - 1
build/three.module.js

@@ -21997,7 +21997,7 @@ function WebXRManager( renderer ) {
 
 
 				if ( inputPose !== null ) {
 				if ( inputPose !== null ) {
 
 
-					controller.matrix.elements = inputPose.gripMatrix;
+					controller.matrix.elements = inputPose.pointerMatrix;
 					controller.matrix.decompose( controller.position, controller.rotation, controller.scale );
 					controller.matrix.decompose( controller.position, controller.rotation, controller.scale );
 					controller.visible = true;
 					controller.visible = true;