super-three 0.133.5 → 0.135.0

package/examples/js/loaders/PLYLoader.js

@@ -343,25 +343,50 @@
 
 			function handleElement( buffer, elementName, element ) {
 
+				function findAttrName( names ) {
+
+					for ( let i = 0, l = names.length; i < l; i ++ ) {
+
+						const name = names[ i ];
+						if ( name in element ) return name;
+
+					}
+
+					return null;
+
+				}
+
+				const attrX = findAttrName( [ 'x', 'px', 'posx' ] ) || 'x';
+				const attrY = findAttrName( [ 'y', 'py', 'posy' ] ) || 'y';
+				const attrZ = findAttrName( [ 'z', 'pz', 'posz' ] ) || 'z';
+				const attrNX = findAttrName( [ 'nx', 'normalx' ] );
+				const attrNY = findAttrName( [ 'ny', 'normaly' ] );
+				const attrNZ = findAttrName( [ 'nz', 'normalz' ] );
+				const attrS = findAttrName( [ 's', 'u', 'texture_u', 'tx' ] );
+				const attrT = findAttrName( [ 't', 'v', 'texture_v', 'ty' ] );
+				const attrR = findAttrName( [ 'red', 'diffuse_red', 'r', 'diffuse_r' ] );
+				const attrG = findAttrName( [ 'green', 'diffuse_green', 'g', 'diffuse_g' ] );
+				const attrB = findAttrName( [ 'blue', 'diffuse_blue', 'b', 'diffuse_b' ] );
+
 				if ( elementName === 'vertex' ) {
 
-					buffer.vertices.push( element.x, element.y, element.z );
+					buffer.vertices.push( element[ attrX ], element[ attrY ], element[ attrZ ] );
 
-					if ( 'nx' in element && 'ny' in element && 'nz' in element ) {
+					if ( attrNX !== null && attrNY !== null && attrNZ !== null ) {
 
-						buffer.normals.push( element.nx, element.ny, element.nz );
+						buffer.normals.push( element[ attrNX ], element[ attrNY ], element[ attrNZ ] );
 
 					}
 
-					if ( 's' in element && 't' in element ) {
+					if ( attrS !== null && attrT !== null ) {
 
-						buffer.uvs.push( element.s, element.t );
+						buffer.uvs.push( element[ attrS ], element[ attrT ] );
 
 					}
 
-					if ( 'red' in element && 'green' in element && 'blue' in element ) {
+					if ( attrR !== null && attrG !== null && attrB !== null ) {
 
-						buffer.colors.push( element.red / 255.0, element.green / 255.0, element.blue / 255.0 );
+						buffer.colors.push( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 );
 
 					}
 

package/examples/js/loaders/RGBELoader.js

@@ -220,7 +220,8 @@
 					const scanline_width = w;
 
 					if ( // run length encoding is not allowed so read flat
-						scanline_width < 8 || scanline_width > 0x7fff || 2 !== buffer[ 0 ] || 2 !== buffer[ 1 ] || buffer[ 2 ] & 0x80 ) {
+						scanline_width < 8 || scanline_width > 0x7fff || // this file is not run length encoded
+      2 !== buffer[ 0 ] || 2 !== buffer[ 1 ] || buffer[ 2 ] & 0x80 ) {
 
 						// return the flat buffer
 						return new Uint8Array( buffer );

package/examples/js/loaders/SVGLoader.js

@@ -1887,6 +1887,7 @@
 				}
 
 				return {
+					curves: p.curves,
 					points: points,
 					isCW: THREE.ShapeUtils.isClockWise( points ),
 					identifier: identifier ++,
@@ -1904,12 +1905,15 @@
 
 				if ( ! amIAHole.isHole ) {
 
-					const shape = new THREE.Shape( p.points );
+					const shape = new THREE.Shape();
+					shape.curves = p.curves;
 					const holes = isAHole.filter( h => h.isHole && h.for === p.identifier );
 					holes.forEach( h => {
 
-						const path = simplePaths[ h.identifier ];
-						shape.holes.push( new THREE.Path( path.points ) );
+						const hole = simplePaths[ h.identifier ];
+						const path = new THREE.Path();
+						path.curves = hole.curves;
+						shape.holes.push( path );
 
 					} );
 					shapesToReturn.push( shape );