super-three 0.136.0 → 0.141.0

package/examples/js/animation/CCDIKSolver.js

@@ -179,13 +179,13 @@
 
 					if ( rotationMin !== undefined ) {
 
-						link.rotation.setFromVector3( link.rotation.toVector3( _vector ).max( rotationMin ) );
+						link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).max( rotationMin ) );
 
 					}
 
 					if ( rotationMax !== undefined ) {
 
-						link.rotation.setFromVector3( link.rotation.toVector3( _vector ).min( rotationMax ) );
+						link.rotation.setFromVector3( _vector.setFromEuler( link.rotation ).min( rotationMax ) );
 
 					}
 
@@ -427,6 +427,7 @@
 
 	}
 
+	THREE.CCDIKHelper = CCDIKHelper;
 	THREE.CCDIKSolver = CCDIKSolver;
 
 } )();

package/examples/js/animation/MMDAnimationHelper.js

@@ -44,7 +44,9 @@
 				cameraAnimation: true
 			};
 
-			this.onBeforePhysics = function () {}; // experimental
+			this.onBeforePhysics = function
+			/* mesh */
+			() {}; // experimental
 
 
 			this.sharedPhysics = false;

package/examples/js/animation/MMDPhysics.js

@@ -185,8 +185,8 @@
 			// mesh's default world transform as position(0, 0, 0),
 			// quaternion(0, 0, 0, 1) and scale(0, 0, 0)
 
-			let parent = mesh.parent;
-			if ( parent !== null ) parent = null;
+			const parent = mesh.parent;
+			if ( parent !== null ) mesh.parent = null;
 			const currentPosition = manager.allocThreeVector3();
 			const currentQuaternion = manager.allocThreeQuaternion();
 			const currentScale = manager.allocThreeVector3();
@@ -821,7 +821,7 @@
 						return new Ammo.btCapsuleShape( p.width, p.height );
 
 					default:
-						throw 'unknown shape type ' + p.shapeType;
+						throw new Error( 'unknown shape type ' + p.shapeType );
 
 				}
 

package/examples/js/cameras/CinematicCamera.js

@@ -91,13 +91,8 @@
 				this.postprocessing.scene = new THREE.Scene();
 				this.postprocessing.camera = new THREE.OrthographicCamera( window.innerWidth / - 2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / - 2, - 10000, 10000 );
 				this.postprocessing.scene.add( this.postprocessing.camera );
-				const pars = {
-					minFilter: THREE.LinearFilter,
-					magFilter: THREE.LinearFilter,
-					format: THREE.RGBFormat
-				};
-				this.postprocessing.rtTextureDepth = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
-				this.postprocessing.rtTextureColor = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
+				this.postprocessing.rtTextureDepth = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight );
+				this.postprocessing.rtTextureColor = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight );
 				const bokeh_shader = THREE.BokehShader;
 				this.postprocessing.bokeh_uniforms = THREE.UniformsUtils.clone( bokeh_shader.uniforms );
 				this.postprocessing.bokeh_uniforms[ 'tColor' ].value = this.postprocessing.rtTextureColor.texture;

package/examples/js/controls/ArcballControls.js

@@ -845,7 +845,9 @@
 
 									}
 
-									this.applyTransformMatrix( this.scale( size, this._gizmos.position ) );
+									this._v3_1.setFromMatrixPosition( this._gizmoMatrixState );
+
+									this.applyTransformMatrix( this.scale( size, this._v3_1 ) );
 
 								}
 

package/examples/js/controls/PointerLockControls.js

@@ -37,6 +37,7 @@
 
 			this.maxPolarAngle = Math.PI; // radians
 
+			this.pointerSpeed = 1.0;
 			const scope = this;
 
 			function onMouseMove( event ) {
@@ -47,8 +48,8 @@
 
 				_euler.setFromQuaternion( camera.quaternion );
 
-				_euler.y -= movementX * 0.002;
-				_euler.x -= movementY * 0.002;
+				_euler.y -= movementX * 0.002 * scope.pointerSpeed;
+				_euler.x -= movementY * 0.002 * scope.pointerSpeed;
 				_euler.x = Math.max( _PI_2 - scope.maxPolarAngle, Math.min( _PI_2 - scope.minPolarAngle, _euler.x ) );
 				camera.quaternion.setFromEuler( _euler );
 				scope.dispatchEvent( _changeEvent );

package/examples/js/controls/TrackballControls.js

@@ -510,9 +510,6 @@
 							_state = STATE.PAN;
 							break;
 
-						default:
-							_state = STATE.NONE;
-
 					}
 
 				}
