@plastic-software/three 0.183.4 → 0.184.1

package/examples/jsm/loaders/VTKLoader.js

@@ -27,6 +27,7 @@ import { unzlibSync } from '../libs/fflate.module.js';
  *
  * @augments Loader
  * @three_import import { VTKLoader } from 'three/addons/loaders/VTKLoader.js';
+ * @deprecated since r184.
  */
 class VTKLoader extends Loader {
 
@@ -34,15 +35,18 @@ class VTKLoader extends Loader {
 	 * Constructs a new VTK loader.
 	 *
 	 * @param {LoadingManager} [manager] - The loading manager.
+	 * @deprecated since r184.
 	 */
 	constructor( manager ) {
 
 		super( manager );
 
+		console.warn( 'THREE.VTKLoader: The loader has been deprecated and will be removed with r194. Export your VTK files to glTF before using them on the web.' ); // @deprecated, r184
+
 	}
 
 	/**
-	 * Starts loading from the given URL and passes the loaded VRML asset
+	 * Starts loading from the given URL and passes the loaded VTK asset
 	 * to the `onLoad()` callback.
 	 *
 	 * @param {string} url - The path/URL of the file to be loaded. This can also be a data URI.

package/examples/jsm/loaders/collada/ColladaComposer.js

@@ -32,10 +32,12 @@ import {
 	Skeleton,
 	SkinnedMesh,
 	SpotLight,
+	Triangle,
 	Vector2,
 	Vector3,
 	VectorKeyframeTrack,
-	SRGBColorSpace
+	SRGBColorSpace,
+	ShapeUtils
 } from 'three';
 
 import { getElementsByTagName, parseFloats } from './ColladaParser.js';
@@ -1626,6 +1628,7 @@ class ColladaComposer {
 					count = primitive.count * 3;
 					break;
 
+				case 'polygons':
 				case 'polylist':
 
 					for ( let g = 0; g < primitive.count; g ++ ) {
@@ -1674,7 +1677,7 @@ class ColladaComposer {
 
 				const input = inputs[ name ];
 
-				switch ( name )	{
+				switch ( name ) {
 
 					case 'VERTEX':
 						for ( const key in vertices ) {
@@ -1856,13 +1859,103 @@ class ColladaComposer {
 
 				} else if ( count > 4 ) {
 
-					for ( let k = 1, kl = ( count - 2 ); k <= kl; k ++ ) {
+					const vertices = [];
 
-						const a = index + stride * 0;
-						const b = index + stride * k;
-						const c = index + stride * ( k + 1 );
+					// prepare vertices which represent the polygon's contour
 
-						pushVector( a ); pushVector( b ); pushVector( c );
+					for ( let k = 0; k < count; k ++ ) {
+
+						const a = index + stride * k;
+						const positionIndex = indices[ a ] * sourceStride;
+
+						const x = sourceArray[ positionIndex ];
+						const y = sourceArray[ positionIndex + 1 ];
+						const z = sourceArray[ positionIndex + 2 ];
+
+						vertices.push( new Vector3( x, y, z ) );
+
+					}
+
+					// determine surface normal
+
+					const normal = new Vector3();
+					const _triangle = new Triangle();
+
+					_triangle.a = vertices[ 0 ];
+					_triangle.b = vertices[ 1 ];
+					_triangle.c = vertices[ 2 ];
+					_triangle.getNormal( normal );
+
+					// project to 2D and triangulate
+
+					const vertices2D = [];
+
+					if ( Math.abs( normal.x ) > Math.abs( normal.y ) && Math.abs( normal.x ) > Math.abs( normal.z ) ) {
+
+						for ( let k = 0; k < count; k ++ ) {
+
+							vertices2D.push( new Vector2( vertices[ k ].y, vertices[ k ].z ) );
+
+						}
+
+					} else if ( Math.abs( normal.y ) > Math.abs( normal.z ) ) {
+
+						for ( let k = 0; k < count; k ++ ) {
+
+							vertices2D.push( new Vector2( vertices[ k ].x, vertices[ k ].z ) );
+
+						}
+
+					} else {
+
+						for ( let k = 0; k < count; k ++ ) {
+
+							vertices2D.push( new Vector2( vertices[ k ].x, vertices[ k ].y ) );
+
+						}
+
+					}
+
+					const isClockWise = ShapeUtils.isClockWise( vertices2D );
+
+					if ( isClockWise === true ) {
+
+						vertices2D.reverse();
+
+					}
+
+					const faces = ShapeUtils.triangulateShape( vertices2D, [] );
+
+					// build indices
+
+					for ( let k = 0; k < faces.length; k ++ ) {
+
+						const face = faces[ k ];
+
+						let i0, i1, i2;
+
+						if ( isClockWise === false ) {
+
+							i0 = face[ 0 ];
+							i1 = face[ 1 ];
+							i2 = face[ 2 ];
+
+
+						} else {
+
+							i0 = count - 1 - face[ 0 ];
+							i1 = count - 1 - face[ 2 ];
+							i2 = count - 1 - face[ 1 ];
+
+						}
+
+						const a = index + stride * i0;
+						const b = index + stride * i1;
+						const c = index + stride * i2;
+
+						pushVector( a );
+						pushVector( b );
+						pushVector( c );
 
 					}
 
@@ -2627,6 +2720,7 @@ class ColladaComposer {
 					break;
 
 				case 'triangles':
+				case 'polygons':
 				case 'polylist':
 					if ( skinning ) {
 

package/examples/jsm/loaders/collada/ColladaParser.js

@@ -140,7 +140,8 @@ class ColladaParser {
 			visualScenes: {},
 			kinematicsModels: {},
 			physicsModels: {},
-			kinematicsScenes: {}
+			kinematicsScenes: {},
+			joints: {}
 		};
 
 		this.library = library;
@@ -157,6 +158,7 @@ class ColladaParser {
 		this.parseLibrary( collada, 'library_geometries', 'geometry', this.parseGeometry.bind( this ) );
 		this.parseLibrary( collada, 'library_nodes', 'node', this.parseNode.bind( this ) );
 		this.parseLibrary( collada, 'library_visual_scenes', 'visual_scene', this.parseVisualScene.bind( this ) );
+		this.parseLibrary( collada, 'library_joints', 'joint', this.parseLibraryJoint.bind( this ) );
 		this.parseLibrary( collada, 'library_kinematics_models', 'kinematics_model', this.parseKinematicsModel.bind( this ) );
 		this.parseLibrary( collada, 'library_physics_models', 'physics_model', this.parsePhysicsModel.bind( this ) );
 		this.parseLibrary( collada, 'scene', 'instance_kinematics_scene', this.parseKinematicsScene.bind( this ) );
@@ -1231,9 +1233,6 @@ class ColladaParser {
 					break;
 
 				case 'polygons':
-					console.warn( 'THREE.ColladaLoader: Unsupported primitive type: ', child.nodeName );
-					break;
-
 				case 'lines':
 				case 'linestrips':
 				case 'polylist':
@@ -1353,12 +1352,24 @@ class ColladaParser {
 
 		}
 
+		if ( primitive.type === 'polygons' ) {
+
+			primitive.vcount = [ primitive.p.length / primitive.stride ];
+
+		}
+
 		return primitive;
 
 	}
 
 	// kinematics
 
+	parseLibraryJoint( xml ) {
+
+		this.library.joints[ xml.getAttribute( 'id' ) ] = this.parseKinematicsJoint( xml );
+
+	}
+
 	parseKinematicsModel( xml ) {
 
 		const data = {
@@ -1401,6 +1412,10 @@ class ColladaParser {
 					data.joints[ child.getAttribute( 'sid' ) ] = this.parseKinematicsJoint( child );
 					break;
 
+				case 'instance_joint':
+					data.joints[ child.getAttribute( 'sid' ) ] = this.library.joints[ parseId( child.getAttribute( 'url' ) ) ];
+					break;
+
 				case 'link':
 					data.links.push( this.parseKinematicsLink( child ) );
 					break;

package/examples/jsm/loaders/usd/USDAParser.js

@@ -454,6 +454,12 @@ class USDAParser {
 
 			}
 
+			if ( header.metersPerUnit !== undefined ) {
+
+				rootFields.metersPerUnit = parseFloat( header.metersPerUnit );
+
+			}
+
 		}
 
 		specsByPath[ '/' ] = { specType: SpecType.Prim, fields: rootFields };

package/examples/jsm/loaders/usd/USDCParser.js

@@ -1092,6 +1092,19 @@ class USDCParser {
 
 		// Seek to payload offset and read value
 		const offset = valueRep.payload;
+		if ( offset === 0 && isArray ) {
+
+			// Spec 16.3.9.3: Array payload 0 is an explicit empty-array sentinel.
+			return [];
+
+		}
+
+		if ( offset < 0 || offset >= this.buffer.byteLength ) {
+
+			throw new RangeError( 'USDCParser: Invalid payload offset ' + offset + ' for type ' + type + '.' );
+
+		}
+
 		const savedOffset = this.reader.tell();
 		this.reader.seek( offset );
 
@@ -1569,6 +1582,19 @@ class USDCParser {
 
 		}
 
+		if ( ! Number.isSafeInteger( size ) || size < 0 ) {
+
+			throw new RangeError( 'USDCParser: Invalid array size ' + size + ' for type ' + type + '.' );
+
+		}
+
+		if ( size > 0x7FFFFFFF ) {
+
+			// Crate stores counts as uint64, but JS typed arrays cannot represent all such sizes.
+			throw new RangeError( 'USDCParser: Array size ' + size + ' exceeds implementation limits.' );
+
+		}
+
 		if ( size === 0 ) return [];
 
 		// Handle compressed arrays