super-three 0.141.0 → 0.147.0

package/examples/js/loaders/FontLoader.js

@@ -7,44 +7,30 @@
 			super( manager );
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
 			const loader = new THREE.FileLoader( this.manager );
 			loader.setPath( this.path );
 			loader.setRequestHeader( this.requestHeader );
-			loader.setWithCredentials( scope.withCredentials );
+			loader.setWithCredentials( this.withCredentials );
 			loader.load( url, function ( text ) {
 
-				let json;
-
-				try {
-
-					json = JSON.parse( text );
-
-				} catch ( e ) {
-
-					console.warn( 'THREE.FontLoader: typeface.js support is being deprecated. Use typeface.json instead.' );
-					json = JSON.parse( text.substring( 65, text.length - 2 ) );
-
-				}
-
-				const font = scope.parse( json );
+				const font = scope.parse( JSON.parse( text ) );
 				if ( onLoad ) onLoad( font );
 
 			}, onProgress, onError );
 
 		}
-
 		parse( json ) {
 
 			return new Font( json );
 
 		}
 
-	} //
+	}
 
+	//
 
 	class Font {
 
@@ -55,15 +41,13 @@
 			this.data = data;
 
 		}
-
 		generateShapes( text, size = 100 ) {
 
 			const shapes = [];
 			const paths = createPaths( text, size, this.data );
-
 			for ( let p = 0, pl = paths.length; p < pl; p ++ ) {
 
-				Array.prototype.push.apply( shapes, paths[ p ].toShapes() );
+				shapes.push( ...paths[ p ].toShapes() );
 
 			}
 
@@ -72,7 +56,6 @@
 		}
 
 	}