@@ -688,7 +685,7 @@
 					case 2:
 						_state = STATE.TOUCH_ZOOM_PAN;
 
-						_moveCurr.copy( getMouseOnCircle( event.pageX - _movePrev.pageX, event.pageY - _movePrev.pageY ) );
+						_moveCurr.copy( getMouseOnCircle( event.pageX - _movePrev.x, event.pageY - _movePrev.y ) );
 
 						_movePrev.copy( _moveCurr );
 

package/examples/js/controls/TransformControls.js

@@ -40,6 +40,7 @@
 
 			}
 
+			this.isTransformControls = true;
 			this.visible = false;
 			this.domElement = domElement;
 			this.domElement.style.touchAction = 'none'; // disable touch scroll
@@ -604,9 +605,8 @@
 
 		}
 
-	}
+	} // mouse / touch event handlers
 
-	TransformControls.prototype.isTransformControls = true; // mouse / touch event handlers
 
 	function getPointer( event ) {
 
@@ -731,6 +731,7 @@
 		constructor() {
 
 			super();
+			this.isTransformControlsGizmo = true;
 			this.type = 'TransformControlsGizmo'; // shared materials
 
 			const gizmoMaterial = new THREE.MeshBasicMaterial( {
@@ -1259,9 +1260,8 @@
 
 		}
 
-	}
+	} //
 
-	TransformControlsGizmo.prototype.isTransformControlsGizmo = true; //
 
 	class TransformControlsPlane extends THREE.Mesh {
 
@@ -1275,6 +1275,7 @@
 				opacity: 0.1,
 				toneMapped: false
 			} ) );
+			this.isTransformControlsPlane = true;
 			this.type = 'TransformControlsPlane';
 
 		}
@@ -1374,8 +1375,6 @@
 
 	}
 
-	TransformControlsPlane.prototype.isTransformControlsPlane = true;
-
 	THREE.TransformControls = TransformControls;
 	THREE.TransformControlsGizmo = TransformControlsGizmo;
 	THREE.TransformControlsPlane = TransformControlsPlane;

package/examples/js/controls/experimental/CameraControls.js

