@unikia/upe-renderer 0.186.110 → 0.187.11

package/examples/jsm/loaders/MTLLoader.js

@@ -55,6 +55,8 @@ class MTLLoader extends Loader {
 		const path = ( this.path === '' ) ? LoaderUtils.extractUrlBase( url ) : this.path;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setRequestHeader( this.requestHeader );
 		loader.setWithCredentials( this.withCredentials );
@@ -158,6 +160,8 @@ class MTLLoader extends Loader {
 		const materialCreator = new MaterialCreator( this.resourcePath || path, this.materialOptions );
 		materialCreator.setCrossOrigin( this.crossOrigin );
 		materialCreator.setManager( this.manager );
+		materialCreator.priority = this.priority;
+		materialCreator.cache = this.cache;
 		materialCreator.setMaterials( materialsInfo );
 		return materialCreator;
 
@@ -187,6 +191,8 @@ class MaterialCreator {
 		this.nameLookup = {};
 
 		this.crossOrigin = 'anonymous';
+		this.priority = 'auto';
+		this.cache = 'default';
 
 		this.side = ( this.options.side !== undefined ) ? this.options.side : FrontSide;
 		this.wrap = ( this.options.wrap !== undefined ) ? this.options.wrap : RepeatWrapping;
@@ -575,6 +581,8 @@ class MaterialCreator {
 		if ( loader === null ) {
 
 			loader = new TextureLoader( manager );
+			loader.setPriority( this.priority );
+			loader.setCache( this.cache );
 
 		}
 

package/examples/jsm/loaders/MaterialXLoader.js

@@ -82,7 +82,7 @@ class MaterialXLoader extends Loader {
 	 */
 	load( url, onLoad, onProgress, onError, options = {} ) {
 
-		const _onError = function ( e ) {
+		const _onError = ( e ) => {
 
 			if ( onError ) {
 
@@ -94,16 +94,37 @@ class MaterialXLoader extends Loader {
 
 			}
 
+			this.manager.itemError( url );
+			this.manager.itemEnd( url );
+
 		};
 
+		// Keep the LoadingManager active until parsing and dependent resources
+		// have finished, matching the lifecycle used by GLTFLoader.
+		this.manager.itemStart( url );
+
 		new FileLoader( this.manager )
+			.setPriority( this.priority )
+			.setCache( this.cache )
 			.setPath( this.path )
+			.setRequestHeader( this.requestHeader )
+			.setWithCredentials( this.withCredentials )
 			.setResponseType( 'arraybuffer' )
 			.load( url, ( data ) => {
 
 				try {
 
-					onLoad( this.parseBuffer( data, url, options ) );
+					const parsed = this._parseBuffer( data, url, options );
+
+					parsed.document.waitForResources().then( () => {
+
+						parsed.result.errors = parsed.log.errors;
+						parsed.result.warnings = parsed.log.warnings;
+						this._throwOnErrors( parsed.log, options );
+						onLoad( parsed.result );
+						this.manager.itemEnd( url );
+
+					} ).catch( _onError );
 
 				} catch ( e ) {
 
@@ -153,6 +174,14 @@ class MaterialXLoader extends Loader {
 	 */
 	parseBuffer( data, url = '', options = {} ) {
 
+		const parsed = this._parseBuffer( data, url, options );
+		this._throwOnErrors( parsed.log, options );
+		return parsed.result;
+
+	}
+
+	_parseBuffer( data, url = '', options = {} ) {
+
 		this.dispose();
 
 		let text;
@@ -181,7 +210,7 @@ class MaterialXLoader extends Loader {
 
 		}
 
-		return this.parse( text, {
+		return this._parse( text, {
 			...options,
 			archiveResolver,
 			path: options.path || getResourcePath( this.path, url )
@@ -199,18 +228,43 @@ class MaterialXLoader extends Loader {
 	 * @param {string} [options.materialName] - Only translate the material with this name. Defaults to all materials.
 	 * @param {string} [options.uvSpace='bottom-left'] - The UV space of the document's textures, `'bottom-left'` or `'top-left'`.
 	 * @param {Function} [options.interfaceValidator] - Validates node interfaces, see `createStrictInterfaceValidator()` in `MaterialXInterfaceValidation.js`.
+	 * @param {function(Object, ?string): ?Node} [options.nodeResolver] - Builds the TSL node of a MaterialX node before the built-in node library. Called with the node and the requested output (`null` for the default output); returns the node, or `null` to leave it to the loader. For channel outputs such as `outx`, the loader takes the channel of the returned node.
 	 * @param {boolean} [options.throwOnErrors=true] - Whether translation errors throw or are only reported in the log.
 	 * @return {{materials: Object<string,NodeMaterial>, log: Array<Object>, errors: Array<Object>, warnings: Array<Object>}} The materials keyed by name and the translation log.
 	 */
 	parse( text, options = {} ) {
 
+		const parsed = this._parse( text, options );
+		this._throwOnErrors( parsed.log, options );
+		return parsed.result;
+
+	}
+
+	_parse( text, options = {} ) {
+
 		const log = new MaterialXLog();
 
 		const document = new MaterialXDocument( this.manager, options.path || this.path, log, options.archiveResolver || null, options.uvSpace );
+		document.imageLoader.setPriority( this.priority );
+		document.imageLoader.setCache( this.cache );
+		document.textureLoader.setPriority( this.priority );
+		document.textureLoader.setCache( this.cache );
+		document.imageLoader.setCrossOrigin( this.crossOrigin );
+		document.textureLoader.setCrossOrigin( this.crossOrigin );
+		document.textureLoader.setRequestHeader( this.requestHeader );
+		document.textureLoader.setWithCredentials( this.withCredentials );
+
 		const result = document.parse( text, options.materialName || null, {
 			interfaceValidator: options.interfaceValidator,
+			nodeResolver: options.nodeResolver,
 		} );
 
+		return { document, log, result };
+
+	}
+
+	_throwOnErrors( log, options ) {
+
 		if ( options.throwOnErrors !== false && log.errors.length > 0 ) {
 
 			const details = log.errors.map( ( error ) => error.message ).join( ' ' );
@@ -218,8 +272,6 @@ class MaterialXLoader extends Loader {
 
 		}
 
-		return result;
-
 	}
 
 }

package/examples/jsm/loaders/NRRDLoader.js

@@ -45,6 +45,8 @@ class NRRDLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( scope.manager );
+		loader.setPriority( scope.priority );
+		loader.setCache( scope.cache );
 		loader.setPath( scope.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( scope.requestHeader );
@@ -202,7 +204,7 @@ class NRRDLoader extends Loader {
 
 					headerObject.isNrrd = true;
 
-				} else if ( ! l.match( /^#/ ) && ( m = l.match( /(.*):(.*)/ ) ) ) {
+				} else if ( ! l.match( /^#/ ) && ( m = l.match( /^(.*):(.*)/ ) ) ) {
 
 					field = m[ 1 ].trim();
 					data = m[ 2 ].trim();
@@ -339,7 +341,7 @@ class NRRDLoader extends Loader {
 
 				// we found two line breaks in a row
 				// now we know what the header is
-				_header = this._parseChars( _bytes, 0, i - 2 );
+				_header = this._parseChars( _bytes, 0, i - 1 );
 				// this is were the data starts
 				_data_start = i + 1;
 				break;

package/examples/jsm/loaders/OBJLoader.js

@@ -410,15 +410,19 @@ function ParserState() {
 			const vLen = this.vertices.length;
 			const uvLen = this.uvs.length;
 
-			for ( let vi = 0, l = vertices.length; vi < l; vi ++ ) {
+			// a line statement defines a polyline, so convert it to pairs of vertices for line segments
+
+			for ( let vi = 0, l = vertices.length - 1; vi < l; vi ++ ) {
 
 				this.addVertexLine( this.parseVertexIndex( vertices[ vi ], vLen ) );
+				this.addVertexLine( this.parseVertexIndex( vertices[ vi + 1 ], vLen ) );
 
 			}
 
-			for ( let uvi = 0, l = uvs.length; uvi < l; uvi ++ ) {
+			for ( let uvi = 0, l = uvs.length - 1; uvi < l; uvi ++ ) {
 
 				this.addUVLine( this.parseUVIndex( uvs[ uvi ], uvLen ) );
+				this.addUVLine( this.parseUVIndex( uvs[ uvi + 1 ], uvLen ) );
 
 			}
 
@@ -485,6 +489,8 @@ class OBJLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setRequestHeader( this.requestHeader );
 		loader.setWithCredentials( this.withCredentials );
@@ -654,7 +660,7 @@ class OBJLoader extends Loader {
 
 			} else if ( lineFirstChar === 'l' ) {
 
-				const lineParts = line.substring( 1 ).trim().split( ' ' );
+				const lineParts = line.substring( 1 ).trim().split( _face_vertex_data_separator_pattern );
 				let lineVertices = [];
 				const lineUVs = [];
 
@@ -680,7 +686,7 @@ class OBJLoader extends Loader {
 			} else if ( lineFirstChar === 'p' ) {
 
 				const lineData = line.slice( 1 ).trim();
-				const pointData = lineData.split( ' ' );
+				const pointData = lineData.split( _face_vertex_data_separator_pattern );
 
 				state.addPointGeometry( pointData );
 

package/examples/jsm/loaders/PCDLoader.js

@@ -67,6 +67,8 @@ class PCDLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( scope.manager );
+		loader.setPriority( scope.priority );
+		loader.setCache( scope.cache );
 		loader.setPath( scope.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( scope.requestHeader );
@@ -341,12 +343,14 @@ class PCDLoader extends Loader {
 			PCDheader.offset = {};
 
 			let sizeSum = 0;
+			let countSum = 0;
 
 			for ( let i = 0, l = PCDheader.fields.length; i < l; i ++ ) {
 
 				if ( PCDheader.data === 'ascii' ) {
 
-					PCDheader.offset[ PCDheader.fields[ i ] ] = i;
+					PCDheader.offset[ PCDheader.fields[ i ] ] = countSum;
+					countSum += PCDheader.count[ i ];
 
 				} else {
 
@@ -392,7 +396,7 @@ class PCDLoader extends Loader {
 
 				if ( lines[ i ] === '' ) continue;
 
-				const line = lines[ i ].split( ' ' );
+				const line = lines[ i ].trim().split( /\s+/ );
 
 				if ( offset.x !== undefined ) {
 

package/examples/jsm/loaders/PDBLoader.js

@@ -52,6 +52,8 @@ class PDBLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( scope.manager );
+		loader.setPriority( scope.priority );
+		loader.setCache( scope.cache );
 		loader.setPath( scope.path );
 		loader.setRequestHeader( scope.requestHeader );
 		loader.setWithCredentials( scope.withCredentials );
@@ -230,9 +232,9 @@ class PDBLoader extends Loader {
 
 			if ( lines[ i ].slice( 0, 4 ) === 'ATOM' || lines[ i ].slice( 0, 6 ) === 'HETATM' ) {
 
-				const x = parseFloat( lines[ i ].slice( 30, 37 ) );
-				const y = parseFloat( lines[ i ].slice( 38, 45 ) );
-				const z = parseFloat( lines[ i ].slice( 46, 53 ) );
+				const x = parseFloat( lines[ i ].slice( 30, 38 ) );
+				const y = parseFloat( lines[ i ].slice( 38, 46 ) );
+				const z = parseFloat( lines[ i ].slice( 46, 54 ) );
 				const index = parseInt( lines[ i ].slice( 6, 11 ) ) - 1;
 
 				let e = trim( lines[ i ].slice( 76, 78 ) ).toLowerCase();

package/examples/jsm/loaders/PLYLoader.js

@@ -64,6 +64,8 @@ class PLYLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( this.requestHeader );
@@ -542,6 +544,19 @@ class PLYLoader extends Loader {
 
 			}
 
+			// custom buffer data
+
+			for ( const customProperty of Object.keys( scope.customPropertyMapping ) ) {
+
+				if ( buffer[ customProperty ].length > 0 ) {
+
+					const CustomClass = getBufferAttributeClass( vertexDescriptor.custom[ customProperty ].type );
+					geometry.setAttribute( customProperty, new CustomClass( buffer[ customProperty ], scope.customPropertyMapping[ customProperty ].length ) );
+
+				}
+
+			}
+
 			if ( buffer.faceVertexUvs.length > 0 || buffer.faceVertexColors.length > 0 ) {
 
 				geometry = geometry.toNonIndexed();
@@ -565,19 +580,6 @@ class PLYLoader extends Loader {
 
 			}
 
-			// custom buffer data
-
-			for ( const customProperty of Object.keys( scope.customPropertyMapping ) ) {
-
-				if ( buffer[ customProperty ].length > 0 ) {
-
-					const CustomClass = getBufferAttributeClass( vertexDescriptor.custom[ customProperty ].type );
-					geometry.setAttribute( customProperty, new CustomClass( buffer[ customProperty ], scope.customPropertyMapping[ customProperty ].length ) );
-
-				}
-
-			}
-
 			geometry.computeBoundingSphere();
 
 			return geometry;
@@ -674,8 +676,22 @@ class PLYLoader extends Loader {
 
 				} else if ( vertex_indices.length === 4 ) {
 
-					buffer.indices.push( vertex_indices[ 0 ], vertex_indices[ 1 ], vertex_indices[ 3 ] );
-					buffer.indices.push( vertex_indices[ 1 ], vertex_indices[ 2 ], vertex_indices[ 3 ] );
+					// according to the spec, quads need to be split along a specific rule
+					// 4 0 1 2 3 results in 0,1,2 and 0,2,3
+
+					buffer.indices.push( vertex_indices[ 0 ], vertex_indices[ 1 ], vertex_indices[ 2 ] );
+					buffer.indices.push( vertex_indices[ 0 ], vertex_indices[ 2 ], vertex_indices[ 3 ] );
+
+					if ( texcoord && texcoord.length === 8 ) {
+
+						buffer.faceVertexUvs.push( texcoord[ 0 ], texcoord[ 1 ] );
+						buffer.faceVertexUvs.push( texcoord[ 2 ], texcoord[ 3 ] );
+						buffer.faceVertexUvs.push( texcoord[ 4 ], texcoord[ 5 ] );
+						buffer.faceVertexUvs.push( texcoord[ 0 ], texcoord[ 1 ] );
+						buffer.faceVertexUvs.push( texcoord[ 4 ], texcoord[ 5 ] );
+						buffer.faceVertexUvs.push( texcoord[ 6 ], texcoord[ 7 ] );
+
+					}
 
 				}
 
@@ -708,6 +724,14 @@ class PLYLoader extends Loader {
 					buffer.faceVertexColors.push( r, g, b );
 					buffer.faceVertexColors.push( r, g, b );
 
+					if ( vertex_indices.length === 4 ) {
+
+						buffer.faceVertexColors.push( r, g, b );
+						buffer.faceVertexColors.push( r, g, b );
+						buffer.faceVertexColors.push( r, g, b );
+
+					}
+
 				}
 
 			}

package/examples/jsm/loaders/PVRLoader.js

@@ -231,8 +231,8 @@ function _extract( pvrDatas ) {
 
 	while ( mipLevel < pvrDatas.numMipmaps ) {
 
-		const sWidth = pvrDatas.width >> mipLevel,
-			sHeight = pvrDatas.height >> mipLevel;
+		const sWidth = Math.max( pvrDatas.width >> mipLevel, 1 ),
+			sHeight = Math.max( pvrDatas.height >> mipLevel, 1 );
 
 		widthBlocks = sWidth / blockWidth;
 		heightBlocks = sHeight / blockHeight;

package/examples/jsm/loaders/SPLATLoader.js

@@ -50,6 +50,8 @@ class SPLATLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( this.requestHeader );

package/examples/jsm/loaders/SPZLoader.js

@@ -90,6 +90,8 @@ class SPZLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( this.requestHeader );

package/examples/jsm/loaders/STLLoader.js

@@ -78,6 +78,8 @@ class STLLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( this.requestHeader );
@@ -181,7 +183,7 @@ class STLLoader extends Loader {
 			// process STL header
 			// check for default color in header ("COLOR=rgba" sequence).
 
-			for ( let index = 0; index < 80 - 10; index ++ ) {
+			for ( let index = 0; index <= 80 - 10; index ++ ) {
 
 				if ( ( reader.getUint32( index, false ) == 0x434F4C4F /*COLO*/ ) &&
 					( reader.getUint8( index + 4 ) == 0x52 /*'R'*/ ) &&

package/examples/jsm/loaders/SVGLoader.js

@@ -106,6 +106,8 @@ class SVGLoader extends Loader {
 		const scope = this;
 
 		const loader = new FileLoader( scope.manager );
+		loader.setPriority( scope.priority );
+		loader.setCache( scope.cache );
 		loader.setPath( scope.path );
 		loader.setRequestHeader( scope.requestHeader );
 		loader.setWithCredentials( scope.withCredentials );
@@ -218,7 +220,7 @@ class SVGLoader extends Loader {
 				case 'use':
 					style = parseStyle( node, style );
 
-					const href = node.getAttributeNS( 'http://www.w3.org/1999/xlink', 'href' ) || '';
+					const href = node.getAttributeNS( 'http://www.w3.org/1999/xlink', 'href' ) || node.getAttribute( 'href' ) || '';
 					const usedNodeId = href.substring( 1 );
 					const usedNode = node.viewportElement.getElementById( usedNodeId );
 					if ( usedNode ) {
@@ -303,8 +305,7 @@ class SVGLoader extends Loader {
 			const control = new Vector2();
 
 			const firstPoint = new Vector2();
-			let isFirstPoint = true;
-			let doSetFirstPoint = false;
+			let isPathClosed = false;
 
 			const d = node.getAttribute( 'd' );
 
@@ -321,10 +322,17 @@ class SVGLoader extends Loader {
 				const type = command.charAt( 0 );
 				const data = command.slice( 1 ).trim();
 
-				if ( isFirstPoint === true ) {
+				if ( isPathClosed === true ) {
 
-					doSetFirstPoint = true;
-					isFirstPoint = false;
+					// commands after Z without M start a new subpath at the initial point
+
+					if ( type !== 'M' && type !== 'm' && type !== 'Z' && type !== 'z' ) {
+
+						path.moveTo( firstPoint.x, firstPoint.y );
+
+					}
+
+					isPathClosed = false;
 
 				}
 
@@ -367,8 +375,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -383,8 +389,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -400,8 +404,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -424,8 +426,6 @@ class SVGLoader extends Loader {
 							point.x = numbers[ j + 4 ];
 							point.y = numbers[ j + 5 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -448,8 +448,6 @@ class SVGLoader extends Loader {
 							point.x = numbers[ j + 2 ];
 							point.y = numbers[ j + 3 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -470,8 +468,6 @@ class SVGLoader extends Loader {
 							point.x = numbers[ j + 2 ];
 							point.y = numbers[ j + 3 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -494,8 +490,6 @@ class SVGLoader extends Loader {
 							point.x = numbers[ j + 0 ];
 							point.y = numbers[ j + 1 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -517,8 +511,6 @@ class SVGLoader extends Loader {
 								path, numbers[ j ], numbers[ j + 1 ], numbers[ j + 2 ], numbers[ j + 3 ], numbers[ j + 4 ], start, point
 							);
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -559,8 +551,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -575,8 +565,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -592,8 +580,6 @@ class SVGLoader extends Loader {
 							control.y = point.y;
 							path.lineTo( point.x, point.y );
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -616,8 +602,6 @@ class SVGLoader extends Loader {
 							point.x += numbers[ j + 4 ];
 							point.y += numbers[ j + 5 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -640,8 +624,6 @@ class SVGLoader extends Loader {
 							point.x += numbers[ j + 2 ];
 							point.y += numbers[ j + 3 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -662,8 +644,6 @@ class SVGLoader extends Loader {
 							point.x += numbers[ j + 2 ];
 							point.y += numbers[ j + 3 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -686,8 +666,6 @@ class SVGLoader extends Loader {
 							point.x = point.x + numbers[ j + 0 ];
 							point.y = point.y + numbers[ j + 1 ];
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -709,8 +687,6 @@ class SVGLoader extends Loader {
 								path, numbers[ j ], numbers[ j + 1 ], numbers[ j + 2 ], numbers[ j + 3 ], numbers[ j + 4 ], start, point
 							);
 
-							if ( j === 0 && doSetFirstPoint === true ) firstPoint.copy( point );
-
 						}
 
 						break;
@@ -724,7 +700,7 @@ class SVGLoader extends Loader {
 							// Reset point to beginning of Path
 							point.copy( firstPoint );
 							path.currentPath.currentPoint.copy( point );
-							isFirstPoint = true;
+							isPathClosed = true;
 
 						}
 
@@ -737,8 +713,6 @@ class SVGLoader extends Loader {
 
 				// console.log( type, parseFloats( data ), parseFloats( data ).length  )
 
-				doSetFirstPoint = false;
-
 			}
 
 			return path;
@@ -760,12 +734,16 @@ class SVGLoader extends Loader {
 					.filter( Boolean )
 					.map( i => i.trim() );
 
-				for ( let j = 0; j < selectorList.length; j ++ ) {
+				const definitions = {};
 
-					// Remove empty rules
-					const definitions = Object.fromEntries(
-						Object.entries( stylesheet.style ).filter( ( [ , v ] ) => v !== '' )
-					);
+				for ( let j = 0; j < stylesheet.style.length; j ++ ) {
+
+					const property = stylesheet.style[ j ];
+					definitions[ property ] = stylesheet.style.getPropertyValue( property );
+
+				}
+
+				for ( let j = 0; j < selectorList.length; j ++ ) {
 
 					stylesheets[ selectorList[ j ] ] = Object.assign(
 						stylesheets[ selectorList[ j ] ] || {},
@@ -959,7 +937,7 @@ class SVGLoader extends Loader {
 
 			}
 
-			const regex = /([+-]?\d*\.?\d+(?:e[+-]?\d+)?)(?:,|\s)([+-]?\d*\.?\d+(?:e[+-]?\d+)?)/g;
+			const regex = /([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)(?:,|\s)([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)/g;
 
 			const path = new ShapePath();
 
@@ -994,7 +972,7 @@ class SVGLoader extends Loader {
 
 			}
 
-			const regex = /([+-]?\d*\.?\d+(?:e[+-]?\d+)?)(?:,|\s)([+-]?\d*\.?\d+(?:e[+-]?\d+)?)/g;
+			const regex = /([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)(?:,|\s)([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)/g;
 
 			const path = new ShapePath();
 
@@ -1235,7 +1213,7 @@ class SVGLoader extends Loader {
 				};
 
 				if ( node.hasAttribute( svgName ) ) style[ jsName ] = adjustFunction( node.getAttribute( svgName ) );
-				if ( stylesheetStyles[ jsName ] ) style[ jsName ] = adjustFunction( stylesheetStyles[ jsName ] );
+				if ( stylesheetStyles[ svgName ] ) style[ jsName ] = adjustFunction( stylesheetStyles[ svgName ] );
 				if ( node.style && node.style[ svgName ] !== '' ) style[ jsName ] = adjustFunction( node.style[ svgName ] );
 
 			}