@unikia/upe-renderer 0.186.110 → 0.187.11

package/examples/jsm/loaders/TDSLoader.js

@@ -72,6 +72,8 @@ class TDSLoader 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.setResponseType( 'arraybuffer' );
 		loader.setRequestHeader( this.requestHeader );
@@ -556,6 +558,8 @@ class TDSLoader extends Loader {
 		let texture = {};
 
 		const loader = new TextureLoader( this.manager );
+		loader.setPriority( this.priority );
+		loader.setCache( this.cache );
 		loader.setPath( this.resourcePath || path ).setCrossOrigin( this.crossOrigin );
 
 		while ( next ) {

package/examples/jsm/loaders/TGALoader.js

@@ -192,18 +192,19 @@ class TGALoader extends DataTextureLoader {
 		function tgaGetImageData8bits( imageData, y_start, y_step, y_end, x_start, x_step, x_end, image, palettes ) {
 
 			const colormap = palettes;
-			let color, i = 0, x, y;
+			const colormap_index = header.colormap_index;
+			let index, i = 0, x, y;
 			const width = header.width;
 
 			for ( y = y_start; y !== y_end; y += y_step ) {
 
 				for ( x = x_start; x !== x_end; x += x_step, i ++ ) {
 
-					color = image[ i ];
+					index = image[ i ] - colormap_index; // map from full color map index to stored palette index
 					imageData[ ( x + width * y ) * 4 + 3 ] = 255;
-					imageData[ ( x + width * y ) * 4 + 2 ] = colormap[ ( color * 3 ) + 0 ];
-					imageData[ ( x + width * y ) * 4 + 1 ] = colormap[ ( color * 3 ) + 1 ];
-					imageData[ ( x + width * y ) * 4 + 0 ] = colormap[ ( color * 3 ) + 2 ];
+					imageData[ ( x + width * y ) * 4 + 2 ] = colormap[ ( index * 3 ) + 0 ];
+					imageData[ ( x + width * y ) * 4 + 1 ] = colormap[ ( index * 3 ) + 1 ];
+					imageData[ ( x + width * y ) * 4 + 0 ] = colormap[ ( index * 3 ) + 2 ];
 
 				}
 

package/examples/jsm/loaders/TTFLoader.js

@@ -54,6 +54,8 @@ class TTFLoader 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/USDLoader.js

@@ -53,6 +53,8 @@ class USDLoader extends Loader {
 		const path = ( scope.path === '' ) ? LoaderUtils.extractUrlBase( url ) : scope.path;
 
 		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 );
@@ -246,6 +248,9 @@ class USDLoader extends Loader {
 		if ( typeof buffer === 'string' ) {
 
 			const composer = new USDComposer( scope.manager );
+			composer.imageLoader.setCrossOrigin( scope.crossOrigin );
+			composer.imageLoader.setPriority( scope.priority );
+			composer.imageLoader.setCache( scope.cache );
 			const data = usda.parseData( buffer );
 			return finalize( composer, composer.compose( data, {}, {}, path ) );
 
@@ -256,6 +261,9 @@ class USDLoader extends Loader {
 		if ( isCrateFile( buffer ) ) {
 
 			const composer = new USDComposer( scope.manager );
+			composer.imageLoader.setCrossOrigin( scope.crossOrigin );
+			composer.imageLoader.setPriority( scope.priority );
+			composer.imageLoader.setCache( scope.cache );
 			const data = usdc.parseData( toArrayBuffer( buffer ) );
 			return finalize( composer, composer.compose( data, {}, {}, path ) );
 
@@ -278,6 +286,9 @@ class USDLoader extends Loader {
 			}
 
 			const composer = new USDComposer( scope.manager );
+			composer.imageLoader.setCrossOrigin( scope.crossOrigin );
+			composer.imageLoader.setPriority( scope.priority );
+			composer.imageLoader.setCache( scope.cache );
 			const data = assets[ filename ];
 			if ( ! data ) {
 
@@ -292,6 +303,9 @@ class USDLoader extends Loader {
 		// USDA (standalone, as ArrayBuffer)
 
 		const composer = new USDComposer( scope.manager );
+		composer.imageLoader.setCrossOrigin( scope.crossOrigin );
+		composer.imageLoader.setPriority( scope.priority );
+		composer.imageLoader.setCache( scope.cache );
 		const text = textDecoder.decode( bytes );
 		const data = usda.parseData( text );
 		return finalize( composer, composer.compose( data, {}, {}, path ) );

package/examples/jsm/loaders/UltraHDRLoader.js

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

package/examples/jsm/loaders/VOXLoader.js

@@ -257,9 +257,12 @@ class VOXLoader 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 );
+		loader.setWithCredentials( scope.withCredentials );
 		loader.load( url, function ( buffer ) {
 
 			try {

package/examples/jsm/loaders/VRMLLoader.js

@@ -80,6 +80,8 @@ class VRMLLoader extends Loader {
 		const path = ( scope.path === '' ) ? LoaderUtils.extractUrlBase( url ) : scope.path;
 
 		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 );
@@ -3338,6 +3340,8 @@ class VRMLLoader extends Loader {
 		//
 
 		const textureLoader = new TextureLoader( this.manager );
+		textureLoader.setPriority( this.priority );
+		textureLoader.setCache( this.cache );
 		textureLoader.setPath( this.resourcePath || path ).setCrossOrigin( this.crossOrigin );
 
 		// check version (only 2.0 is supported)

package/examples/jsm/loaders/VTKLoader.js

@@ -59,6 +59,8 @@ class VTKLoader 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 );

package/examples/jsm/loaders/XYZLoader.js

@@ -44,6 +44,8 @@ class XYZLoader 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 );

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

@@ -1673,6 +1673,9 @@ class ColladaComposer {
 
 			// geometry data
 
+			primitive.positionSource = sources[ vertices.POSITION ];
+			primitive.positionOffset = inputs.VERTEX.offset;
+
 			for ( const name in inputs ) {
 
 				const input = inputs[ name ];
@@ -1722,7 +1725,7 @@ class ColladaComposer {
 									break;
 
 								case 'COLOR':
-									this.buildGeometryData( primitive, sources[ id ], input.offset, color.array );
+									this.buildGeometryData( primitive, sources[ id ], input.offset, color.array, true );
 									color.stride = sources[ id ].stride;
 									break;
 
@@ -1796,6 +1799,9 @@ class ColladaComposer {
 		const stride = primitive.stride;
 		const vcount = primitive.vcount;
 
+		const positionSource = primitive.positionSource;
+		const positionOffset = primitive.positionOffset;
+
 		const tempColor = this.tempColor;
 
 		function pushVector( i ) {
@@ -1812,7 +1818,7 @@ class ColladaComposer {
 			if ( isColor ) {
 
 				// convert the vertex colors from srgb to linear if present
-				const startIndex = array.length - sourceStride - 1;
+				const startIndex = array.length - sourceStride;
 				tempColor.setRGB(
 					array[ startIndex + 0 ],
 					array[ startIndex + 1 ],
@@ -1861,16 +1867,17 @@ class ColladaComposer {
 
 					const vertices = [];
 
-					// prepare vertices which represent the polygon's contour
+					// prepare vertices which represent the polygon's contour. the contour is always
+					// based on positions so all vertex attributes end up with the same triangles
 
 					for ( let k = 0; k < count; k ++ ) {
 
-						const a = index + stride * k;
-						const positionIndex = indices[ a ] * sourceStride;
+						const a = index + stride * k + positionOffset;
+						const positionIndex = indices[ a ] * positionSource.stride;
 
-						const x = sourceArray[ positionIndex ];
-						const y = sourceArray[ positionIndex + 1 ];
-						const z = sourceArray[ positionIndex + 2 ];
+						const x = positionSource.array[ positionIndex ];
+						const y = positionSource.array[ positionIndex + 1 ];
+						const z = positionSource.array[ positionIndex + 2 ];
 
 						vertices.push( new Vector3( x, y, z ) );