@@ -138,7 +138,7 @@
 					if ( sphericalDelta.theta ) {
 
 						vec.set( 0, 1, 0 ).applyQuaternion( scope.object.quaternion );
-						var factor = scope.enableDamping ? scope.dampingFactor : 1;
+						const factor = scope.enableDamping ? scope.dampingFactor : 1;
 						q.setFromAxisAngle( vec, sphericalDelta.theta * factor );
 						scope.object.quaternion.premultiply( q );
 						offset.applyQuaternion( q );
@@ -149,7 +149,7 @@
 					if ( sphericalDelta.phi ) {
 
 						vec.set( 1, 0, 0 ).applyQuaternion( scope.object.quaternion );
-						var factor = scope.enableDamping ? scope.dampingFactor : 1;
+						const factor = scope.enableDamping ? scope.dampingFactor : 1;
 						q.setFromAxisAngle( vec, sphericalDelta.phi * factor );
 						scope.object.quaternion.premultiply( q );
 						offset.applyQuaternion( q );
@@ -510,7 +510,9 @@
 
 		}
 
-		function handleMouseUp() { // no-op
+		function
+		/*event*/
+		handleMouseUp() { // no-op
 		}
 
 		function handleMouseWheel( event ) {
@@ -691,7 +693,9 @@
 
 		}
 
-		function handleTouchEnd() { // no-op
+		function
+		/*event*/
+		handleTouchEnd() { // no-op
 		} //
 		// event handlers - FSM: listen for events and reset state
 		//

package/examples/js/csm/CSMFrustum.js

@@ -117,7 +117,7 @@
 
 		toSpace( cameraMatrix, target ) {
 
-			for ( var i = 0; i < 4; i ++ ) {
+			for ( let i = 0; i < 4; i ++ ) {
 
 				target.vertices.near[ i ].copy( this.vertices.near[ i ] ).applyMatrix4( cameraMatrix );
 				target.vertices.far[ i ].copy( this.vertices.far[ i ] ).applyMatrix4( cameraMatrix );

package/examples/js/csm/CSMShader.js

@@ -92,19 +92,19 @@ IncidentLight directLight;
 		directionalLight = directionalLights[ i ];
 		getDirectionalLightInfo( directionalLight, geometry, directLight );
 
-		// NOTE: Depth gets larger away from the camera.
-		// cascade.x is closer, cascade.y is further
-		cascade = CSM_cascades[ i ];
-		cascadeCenter = ( cascade.x + cascade.y ) / 2.0;
-		closestEdge = linearDepth < cascadeCenter ? cascade.x : cascade.y;
-		margin = 0.25 * pow( closestEdge, 2.0 );
-		csmx = cascade.x - margin / 2.0;
-		csmy = cascade.y + margin / 2.0;
-		if( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS && linearDepth >= csmx && ( linearDepth < csmy || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 ) ) {
-
-			float dist = min( linearDepth - csmx, csmy - linearDepth );
-			float ratio = clamp( dist / margin, 0.0, 1.0 );
-			if( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS ) {
+	  	#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
+			// NOTE: Depth gets larger away from the camera.
+			// cascade.x is closer, cascade.y is further
+			cascade = CSM_cascades[ i ];
+			cascadeCenter = ( cascade.x + cascade.y ) / 2.0;
+			closestEdge = linearDepth < cascadeCenter ? cascade.x : cascade.y;
+			margin = 0.25 * pow( closestEdge, 2.0 );
+			csmx = cascade.x - margin / 2.0;
+			csmy = cascade.y + margin / 2.0;
+			if( linearDepth >= csmx && ( linearDepth < csmy || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 ) ) {
+
+				float dist = min( linearDepth - csmx, csmy - linearDepth );
+				float ratio = clamp( dist / margin, 0.0, 1.0 );
 
 				vec3 prevColor = directLight.color;
 				directionalLightShadow = directionalLightShadows[ i ];
@@ -113,42 +113,58 @@ IncidentLight directLight;
 				bool shouldFadeLastCascade = UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth > cascadeCenter;
 				directLight.color = mix( prevColor, directLight.color, shouldFadeLastCascade ? ratio : 1.0 );
 
-			}
-
-			ReflectedLight prevLight = reflectedLight;
-			RE_Direct( directLight, geometry, material, reflectedLight );
+				ReflectedLight prevLight = reflectedLight;
+				RE_Direct( directLight, geometry, material, reflectedLight );
 
-			bool shouldBlend = UNROLLED_LOOP_INDEX != CSM_CASCADES - 1 || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth < cascadeCenter;
-			float blendRatio = shouldBlend ? ratio : 1.0;
+				bool shouldBlend = UNROLLED_LOOP_INDEX != CSM_CASCADES - 1 || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1 && linearDepth < cascadeCenter;
+				float blendRatio = shouldBlend ? ratio : 1.0;
 
-			reflectedLight.directDiffuse = mix( prevLight.directDiffuse, reflectedLight.directDiffuse, blendRatio );
-			reflectedLight.directSpecular = mix( prevLight.directSpecular, reflectedLight.directSpecular, blendRatio );
-			reflectedLight.indirectDiffuse = mix( prevLight.indirectDiffuse, reflectedLight.indirectDiffuse, blendRatio );
-			reflectedLight.indirectSpecular = mix( prevLight.indirectSpecular, reflectedLight.indirectSpecular, blendRatio );
+				reflectedLight.directDiffuse = mix( prevLight.directDiffuse, reflectedLight.directDiffuse, blendRatio );
+				reflectedLight.directSpecular = mix( prevLight.directSpecular, reflectedLight.directSpecular, blendRatio );
+				reflectedLight.indirectDiffuse = mix( prevLight.indirectDiffuse, reflectedLight.indirectDiffuse, blendRatio );
+				reflectedLight.indirectSpecular = mix( prevLight.indirectSpecular, reflectedLight.indirectSpecular, blendRatio );
 
-		}
+			}
+	  	#endif
 
 	}
 	#pragma unroll_loop_end
 	#else
 
-	#pragma unroll_loop_start
-	for ( int i = 0; i < NUM_DIR_LIGHTS; i ++ ) {
+		#pragma unroll_loop_start
+		for ( int i = 0; i < NUM_DIR_LIGHTS; i ++ ) {
 
-		directionalLight = directionalLights[ i ];
-		getDirectionalLightInfo( directionalLight, geometry, directLight );
+			directionalLight = directionalLights[ i ];
+			getDirectionalLightInfo( directionalLight, geometry, directLight );
 
-		#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
+			#if defined( USE_SHADOWMAP ) && ( UNROLLED_LOOP_INDEX < NUM_DIR_LIGHT_SHADOWS )
 
-		directionalLightShadow = directionalLightShadows[ i ];
-		if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y) directLight.color *= all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLightShadow.shadowMapSize, directionalLightShadow.shadowBias, directionalLightShadow.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
+			directionalLightShadow = directionalLightShadows[ i ];
+			if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y) directLight.color *= all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLightShadow.shadowMapSize, directionalLightShadow.shadowBias, directionalLightShadow.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
 
-		#endif
+			if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && (linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1)) RE_Direct( directLight, geometry, material, reflectedLight );
 
-		if(linearDepth >= CSM_cascades[UNROLLED_LOOP_INDEX].x && (linearDepth < CSM_cascades[UNROLLED_LOOP_INDEX].y || UNROLLED_LOOP_INDEX == CSM_CASCADES - 1)) RE_Direct( directLight, geometry, material, reflectedLight );
+			#endif
 
-	}
-	#pragma unroll_loop_end
+		}
+		#pragma unroll_loop_end
+
+	#endif
+
+	#if ( NUM_DIR_LIGHTS > NUM_DIR_LIGHT_SHADOWS)
+		// compute the lights not casting shadows (if any)
+
+		#pragma unroll_loop_start
+		for ( int i = NUM_DIR_LIGHT_SHADOWS; i < NUM_DIR_LIGHTS; i ++ ) {
+
+			directionalLight = directionalLights[ i ];
+
+			getDirectionalLightInfo( directionalLight, geometry, directLight );
+
+			RE_Direct( directLight, geometry, material, reflectedLight );
+
+		}
+		#pragma unroll_loop_end
 
 	#endif
 

package/examples/js/curves/CurveExtras.js

@@ -330,23 +330,19 @@
 
 	}
 
-	const Curves = {
-		GrannyKnot: GrannyKnot,
-		HeartCurve: HeartCurve,
-		VivianiCurve: VivianiCurve,
-		KnotCurve: KnotCurve,
-		HelixCurve: HelixCurve,
-		TrefoilKnot: TrefoilKnot,
-		TorusKnot: TorusKnot,
-		CinquefoilKnot: CinquefoilKnot,
-		TrefoilPolynomialKnot: TrefoilPolynomialKnot,
-		FigureEightPolynomialKnot: FigureEightPolynomialKnot,
-		DecoratedTorusKnot4a: DecoratedTorusKnot4a,
-		DecoratedTorusKnot4b: DecoratedTorusKnot4b,
-		DecoratedTorusKnot5a: DecoratedTorusKnot5a,
-		DecoratedTorusKnot5c: DecoratedTorusKnot5c
-	};
-
-	THREE.Curves = Curves;
+	THREE.CinquefoilKnot = CinquefoilKnot;
+	THREE.DecoratedTorusKnot4a = DecoratedTorusKnot4a;
+	THREE.DecoratedTorusKnot4b = DecoratedTorusKnot4b;
+	THREE.DecoratedTorusKnot5a = DecoratedTorusKnot5a;
+	THREE.DecoratedTorusKnot5c = DecoratedTorusKnot5c;
+	THREE.FigureEightPolynomialKnot = FigureEightPolynomialKnot;
+	THREE.GrannyKnot = GrannyKnot;
+	THREE.HeartCurve = HeartCurve;
+	THREE.HelixCurve = HelixCurve;
+	THREE.KnotCurve = KnotCurve;
+	THREE.TorusKnot = TorusKnot;
+	THREE.TrefoilKnot = TrefoilKnot;
+	THREE.TrefoilPolynomialKnot = TrefoilPolynomialKnot;
+	THREE.VivianiCurve = VivianiCurve;
 
 } )();

