@needle-tools/three 0.145.4 → 0.146.2

package/examples/js/loaders/AMFLoader.js

@@ -23,7 +23,6 @@
 			super( manager );
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
@@ -57,20 +56,17 @@
 			}, onProgress, onError );
 
 		}
-
 		parse( data ) {
 
 			function loadDocument( data ) {
 
 				let view = new DataView( data );
 				const magic = String.fromCharCode( view.getUint8( 0 ), view.getUint8( 1 ) );
-
 				if ( magic === 'PK' ) {
 
 					let zip = null;
 					let file = null;
 					console.log( 'THREE.AMFLoader: Loading Zip' );
-
 					try {
 
 						zip = fflate.unzipSync( new Uint8Array( data ) ); // eslint-disable-line no-undef
@@ -103,7 +99,6 @@
 
 				const fileText = THREE.LoaderUtils.decodeText( view );
 				const xmlData = new DOMParser().parseFromString( fileText, 'application/xml' );
-
 				if ( xmlData.documentElement.nodeName.toLowerCase() !== 'amf' ) {
 
 					console.log( 'THREE.AMFLoader: Error loading AMF - no AMF document found.' );
@@ -119,7 +114,6 @@
 
 				let scale = 1.0;
 				let unit = 'millimeter';
-
 				if ( node.documentElement.attributes.unit !== undefined ) {
 
 					unit = node.documentElement.attributes.unit.value.toLowerCase();
@@ -133,7 +127,6 @@
 					meter: 1000.0,
 					micron: 0.001
 				};
-
 				if ( scaleUnits[ unit ] !== undefined ) {
 
 					scale = scaleUnits[ unit ];
@@ -156,11 +149,9 @@
 					a: 1.0
 				};
 				let loadedMaterial = null;
-
 				for ( let i = 0; i < node.childNodes.length; i ++ ) {
 
 					const matChildEl = node.childNodes[ i ];
-
 					if ( matChildEl.nodeName === 'metadata' && matChildEl.attributes.type !== undefined ) {
 
 						if ( matChildEl.attributes.type.value === 'name' ) {
@@ -182,7 +173,6 @@
 					color: new THREE.Color( color.r, color.g, color.b ),
 					name: matName
 				} );
-
 				if ( color.a !== 1.0 ) {
 
 					loadedMaterial.transparent = true;
@@ -205,11 +195,9 @@
 					b: 1.0,
 					a: 1.0
 				};
-
 				for ( let i = 0; i < node.childNodes.length; i ++ ) {
 
 					const matColor = node.childNodes[ i ];
-
 					if ( matColor.nodeName === 'r' ) {
 
 						color.r = matColor.textContent;
@@ -242,7 +230,6 @@
 					materialid: null
 				};
 				let currVolumeNode = node.firstElementChild;
-
 				if ( node.attributes.materialid !== undefined ) {
 
 					volume.materialId = node.attributes.materialid.nodeValue;
@@ -285,13 +272,11 @@
 				const vertArray = [];
 				const normalArray = [];
 				let currVerticesNode = node.firstElementChild;
-
 				while ( currVerticesNode ) {
 
 					if ( currVerticesNode.nodeName === 'vertex' ) {
 
 						let vNode = currVerticesNode.firstElementChild;
-
 						while ( vNode ) {
 
 							if ( vNode.nodeName === 'coordinates' ) {
@@ -336,7 +321,6 @@
 				};
 				let currColor = null;
 				let currObjNode = node.firstElementChild;
-
 				while ( currObjNode ) {
 
 					if ( currObjNode.nodeName === 'metadata' ) {
@@ -364,7 +348,6 @@
 							volumes: [],
 							color: currColor
 						};
-
 						while ( currMeshNode ) {
 
 							if ( currMeshNode.nodeName === 'vertices' ) {
@@ -406,11 +389,9 @@
 			const amfObjects = {};
 			const childNodes = xmlData.documentElement.childNodes;
 			let i, j;
-
 			for ( i = 0; i < childNodes.length; i ++ ) {
 
 				const child = childNodes[ i ];
-
 				if ( child.nodeName === 'metadata' ) {
 
 					if ( child.attributes.type !== undefined ) {
@@ -449,21 +430,18 @@
 			sceneObject.name = amfName;
 			sceneObject.userData.author = amfAuthor;
 			sceneObject.userData.loader = 'AMF';
-
 			for ( const id in amfObjects ) {
 
 				const part = amfObjects[ id ];
 				const meshes = part.meshes;
 				const newObject = new THREE.Group();
 				newObject.name = part.name || '';
-
 				for ( i = 0; i < meshes.length; i ++ ) {
 
 					let objDefaultMaterial = defaultMaterial;
 					const mesh = meshes[ i ];
 					const vertices = new THREE.Float32BufferAttribute( mesh.vertices, 3 );
 					let normals = null;
-
 					if ( mesh.normals.length ) {
 
 						normals = new THREE.Float32BufferAttribute( mesh.normals, 3 );
@@ -475,7 +453,6 @@
 						const color = mesh.color;
 						objDefaultMaterial = defaultMaterial.clone();
 						objDefaultMaterial.color = new THREE.Color( color.r, color.g, color.b );
-
 						if ( color.a !== 1.0 ) {
 
 							objDefaultMaterial.transparent = true;
@@ -486,7 +463,6 @@
 					}
 
 					const volumes = mesh.volumes;
-
 					for ( j = 0; j < volumes.length; j ++ ) {
 
 						const volume = volumes[ j ];
@@ -494,7 +470,6 @@
 						let material = objDefaultMaterial;
 						newGeometry.setIndex( volume.triangles );
 						newGeometry.setAttribute( 'position', vertices.clone() );
-
 						if ( normals ) {
 
 							newGeometry.setAttribute( 'normal', normals.clone() );

package/examples/js/loaders/BVHLoader.js

@@ -16,7 +16,6 @@
 			this.animateBoneRotations = true;
 
 		}
-
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
@@ -49,7 +48,6 @@
 			}, onProgress, onError );
 
 		}
-
 		parse( text ) {
 
 			/*
@@ -61,6 +59,7 @@
 			function readBvh( lines ) {
 
 				// read model structure
+
 				if ( nextLine( lines ) !== 'HIERARCHY' ) {
 
 					console.error( 'THREE.BVHLoader: HIERARCHY expected.' );
@@ -68,35 +67,37 @@
 				}
 
 				const list = []; // collects flat array of all bones
+				const root = readNode( lines, nextLine( lines ), list );
 
-				const root = readNode( lines, nextLine( lines ), list ); // read motion data
+				// read motion data
 
 				if ( nextLine( lines ) !== 'MOTION' ) {
 
 					console.error( 'THREE.BVHLoader: MOTION expected.' );
 
-				} // number of frames
+				}
 
+				// number of frames
 
 				let tokens = nextLine( lines ).split( /[\s]+/ );
 				const numFrames = parseInt( tokens[ 1 ] );
-
 				if ( isNaN( numFrames ) ) {
 
 					console.error( 'THREE.BVHLoader: Failed to read number of frames.' );
 
-				} // frame time
+				}
 
+				// frame time
 
 				tokens = nextLine( lines ).split( /[\s]+/ );
 				const frameTime = parseFloat( tokens[ 2 ] );
-
 				if ( isNaN( frameTime ) ) {
 
 					console.error( 'THREE.BVHLoader: Failed to read frame time.' );
 
-				} // read frame data line by line
+				}
 
+				// read frame data line by line
 
 				for ( let i = 0; i < numFrames; i ++ ) {
 
@@ -108,6 +109,7 @@
 				return list;
 
 			}
+
 			/*
     	Recursively reads data from a single frame into the bone hierarchy.
     	The passed bone hierarchy has to be structured in the same order as the BVH file.
@@ -117,12 +119,13 @@
     	- frameTime: playback time for this keyframe.
     	- bone: the bone to read frame data from.
     */
-
-
 			function readFrameData( data, frameTime, bone ) {
 
 				// end sites have no motion data
-				if ( bone.type === 'ENDSITE' ) return; // add keyframe
+
+				if ( bone.type === 'ENDSITE' ) return;
+
+				// add keyframe
 
 				const keyframe = {
 					time: frameTime,
@@ -133,7 +136,9 @@
 				const quat = new THREE.Quaternion();
 				const vx = new THREE.Vector3( 1, 0, 0 );
 				const vy = new THREE.Vector3( 0, 1, 0 );
-				const vz = new THREE.Vector3( 0, 0, 1 ); // parse values for each channel in node
+				const vz = new THREE.Vector3( 0, 0, 1 );
+
+				// parse values for each channel in node
 
 				for ( let i = 0; i < bone.channels.length; i ++ ) {
 
@@ -142,37 +147,32 @@
 						case 'Xposition':
 							keyframe.position.x = parseFloat( data.shift().trim() );
 							break;
-
 						case 'Yposition':
 							keyframe.position.y = parseFloat( data.shift().trim() );
 							break;
-
 						case 'Zposition':
 							keyframe.position.z = parseFloat( data.shift().trim() );
 							break;
-
 						case 'Xrotation':
 							quat.setFromAxisAngle( vx, parseFloat( data.shift().trim() ) * Math.PI / 180 );
 							keyframe.rotation.multiply( quat );
 							break;
-
 						case 'Yrotation':
 							quat.setFromAxisAngle( vy, parseFloat( data.shift().trim() ) * Math.PI / 180 );
 							keyframe.rotation.multiply( quat );
 							break;
-
 						case 'Zrotation':
 							quat.setFromAxisAngle( vz, parseFloat( data.shift().trim() ) * Math.PI / 180 );
 							keyframe.rotation.multiply( quat );
 							break;
-
 						default:
 							console.warn( 'THREE.BVHLoader: Invalid channel type.' );
 
 					}
 
-				} // parse child nodes
+				}
 
+				// parse child nodes
 
 				for ( let i = 0; i < bone.children.length; i ++ ) {
 
@@ -181,6 +181,7 @@
 				}
 
 			}
+
 			/*
      Recursively parses the HIERACHY section of the BVH file
     	 - lines: all lines of the file. lines are consumed as we go along.
@@ -188,8 +189,6 @@
      - list: collects a flat list of nodes
     	 returns: a BVH node including children
     */
-
-
 			function readNode( lines, firstline, list ) {
 
 				const node = {
@@ -197,10 +196,11 @@
 					type: '',
 					frames: []
 				};
-				list.push( node ); // parse node type and name
+				list.push( node );
 
-				let tokens = firstline.split( /[\s]+/ );
+				// parse node type and name
 
+				let tokens = firstline.split( /[\s]+/ );
 				if ( tokens[ 0 ].toUpperCase() === 'END' && tokens[ 1 ].toUpperCase() === 'SITE' ) {
 
 					node.type = 'ENDSITE';
@@ -217,11 +217,11 @@
 
 					console.error( 'THREE.BVHLoader: Expected opening { after type & name' );
 
-				} // parse OFFSET
+				}
 
+				// parse OFFSET
 
 				tokens = nextLine( lines ).split( /[\s]+/ );
-
 				if ( tokens[ 0 ] !== 'OFFSET' ) {
 
 					console.error( 'THREE.BVHLoader: Expected OFFSET but got: ' + tokens[ 0 ] );
@@ -235,19 +235,19 @@
 				}
 
 				const offset = new THREE.Vector3( parseFloat( tokens[ 1 ] ), parseFloat( tokens[ 2 ] ), parseFloat( tokens[ 3 ] ) );
-
 				if ( isNaN( offset.x ) || isNaN( offset.y ) || isNaN( offset.z ) ) {
 
 					console.error( 'THREE.BVHLoader: Invalid values of OFFSET.' );
 
 				}
 
-				node.offset = offset; // parse CHANNELS definitions
+				node.offset = offset;
+
+				// parse CHANNELS definitions
 
 				if ( node.type !== 'ENDSITE' ) {
 
 					tokens = nextLine( lines ).split( /[\s]+/ );
-
 					if ( tokens[ 0 ] !== 'CHANNELS' ) {
 
 						console.error( 'THREE.BVHLoader: Expected CHANNELS definition.' );
@@ -258,13 +258,13 @@
 					node.channels = tokens.splice( 2, numChannels );
 					node.children = [];
 
-				} // read children
+				}
 
+				// read children
 
 				while ( true ) {
 
 					const line = nextLine( lines );
-
 					if ( line === '}' ) {
 
 						return node;
@@ -278,21 +278,19 @@
 				}
 
 			}
+
 			/*
     	recursively converts the internal bvh node structure to a THREE.Bone hierarchy
     		source: the bvh root node
     	list: pass an empty array, collects a flat list of all converted THREE.Bones
     		returns the root THREE.Bone
     */
-
-
 			function toTHREEBone( source, list ) {
 
 				const bone = new THREE.Bone();
 				list.push( bone );
 				bone.position.add( source.offset );
 				bone.name = source.name;
-
 				if ( source.type !== 'ENDSITE' ) {
 
 					for ( let i = 0; i < source.children.length; i ++ ) {
@@ -306,30 +304,34 @@
 				return bone;
 
 			}
+
 			/*
     	builds a THREE.AnimationClip from the keyframe data saved in each bone.
     		bone: bvh root node
     		returns: a THREE.AnimationClip containing position and quaternion tracks
     */
-
-
 			function toTHREEAnimation( bones ) {
 
-				const tracks = []; // create a position and quaternion animation track for each node
+				const tracks = [];
+
+				// create a position and quaternion animation track for each node
 
 				for ( let i = 0; i < bones.length; i ++ ) {
 
 					const bone = bones[ i ];
-					if ( bone.type === 'ENDSITE' ) continue; // track data
+					if ( bone.type === 'ENDSITE' ) continue;
+
+					// track data
 
 					const times = [];
 					const positions = [];
 					const rotations = [];
-
 					for ( let j = 0; j < bone.frames.length; j ++ ) {
 
 						const frame = bone.frames[ j ];
-						times.push( frame.time ); // the animation system animates the position property,
+						times.push( frame.time );
+
+						// the animation system animates the position property,
 						// so we have to add the joint offset to all values
 
 						positions.push( frame.position.x + bone.offset.x );
@@ -359,15 +361,14 @@
 				return new THREE.AnimationClip( 'animation', - 1, tracks );
 
 			}
+
 			/*
     	returns the next non-empty line in lines
     */
-
-
 			function nextLine( lines ) {
 
-				let line; // skip empty lines
-
+				let line;
+				// skip empty lines
 				while ( ( line = lines.shift().trim() ).length === 0 ) {}
 
 				return line;