diff --git a/build/three.js b/build/three.js index 79f729805eabd4a816a4295136d0ee0e5c3ad119..bcefd731e6d7e96476913e22b582a0da1243a2ee 100644 --- a/build/three.js +++ b/build/three.js @@ -185,7 +185,7 @@ } ); - var REVISION = '107'; + var REVISION = '108dev'; var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 }; var TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 }; var CullFaceNone = 0; @@ -4963,7 +4963,7 @@ this._y = Math.asin( clamp( m13, - 1, 1 ) ); - if ( Math.abs( m13 ) < 0.99999 ) { + if ( Math.abs( m13 ) < 0.9999999 ) { this._x = Math.atan2( - m23, m33 ); this._z = Math.atan2( - m12, m11 ); @@ -4979,7 +4979,7 @@ this._x = Math.asin( - clamp( m23, - 1, 1 ) ); - if ( Math.abs( m23 ) < 0.99999 ) { + if ( Math.abs( m23 ) < 0.9999999 ) { this._y = Math.atan2( m13, m33 ); this._z = Math.atan2( m21, m22 ); @@ -4995,7 +4995,7 @@ this._x = Math.asin( clamp( m32, - 1, 1 ) ); - if ( Math.abs( m32 ) < 0.99999 ) { + if ( Math.abs( m32 ) < 0.9999999 ) { this._y = Math.atan2( - m31, m33 ); this._z = Math.atan2( - m12, m22 ); @@ -5011,7 +5011,7 @@ this._y = Math.asin( - clamp( m31, - 1, 1 ) ); - if ( Math.abs( m31 ) < 0.99999 ) { + if ( Math.abs( m31 ) < 0.9999999 ) { this._x = Math.atan2( m32, m33 ); this._z = Math.atan2( m21, m11 ); @@ -5027,7 +5027,7 @@ this._z = Math.asin( clamp( m21, - 1, 1 ) ); - if ( Math.abs( m21 ) < 0.99999 ) { + if ( Math.abs( m21 ) < 0.9999999 ) { this._x = Math.atan2( - m23, m22 ); this._y = Math.atan2( - m31, m11 ); @@ -5043,7 +5043,7 @@ this._z = Math.asin( - clamp( m12, - 1, 1 ) ); - if ( Math.abs( m12 ) < 0.99999 ) { + if ( Math.abs( m12 ) < 0.9999999 ) { this._x = Math.atan2( m32, m22 ); this._y = Math.atan2( m13, m11 ); @@ -20163,13 +20163,17 @@ setTest: function ( stencilTest ) { - if ( stencilTest ) { + if ( ! locked ) { - enable( 2960 ); + if ( stencilTest ) { - } else { + enable( 2960 ); + + } else { - disable( 2960 ); + disable( 2960 ); + + } } diff --git a/build/three.min.js b/build/three.min.js index 771edccb71056d4233a24317d6045bba8ac62fdc..807cdd54703442f1223125797caa6e28edacbc97 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -109,8 +109,8 @@ e),y[c]=e)}function g(b){!0!==z[b]&&(a.enable(b),z[b]=!0)}function h(b){!1!==z[b b)}else switch(b){case 1:a.blendFuncSeparate(770,771,1,771);break;case 2:a.blendFunc(770,1);break;case 3:a.blendFunc(0,769);break;case 4:a.blendFunc(0,768);break;default:console.error("THREE.WebGLState: Invalid blending: ",b)}G=E=Lc=zb=null;F=b;Fa=r}}else{k=k||d;m=m||e;p=p||f;if(d!==lb||k!==ha)a.blendEquationSeparate(c.convert(d),c.convert(k)),lb=d,ha=k;if(e!==zb||f!==Lc||m!==E||p!==G)a.blendFuncSeparate(c.convert(e),c.convert(f),c.convert(m),c.convert(p)),zb=e,Lc=f,E=m,G=p;F=b;Fa=null}}function m(b){T!== b&&(b?a.frontFace(2304):a.frontFace(2305),T=b)}function r(b){0!==b?(g(2884),b!==Ha&&(1===b?a.cullFace(1029):2===b?a.cullFace(1028):a.cullFace(1032))):h(2884);Ha=b}function p(b,c,d){if(b){if(g(32823),Z!==c||Df!==d)a.polygonOffset(c,d),Z=c,Df=d}else h(32823)}function l(b){void 0===b&&(b=33984+B-1);C!==b&&(a.activeTexture(b),C=b)}var t=new function(){var b=!1,c=new ea,d=null,e=new ea(0,0,0,0);return{setMask:function(c){d===c||b||(a.colorMask(c,c,c,c),d=c)},setLocked:function(a){b=a},setClear:function(b, d,f,g,h){!0===h&&(b*=g,d*=g,f*=g);c.set(b,d,f,g);!1===e.equals(c)&&(a.clearColor(b,d,f,g),e.copy(c))},reset:function(){b=!1;d=null;e.set(-1,0,0,0)}}},q=new function(){var b=!1,c=null,d=null,e=null;return{setTest:function(a){a?g(2929):h(2929)},setMask:function(d){c===d||b||(a.depthMask(d),c=d)},setFunc:function(b){if(d!==b){if(b)switch(b){case 0:a.depthFunc(512);break;case 1:a.depthFunc(519);break;case 2:a.depthFunc(513);break;case 3:a.depthFunc(515);break;case 4:a.depthFunc(514);break;case 5:a.depthFunc(518); -break;case 6:a.depthFunc(516);break;case 7:a.depthFunc(517);break;default:a.depthFunc(515)}else a.depthFunc(515);d=b}},setLocked:function(a){b=a},setClear:function(b){e!==b&&(a.clearDepth(b),e=b)},reset:function(){b=!1;e=d=c=null}}},v=new function(){var b=!1,c=null,d=null,e=null,f=null,k=null,m=null,p=null,r=null;return{setTest:function(a){a?g(2960):h(2960)},setMask:function(d){c===d||b||(a.stencilMask(d),c=d)},setFunc:function(b,c,g){if(d!==b||e!==c||f!==g)a.stencilFunc(b,c,g),d=b,e=c,f=g},setOp:function(b, -c,d){if(k!==b||m!==c||p!==d)a.stencilOp(b,c,d),k=b,m=c,p=d},setLocked:function(a){b=a},setClear:function(b){r!==b&&(a.clearStencil(b),r=b)},reset:function(){b=!1;r=p=m=k=f=e=d=c=null}}},n=a.getParameter(34921),A=new Uint8Array(n),w=new Uint8Array(n),y=new Uint8Array(n),z={},H=null,xa=null,D=null,F=null,lb=null,zb=null,Lc=null,ha=null,E=null,G=null,Fa=!1,T=null,Ha=null,jf=null,Z=null,Df=null,B=a.getParameter(35661),I=!1;n=0;n=a.getParameter(7938);-1!==n.indexOf("WebGL")?(n=parseFloat(/^WebGL ([0-9])/.exec(n)[1]), +break;case 6:a.depthFunc(516);break;case 7:a.depthFunc(517);break;default:a.depthFunc(515)}else a.depthFunc(515);d=b}},setLocked:function(a){b=a},setClear:function(b){e!==b&&(a.clearDepth(b),e=b)},reset:function(){b=!1;e=d=c=null}}},v=new function(){var b=!1,c=null,d=null,e=null,f=null,k=null,m=null,p=null,r=null;return{setTest:function(a){b||(a?g(2960):h(2960))},setMask:function(d){c===d||b||(a.stencilMask(d),c=d)},setFunc:function(b,c,g){if(d!==b||e!==c||f!==g)a.stencilFunc(b,c,g),d=b,e=c,f=g}, +setOp:function(b,c,d){if(k!==b||m!==c||p!==d)a.stencilOp(b,c,d),k=b,m=c,p=d},setLocked:function(a){b=a},setClear:function(b){r!==b&&(a.clearStencil(b),r=b)},reset:function(){b=!1;r=p=m=k=f=e=d=c=null}}},n=a.getParameter(34921),A=new Uint8Array(n),w=new Uint8Array(n),y=new Uint8Array(n),z={},H=null,xa=null,D=null,F=null,lb=null,zb=null,Lc=null,ha=null,E=null,G=null,Fa=!1,T=null,Ha=null,jf=null,Z=null,Df=null,B=a.getParameter(35661),I=!1;n=0;n=a.getParameter(7938);-1!==n.indexOf("WebGL")?(n=parseFloat(/^WebGL ([0-9])/.exec(n)[1]), I=1<=n):-1!==n.indexOf("OpenGL ES")&&(n=parseFloat(/^OpenGL ES ([0-9])/.exec(n)[1]),I=2<=n);var C=null,J={},Q=new ea,N=new ea,K={};K[3553]=e(3553,3553,1);K[34067]=e(34067,34069,6);t.setClear(0,0,0,1);q.setClear(1);v.setClear(0);g(2929);q.setFunc(3);m(!1);r(1);g(2884);k(0);return{buffers:{color:t,depth:q,stencil:v},initAttributes:function(){for(var a=0,b=A.length;ac;c++)if(b[c]!==a[c])return!1;return!0},fromArray:function(a,b){void 0===b&&(b=0);for(var c=0;16>c;c++)this.elements[c]=a[c+b];return this},toArray:function(a,b){void 0===a&&(a=[]);void 0===b&&(b=0);var c=this.elements;a[b]=c[0];a[b+1]=c[1];a[b+2]=c[2];a[b+3]=c[3];a[b+4]=c[4];a[b+5]=c[5];a[b+6]=c[6];a[b+7]=c[7];a[b+8]=c[8];a[b+9]=c[9];a[b+10]=c[10];a[b+11]=c[11];a[b+12]=c[12];a[b+13]=c[13];a[b+14]=c[14];a[b+15]=c[15];return a}});var ie,je;vb.RotationOrders="XYZ YZX ZXY XZY YXZ ZYX".split(" "); vb.DefaultOrder="XYZ";Object.defineProperties(vb.prototype,{x:{get:function(){return this._x},set:function(a){this._x=a;this._onChangeCallback()}},y:{get:function(){return this._y},set:function(a){this._y=a;this._onChangeCallback()}},z:{get:function(){return this._z},set:function(a){this._z=a;this._onChangeCallback()}},order:{get:function(){return this._order},set:function(a){this._order=a;this._onChangeCallback()}}});Object.assign(vb.prototype,{isEuler:!0,set:function(a,b,c,d){this._x=a;this._y= -b;this._z=c;this._order=d||this._order;this._onChangeCallback();return this},clone:function(){return new this.constructor(this._x,this._y,this._z,this._order)},copy:function(a){this._x=a._x;this._y=a._y;this._z=a._z;this._order=a._order;this._onChangeCallback();return this},setFromRotationMatrix:function(a,b,c){var d=O.clamp,e=a.elements;a=e[0];var f=e[4],g=e[8],h=e[1],k=e[5],m=e[9],l=e[2],p=e[6];e=e[10];b=b||this._order;"XYZ"===b?(this._y=Math.asin(d(g,-1,1)),.99999>Math.abs(g)?(this._x=Math.atan2(-m, -e),this._z=Math.atan2(-f,a)):(this._x=Math.atan2(p,k),this._z=0)):"YXZ"===b?(this._x=Math.asin(-d(m,-1,1)),.99999>Math.abs(m)?(this._y=Math.atan2(g,e),this._z=Math.atan2(h,k)):(this._y=Math.atan2(-l,a),this._z=0)):"ZXY"===b?(this._x=Math.asin(d(p,-1,1)),.99999>Math.abs(p)?(this._y=Math.atan2(-l,e),this._z=Math.atan2(-f,k)):(this._y=0,this._z=Math.atan2(h,a))):"ZYX"===b?(this._y=Math.asin(-d(l,-1,1)),.99999>Math.abs(l)?(this._x=Math.atan2(p,e),this._z=Math.atan2(h,a)):(this._x=0,this._z=Math.atan2(-f, -k))):"YZX"===b?(this._z=Math.asin(d(h,-1,1)),.99999>Math.abs(h)?(this._x=Math.atan2(-m,k),this._y=Math.atan2(-l,a)):(this._x=0,this._y=Math.atan2(g,e))):"XZY"===b?(this._z=Math.asin(-d(f,-1,1)),.99999>Math.abs(f)?(this._x=Math.atan2(p,k),this._y=Math.atan2(g,a)):(this._x=Math.atan2(-m,e),this._y=0)):console.warn("THREE.Euler: .setFromRotationMatrix() given unsupported order: "+b);this._order=b;!1!==c&&this._onChangeCallback();return this},setFromQuaternion:function(a,b,c){void 0===ie&&(ie=new Q); +b;this._z=c;this._order=d||this._order;this._onChangeCallback();return this},clone:function(){return new this.constructor(this._x,this._y,this._z,this._order)},copy:function(a){this._x=a._x;this._y=a._y;this._z=a._z;this._order=a._order;this._onChangeCallback();return this},setFromRotationMatrix:function(a,b,c){var d=O.clamp,e=a.elements;a=e[0];var f=e[4],g=e[8],h=e[1],k=e[5],m=e[9],l=e[2],p=e[6];e=e[10];b=b||this._order;"XYZ"===b?(this._y=Math.asin(d(g,-1,1)),.9999999>Math.abs(g)?(this._x=Math.atan2(-m, +e),this._z=Math.atan2(-f,a)):(this._x=Math.atan2(p,k),this._z=0)):"YXZ"===b?(this._x=Math.asin(-d(m,-1,1)),.9999999>Math.abs(m)?(this._y=Math.atan2(g,e),this._z=Math.atan2(h,k)):(this._y=Math.atan2(-l,a),this._z=0)):"ZXY"===b?(this._x=Math.asin(d(p,-1,1)),.9999999>Math.abs(p)?(this._y=Math.atan2(-l,e),this._z=Math.atan2(-f,k)):(this._y=0,this._z=Math.atan2(h,a))):"ZYX"===b?(this._y=Math.asin(-d(l,-1,1)),.9999999>Math.abs(l)?(this._x=Math.atan2(p,e),this._z=Math.atan2(h,a)):(this._x=0,this._z=Math.atan2(-f, +k))):"YZX"===b?(this._z=Math.asin(d(h,-1,1)),.9999999>Math.abs(h)?(this._x=Math.atan2(-m,k),this._y=Math.atan2(-l,a)):(this._x=0,this._y=Math.atan2(g,e))):"XZY"===b?(this._z=Math.asin(-d(f,-1,1)),.9999999>Math.abs(f)?(this._x=Math.atan2(p,k),this._y=Math.atan2(g,a)):(this._x=Math.atan2(-m,e),this._y=0)):console.warn("THREE.Euler: .setFromRotationMatrix() given unsupported order: "+b);this._order=b;!1!==c&&this._onChangeCallback();return this},setFromQuaternion:function(a,b,c){void 0===ie&&(ie=new Q); ie.makeRotationFromQuaternion(a);return this.setFromRotationMatrix(ie,b,c)},setFromVector3:function(a,b){return this.set(a.x,a.y,a.z,b||this._order)},reorder:function(a){void 0===je&&(je=new da);je.setFromEuler(this);return this.setFromQuaternion(je,a)},equals:function(a){return a._x===this._x&&a._y===this._y&&a._z===this._z&&a._order===this._order},fromArray:function(a){this._x=a[0];this._y=a[1];this._z=a[2];void 0!==a[3]&&(this._order=a[3]);this._onChangeCallback();return this},toArray:function(a, b){void 0===a&&(a=[]);void 0===b&&(b=0);a[b]=this._x;a[b+1]=this._y;a[b+2]=this._z;a[b+3]=this._order;return a},toVector3:function(a){return a?a.set(this._x,this._y,this._z):new n(this._x,this._y,this._z)},_onChange:function(a){this._onChangeCallback=a;return this},_onChangeCallback:function(){}});Object.assign(oe.prototype,{set:function(a){this.mask=1<