package/examples/js/effects/AnaglyphEffect.js

@@ -81,10 +81,13 @@
 
 			this.dispose = function () {
 
-				if ( _renderTargetL ) _renderTargetL.dispose();
-				if ( _renderTargetR ) _renderTargetR.dispose();
-				if ( _mesh ) _mesh.geometry.dispose();
-				if ( _material ) _material.dispose();
+				_renderTargetL.dispose();
+
+				_renderTargetR.dispose();
+
+				_mesh.geometry.dispose();
+
+				_mesh.material.dispose();
 
 			};
 

package/examples/js/effects/AsciiEffect.js

@@ -13,18 +13,18 @@
 			// darker bolder character set from https://github.com/saw/Canvas-ASCII-Art/
 			// ' .\'`^",:;Il!i~+_-?][}{1)(|/tfjrxnuvczXYUJCLQ0OZmwqpdbkhao*#MW&8%B@$'.split('');
 			// Some ASCII settings
-			const bResolution = ! options[ 'resolution' ] ? 0.15 : options[ 'resolution' ]; // Higher for more details
+			const fResolution = options[ 'resolution' ] || 0.15; // Higher for more details
 
-			const iScale = ! options[ 'scale' ] ? 1 : options[ 'scale' ];
-			const bColor = ! options[ 'color' ] ? false : options[ 'color' ]; // nice but slows down rendering!
+			const iScale = options[ 'scale' ] || 1;
+			const bColor = options[ 'color' ] || false; // nice but slows down rendering!
 
