diff --git a/build/three.js b/build/three.js index 757123c7d22f1b6ba969d2366810d1569287a201..bfd08e8eae21445c3b71048c3746627aca9341e3 100644 --- a/build/three.js +++ b/build/three.js @@ -10930,7 +10930,7 @@ // - if ( faces.length === 0 ) { + if ( vertices.length > 0 && faces.length === 0 ) { console.error( 'THREE.DirectGeometry: Faceless geometries are not supported.' ); @@ -22664,7 +22664,8 @@ var animation = new WebGLAnimation(); animation.setAnimationLoop( onAnimationFrame ); - animation.setContext( window ); + + if ( typeof window !== 'undefined' ) animation.setContext( window ); this.setAnimationLoop = function ( callback ) { @@ -28957,7 +28958,7 @@ } - var shapes = font.generateShapes( text, parameters.size, parameters.curveSegments ); + var shapes = font.generateShapes( text, parameters.size ); // translate parameters to ExtrudeGeometry API @@ -30239,7 +30240,7 @@ - var Geometries = /*#__PURE__*/Object.freeze({ + var Geometries = Object.freeze({ WireframeGeometry: WireframeGeometry, ParametricGeometry: ParametricGeometry, ParametricBufferGeometry: ParametricBufferGeometry, @@ -31009,7 +31010,7 @@ - var Materials = /*#__PURE__*/Object.freeze({ + var Materials = Object.freeze({ ShadowMaterial: ShadowMaterial, SpriteMaterial: SpriteMaterial, RawShaderMaterial: RawShaderMaterial, @@ -31688,7 +31689,6 @@ * @author mrdoob / http://mrdoob.com/ */ - function ImageLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -31791,7 +31791,6 @@ * @author mrdoob / http://mrdoob.com/ */ - function CubeTextureLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -31862,7 +31861,6 @@ * @author mrdoob / http://mrdoob.com/ */ - function TextureLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -32583,7 +32581,9 @@ // var tmp = new Vector3(); - var px = new CubicPoly(), py = new CubicPoly(), pz = new CubicPoly(); + var px = new CubicPoly(); + var py = new CubicPoly(); + var pz = new CubicPoly(); function CatmullRomCurve3( points, closed, curveType, tension ) { @@ -33368,7 +33368,7 @@ - var Curves = /*#__PURE__*/Object.freeze({ + var Curves = Object.freeze({ ArcCurve: ArcCurve, CatmullRomCurve3: CatmullRomCurve3, CubicBezierCurve: CubicBezierCurve, @@ -38146,7 +38146,6 @@ * @author thespite / http://clicktorelease.com/ */ - function ImageBitmapLoader( manager ) { if ( typeof createImageBitmap === 'undefined' ) { @@ -38532,7 +38531,6 @@ * @author mrdoob / http://mrdoob.com/ */ - function Font( data ) { this.type = 'Font'; @@ -38545,13 +38543,12 @@ isFont: true, - generateShapes: function ( text, size, divisions ) { + generateShapes: function ( text, size ) { if ( size === undefined ) size = 100; - if ( divisions === undefined ) divisions = 4; var shapes = []; - var paths = createPaths( text, size, divisions, this.data ); + var paths = createPaths( text, size, this.data ); for ( var p = 0, pl = paths.length; p < pl; p ++ ) { @@ -38565,7 +38562,7 @@ } ); - function createPaths( text, size, divisions, data ) { + function createPaths( text, size, data ) { var chars = Array.from ? Array.from( text ) : String( text ).split( '' ); // see #13988 var scale = size / data.resolution; @@ -38586,7 +38583,7 @@ } else { - var ret = createPath( char, divisions, scale, offsetX, offsetY, data ); + var ret = createPath( char, scale, offsetX, offsetY, data ); offsetX += ret.offsetX; paths.push( ret.path ); @@ -38598,7 +38595,7 @@ } - function createPath( char, divisions, scale, offsetX, offsetY, data ) { + function createPath( char, scale, offsetX, offsetY, data ) { var glyph = data.glyphs[ char ] || data.glyphs[ '?' ]; @@ -44574,7 +44571,8 @@ * headWidth - Number */ - var lineGeometry, coneGeometry; + var lineGeometry; + var coneGeometry; function ArrowHelper( dir, origin, length, color, headLength, headWidth ) { diff --git a/build/three.min.js b/build/three.min.js index 0175378fb7ca5d81b358a8bb3ff0040385a53e57..492dddb192ee2694d56aee35c24d4fe042c88692 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -187,9 +187,9 @@ else{Z.initAttributes();l=c.attributes;h=h.getAttributes();var r=d.defaultAttrib D.bindBuffer(D.ARRAY_BUFFER,z);D.vertexAttribPointer(k,u,w,t,H*p,q*p)}else q.isInstancedBufferAttribute?(Z.enableAttributeAndDivisor(k,q.meshPerAttribute),void 0===c.maxInstancedCount&&(c.maxInstancedCount=q.meshPerAttribute*q.count)):Z.enableAttribute(k),D.bindBuffer(D.ARRAY_BUFFER,z),D.vertexAttribPointer(k,u,w,t,0,0)}}else if(void 0!==r&&(t=r[C],void 0!==t))switch(t.length){case 2:D.vertexAttrib2fv(k,t);break;case 3:D.vertexAttrib3fv(k,t);break;case 4:D.vertexAttrib4fv(k,t);break;default:D.vertexAttrib1fv(k, t)}}}Z.disableUnusedAttributes()}null!==g&&D.bindBuffer(D.ELEMENT_ARRAY_BUFFER,v.buffer)}v=Infinity;null!==g?v=g.count:void 0!==m&&(v=m.count);g=c.drawRange.start*b;m=null!==f?f.start*b:0;var C=Math.max(g,m);f=Math.max(0,Math.min(v,g+c.drawRange.count*b,m+(null!==f?f.count*b:Infinity))-1-C+1);if(0!==f){if(e.isMesh)if(!0===d.wireframe)Z.setLineWidth(d.wireframeLinewidth*(null===G?Y:1)),a.setMode(D.LINES);else switch(e.drawMode){case 0:a.setMode(D.TRIANGLES);break;case 1:a.setMode(D.TRIANGLE_STRIP); break;case 2:a.setMode(D.TRIANGLE_FAN)}else e.isLine?(d=d.linewidth,void 0===d&&(d=1),Z.setLineWidth(d*(null===G?Y:1)),e.isLineSegments?a.setMode(D.LINES):e.isLineLoop?a.setMode(D.LINE_LOOP):a.setMode(D.LINE_STRIP)):e.isPoints&&a.setMode(D.POINTS);c&&c.isInstancedBufferGeometry?0=Ra.maxTextures&&console.warn("THREE.WebGLRenderer: Trying to use "+ +0;c=Ra.maxTextures&&console.warn("THREE.WebGLRenderer: Trying to use "+ a+" texture units while this GPU supports only "+Ra.maxTextures);ca+=1;return a};this.setTexture2D=function(){var a=!1;return function(b,c){b&&b.isWebGLRenderTarget&&(a||(console.warn("THREE.WebGLRenderer.setTexture2D: don't use render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);hb.setTexture2D(b,c)}}();this.setTexture=function(){var a=!1;return function(b,c){a||(console.warn("THREE.WebGLRenderer: .setTexture is deprecated, use setTexture2D instead."),a=!0);hb.setTexture2D(b, c)}}();this.setTextureCube=function(){var a=!1;return function(b,c){b&&b.isWebGLRenderTargetCube&&(a||(console.warn("THREE.WebGLRenderer.setTextureCube: don't use cube render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);b&&b.isCubeTexture||Array.isArray(b.image)&&6===b.image.length?hb.setTextureCube(b,c):hb.setTextureCubeDynamic(b,c)}}();this.setFramebuffer=function(a){I=a};this.getRenderTarget=function(){return G};this.setRenderTarget=function(a){(G=a)&&void 0=== Ba.get(a).__webglFramebuffer&&hb.setupRenderTarget(a);var b=I,c=!1;a?(b=Ba.get(a).__webglFramebuffer,a.isWebGLRenderTargetCube&&(b=b[a.activeCubeFace],c=!0),S.copy(a.viewport),T.copy(a.scissor),aa=a.scissorTest):(S.copy(ba).multiplyScalar(Y),T.copy(N).multiplyScalar(Y),aa=da);K!==b&&(D.bindFramebuffer(D.FRAMEBUFFER,b),K=b);Z.viewport(S);Z.scissor(T);Z.setScissorTest(aa);c&&(c=Ba.get(a.texture),D.framebufferTexture2D(D.FRAMEBUFFER,D.COLOR_ATTACHMENT0,D.TEXTURE_CUBE_MAP_POSITIVE_X+a.activeCubeFace, @@ -239,9 +239,9 @@ g(P[N],P[U],P[R]);A.push(ba);ca=ca.concat(ba)}for(U=0;UNumber.EPSILON){if(0>k&&(g=b[f],l=-l,h=b[e],k=-k),!(a.yh.y))if(a.y===g.y){if(a.x===g.x)return!0}else{e=k*(a.x-g.x)-l*(a.y-g.y);if(0===e)return!0;0>e||(d=!d)}}else if(a.y===g.y&&(h.x<=a.x&&a.x<=g.x||g.x<=a.x&&a.x<=h.x))return!0}return d}var e=Za.isClockWise,f=this.subPaths;if(0===f.length)return[]; if(!0===b)return c(f);b=[];if(1===f.length){var g=f[0];var h=new jb;h.curves=g.curves;b.push(h);return b}var l=!e(f[0].getPoints());l=a?!l:l;h=[];var k=[],p=[],n=0;k[n]=void 0;p[n]=[];for(var r=0,q=f.length;r 0 && faces.length === 0 ) { console.error( 'THREE.DirectGeometry: Faceless geometries are not supported.' ); @@ -22658,7 +22658,8 @@ function WebGLRenderer( parameters ) { var animation = new WebGLAnimation(); animation.setAnimationLoop( onAnimationFrame ); - animation.setContext( window ); + + if ( typeof window !== 'undefined' ) animation.setContext( window ); this.setAnimationLoop = function ( callback ) { @@ -28951,7 +28952,7 @@ function TextBufferGeometry( text, parameters ) { } - var shapes = font.generateShapes( text, parameters.size, parameters.curveSegments ); + var shapes = font.generateShapes( text, parameters.size ); // translate parameters to ExtrudeGeometry API @@ -30233,7 +30234,7 @@ CircleBufferGeometry.prototype.constructor = CircleBufferGeometry; -var Geometries = /*#__PURE__*/Object.freeze({ +var Geometries = Object.freeze({ WireframeGeometry: WireframeGeometry, ParametricGeometry: ParametricGeometry, ParametricBufferGeometry: ParametricBufferGeometry, @@ -31003,7 +31004,7 @@ LineDashedMaterial.prototype.copy = function ( source ) { -var Materials = /*#__PURE__*/Object.freeze({ +var Materials = Object.freeze({ ShadowMaterial: ShadowMaterial, SpriteMaterial: SpriteMaterial, RawShaderMaterial: RawShaderMaterial, @@ -31682,7 +31683,6 @@ Object.assign( DataTextureLoader.prototype, { * @author mrdoob / http://mrdoob.com/ */ - function ImageLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -31785,7 +31785,6 @@ Object.assign( ImageLoader.prototype, { * @author mrdoob / http://mrdoob.com/ */ - function CubeTextureLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -31856,7 +31855,6 @@ Object.assign( CubeTextureLoader.prototype, { * @author mrdoob / http://mrdoob.com/ */ - function TextureLoader( manager ) { this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; @@ -32577,7 +32575,9 @@ function CubicPoly() { // var tmp = new Vector3(); -var px = new CubicPoly(), py = new CubicPoly(), pz = new CubicPoly(); +var px = new CubicPoly(); +var py = new CubicPoly(); +var pz = new CubicPoly(); function CatmullRomCurve3( points, closed, curveType, tension ) { @@ -33362,7 +33362,7 @@ SplineCurve.prototype.fromJSON = function ( json ) { -var Curves = /*#__PURE__*/Object.freeze({ +var Curves = Object.freeze({ ArcCurve: ArcCurve, CatmullRomCurve3: CatmullRomCurve3, CubicBezierCurve: CubicBezierCurve, @@ -38140,7 +38140,6 @@ var TEXTURE_FILTER = { * @author thespite / http://clicktorelease.com/ */ - function ImageBitmapLoader( manager ) { if ( typeof createImageBitmap === 'undefined' ) { @@ -38526,7 +38525,6 @@ Object.assign( ShapePath.prototype, { * @author mrdoob / http://mrdoob.com/ */ - function Font( data ) { this.type = 'Font'; @@ -38539,13 +38537,12 @@ Object.assign( Font.prototype, { isFont: true, - generateShapes: function ( text, size, divisions ) { + generateShapes: function ( text, size ) { if ( size === undefined ) size = 100; - if ( divisions === undefined ) divisions = 4; var shapes = []; - var paths = createPaths( text, size, divisions, this.data ); + var paths = createPaths( text, size, this.data ); for ( var p = 0, pl = paths.length; p < pl; p ++ ) { @@ -38559,7 +38556,7 @@ Object.assign( Font.prototype, { } ); -function createPaths( text, size, divisions, data ) { +function createPaths( text, size, data ) { var chars = Array.from ? Array.from( text ) : String( text ).split( '' ); // see #13988 var scale = size / data.resolution; @@ -38580,7 +38577,7 @@ function createPaths( text, size, divisions, data ) { } else { - var ret = createPath( char, divisions, scale, offsetX, offsetY, data ); + var ret = createPath( char, scale, offsetX, offsetY, data ); offsetX += ret.offsetX; paths.push( ret.path ); @@ -38592,7 +38589,7 @@ function createPaths( text, size, divisions, data ) { } -function createPath( char, divisions, scale, offsetX, offsetY, data ) { +function createPath( char, scale, offsetX, offsetY, data ) { var glyph = data.glyphs[ char ] || data.glyphs[ '?' ]; @@ -44568,7 +44565,8 @@ PlaneHelper.prototype.updateMatrixWorld = function ( force ) { * headWidth - Number */ -var lineGeometry, coneGeometry; +var lineGeometry; +var coneGeometry; function ArrowHelper( dir, origin, length, color, headLength, headWidth ) {