-
 	function createPaths( text, size, data ) {
 
 		const chars = Array.from( text );
@@ -81,11 +64,9 @@
 		const paths = [];
 		let offsetX = 0,
 			offsetY = 0;
-
 		for ( let i = 0; i < chars.length; i ++ ) {
 
 			const char = chars[ i ];
-
 			if ( char === '\n' ) {
 
 				offsetX = 0;
@@ -108,7 +89,6 @@
 	function createPath( char, scale, offsetX, offsetY, data ) {
 
 		const glyph = data.glyphs[ char ] || data.glyphs[ '?' ];
-
 		if ( ! glyph ) {
 
 			console.error( 'THREE.Font: character "' + char + '" does not exists in font family ' + data.familyName + '.' );
@@ -118,42 +98,40 @@
 
 		const path = new THREE.ShapePath();
 		let x, y, cpx, cpy, cpx1, cpy1, cpx2, cpy2;
-
 		if ( glyph.o ) {
 
 			const outline = glyph._cachedOutline || ( glyph._cachedOutline = glyph.o.split( ' ' ) );
-
 			for ( let i = 0, l = outline.length; i < l; ) {
 
 				const action = outline[ i ++ ];
-
 				switch ( action ) {
 
 					case 'm':
 						// moveTo
+
 						x = outline[ i ++ ] * scale + offsetX;
 						y = outline[ i ++ ] * scale + offsetY;
 						path.moveTo( x, y );
 						break;
-
 					case 'l':
 						// lineTo
+
 						x = outline[ i ++ ] * scale + offsetX;
 						y = outline[ i ++ ] * scale + offsetY;
 						path.lineTo( x, y );
 						break;
-
 					case 'q':
 						// quadraticCurveTo
+
 						cpx = outline[ i ++ ] * scale + offsetX;
 						cpy = outline[ i ++ ] * scale + offsetY;
 						cpx1 = outline[ i ++ ] * scale + offsetX;
 						cpy1 = outline[ i ++ ] * scale + offsetY;
 						path.quadraticCurveTo( cpx1, cpy1, cpx, cpy );
 						break;
-
 					case 'b':
 						// bezierCurveTo
+
 						cpx = outline[ i ++ ] * scale + offsetX;
 						cpy = outline[ i ++ ] * scale + offsetY;
 						cpx1 = outline[ i ++ ] * scale + offsetX;

package/examples/js/loaders/GCodeLoader.js

@@ -17,7 +17,6 @@
 			this.splitLayer = false;
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
@@ -50,7 +49,6 @@
 			}, onProgress, onError );
 
 		}
-
 		parse( data ) {
 
 			let state = {
@@ -72,7 +70,6 @@
 				color: 0x00FF00
 			} );
 			extrudingMaterial.name = 'extruded';
-
 			function newLayer( line ) {
 
 				currentLayer = {
@@ -82,9 +79,9 @@
 				};
 				layers.push( currentLayer );
 
-			} //Create lie segment between p1 and p2
-
+			}
 
+			//Create lie segment between p1 and p2
 			function addSegment( p1, p2 ) {
 
 				if ( currentLayer === undefined ) {
@@ -120,12 +117,12 @@
 			}
 
 			const lines = data.replace( /;.+/g, '' ).split( '\n' );
-
 			for ( let i = 0; i < lines.length; i ++ ) {
 
 				const tokens = lines[ i ].split( ' ' );
-				const cmd = tokens[ 0 ].toUpperCase(); //Argumments
+				const cmd = tokens[ 0 ].toUpperCase();
 
+				//Argumments
 				const args = {};
 				tokens.splice( 1 ).forEach( function ( token ) {
 
@@ -137,9 +134,10 @@
 
 					}
 
-				} ); //Process commands
-				//G0/G1 – Linear Movement
+				} );
 
+				//Process commands
+				//G0/G1 – Linear Movement
 				if ( cmd === 'G0' || cmd === 'G1' ) {
 
 					const line = {
@@ -148,12 +146,12 @@
 						z: args.z !== undefined ? absolute( state.z, args.z ) : state.z,
 						e: args.e !== undefined ? absolute( state.e, args.e ) : state.e,
 						f: args.f !== undefined ? absolute( state.f, args.f ) : state.f
-					}; //Layer change detection is or made by watching Z, it's made by watching when we extrude at a new Z position
+					};
 
+					//Layer change detection is or made by watching Z, it's made by watching when we extrude at a new Z position
 					if ( delta( state.e, line.e ) > 0 ) {
 
 						state.extruding = delta( state.e, line.e ) > 0;
-
 						if ( currentLayer == undefined || line.z != currentLayer.z ) {
 
 							newLayer( line );
@@ -165,7 +163,9 @@
 					addSegment( state, line );
 					state = line;
 
-				} else if ( cmd === 'G2' || cmd === 'G3' ) { //G2/G3 - Arc Movement ( G2 clock wise and G3 counter clock wise )
+				} else if ( cmd === 'G2' || cmd === 'G3' ) {
+
+					//G2/G3 - Arc Movement ( G2 clock wise and G3 counter clock wise )
 					//console.warn( 'THREE.GCodeLoader: Arc command not supported' );
 				} else if ( cmd === 'G90' ) {
 
@@ -186,7 +186,9 @@
 					line.z = args.z !== undefined ? args.z : line.z;
 					line.e = args.e !== undefined ? args.e : line.e;
 
-				} else { //console.warn( 'THREE.GCodeLoader: Command not supported:' + cmd );
+				} else {
+
+					//console.warn( 'THREE.GCodeLoader: Command not supported:' + cmd );
 				}
 
 			}
@@ -203,7 +205,6 @@
 
 			const object = new THREE.Group();
 			object.name = 'gcode';
-
 			if ( this.splitLayer ) {
 
 				for ( let i = 0; i < layers.length; i ++ ) {
@@ -218,13 +219,11 @@
 
 				const vertex = [],
 					pathVertex = [];
-
 				for ( let i = 0; i < layers.length; i ++ ) {
 
 					const layer = layers[ i ];
 					const layerVertex = layer.vertex;
 					const layerPathVertex = layer.pathVertex;
-
 					for ( let j = 0; j < layerVertex.length; j ++ ) {
 
 						vertex.push( layerVertex[ j ] );