-			const bAlpha = ! options[ 'alpha' ] ? false : options[ 'alpha' ]; // Transparency
+			const bAlpha = options[ 'alpha' ] || false; // Transparency
 
-			const bBlock = ! options[ 'block' ] ? false : options[ 'block' ]; // blocked characters. like good O dos
+			const bBlock = options[ 'block' ] || false; // blocked characters. like good O dos
 
-			const bInvert = ! options[ 'invert' ] ? false : options[ 'invert' ]; // black is white, white is black
+			const bInvert = options[ 'invert' ] || false; // black is white, white is black
 
-			const strResolution = 'low';
+			const strResolution = options[ 'strResolution' ] || 'low';
 			let width, height;
 			const domElement = document.createElement( 'div' );
 			domElement.style.cursor = 'default';
@@ -45,7 +45,7 @@
 			this.render = function ( scene, camera ) {
 
 				renderer.render( scene, camera );
-				asciifyImage( renderer, oAscii );
+				asciifyImage( oAscii );
 
 			};
 
@@ -108,26 +108,7 @@
 			}
 
 			let aCharList = bColor ? aDefaultColorCharList : aDefaultCharList;
-			if ( charSet ) aCharList = charSet;
-			let fResolution = 0.5;
-
-			switch ( strResolution ) {
-
-				case 'low':
-					fResolution = 0.25;
-					break;
-
-				case 'medium':
-					fResolution = 0.5;
-					break;
-
-				case 'high':
-					fResolution = 1;
-					break;
-
-			}
-
-			if ( bResolution ) fResolution = bResolution; // Setup dom
+			if ( charSet ) aCharList = charSet; // Setup dom
 
 			const fFontSize = 2 / fResolution * iScale;
 			const fLineHeight = 2 / fResolution * iScale; // adjust letter-spacing for all combinations of scale and resolution to get it to fit the image width.
@@ -205,7 +186,7 @@
 			// convert img element to ascii
 
 
-			function asciifyImage( canvasRenderer, oAscii ) {
+			function asciifyImage( oAscii ) {
 
 				oCtx.clearRect( 0, 0, iWidth, iHeight );
 				oCtx.drawImage( oCanvasImg, 0, 0, iWidth, iHeight );

package/examples/js/exporters/ColladaExporter.js

@@ -127,10 +127,28 @@
 
 
 			const getFuncs = [ 'getX', 'getY', 'getZ', 'getW' ];
+			const tempColor = new THREE.Color();
 
-			function attrBufferToArray( attr ) {
+			function attrBufferToArray( attr, isColor = false ) {
 
-				if ( attr.isInterleavedBufferAttribute ) {
+				if ( isColor ) {
+
+					// convert the colors to srgb before export
+					// colors are always written as floats
+					const arr = new Float32Array( attr.count * 3 );
+
+					for ( let i = 0, l = attr.count; i < l; i ++ ) {
+
+						tempColor.fromBufferAttribute( attr, i ).convertLinearToSRGB();
+						arr[ 3 * i + 0 ] = tempColor.r;
+						arr[ 3 * i + 1 ] = tempColor.g;
+						arr[ 3 * i + 2 ] = tempColor.b;
+
+					}
+
+					return arr;
+
+				} else if ( attr.isInterleavedBufferAttribute ) {
 
 					// use the typed array constructor to save on memory
 					const arr = new attr.array.constructor( attr.count * attr.itemSize );
@@ -165,9 +183,9 @@
 			} // Returns the string for a geometry's attribute
 
 
-			function getAttribute( attr, name, params, type ) {
+			function getAttribute( attr, name, params, type, isColor = false ) {
 
-				const array = attrBufferToArray( attr );
+				const array = attrBufferToArray( attr, isColor );
 				const res = `<source id="${name}">` + `<float_array id="${name}-array" count="${array.length}">` + array.join( ' ' ) + '</float_array>' + '<technique_common>' + `<accessor source="#${name}-array" count="${Math.floor( array.length / attr.itemSize )}" stride="${attr.itemSize}">` + params.map( n => `<param name="${n}" type="${type}" />` ).join( '' ) + '</accessor>' + '</technique_common>' + '</source>';
 				return res;
 
@@ -255,8 +273,9 @@
 
 					if ( 'color' in bufferGeometry.attributes ) {
 
+						// colors are always written as floats
 						const colName = `${meshid}-color`;
-						gnode += getAttribute( bufferGeometry.attributes.color, colName, [ 'X', 'Y', 'Z' ], 'uint8' );
+						gnode += getAttribute( bufferGeometry.attributes.color, colName, [ 'R', 'G', 'B' ], 'float', true );
 						triangleInputs += `<input semantic="COLOR" source="#${colName}" offset="0" />`;
 
 					}
@@ -376,7 +395,10 @@
 					const diffuse = m.color ? m.color : new THREE.Color( 0, 0, 0 );
 					const specular = m.specular ? m.specular : new THREE.Color( 1, 1, 1 );
 					const shininess = m.shininess || 0;
-					const reflectivity = m.reflectivity || 0; // Do not export and alpha map for the reasons mentioned in issue (#13792)
+					const reflectivity = m.reflectivity || 0;
+					emissive.convertLinearToSRGB();
+					specular.convertLinearToSRGB();
+					diffuse.convertLinearToSRGB(); // Do not export and alpha map for the reasons mentioned in issue (#13792)
 					// in three.js alpha maps are black and white, but collada expects the alpha
 					// channel to specify the transparency
 
@@ -441,7 +463,7 @@
 					}
 
 					matids = matidsArray.fill().map( ( v, i ) => processMaterial( materials[ i % materials.length ] ) );
-					node += `<instance_geometry url="#${meshid}">` + ( matids != null ? '<bind_material><technique_common>' + matids.map( ( id, i ) => `<instance_material symbol="MESH_MATERIAL_${i}" target="#${id}" >` + '<bind_vertex_input semantic="TEXCOORD" input_semantic="TEXCOORD" input_set="0" />' + '</instance_material>' ).join( '' ) + '</technique_common></bind_material>' : '' ) + '</instance_geometry>';
+					node += `<instance_geometry url="#${meshid}">` + ( matids.length > 0 ? '<bind_material><technique_common>' + matids.map( ( id, i ) => `<instance_material symbol="MESH_MATERIAL_${i}" target="#${id}" >` + '<bind_vertex_input semantic="TEXCOORD" input_semantic="TEXCOORD" input_set="0" />' + '</instance_material>' ).join( '' ) + '</technique_common></bind_material>' : '' ) + '</instance_geometry>';
 
 				}