@needle-tools/three 0.146.9 → 0.153.0

package/examples/jsm/loaders/SVGLoader.js

@@ -9,10 +9,13 @@ import {
 	Shape,
 	ShapePath,
 	ShapeUtils,
+	SRGBColorSpace,
 	Vector2,
 	Vector3
 } from 'three';
 
+const COLOR_SPACE_SVG = SRGBColorSpace;
+
 class SVGLoader extends Loader {
 
 	constructor( manager ) {
@@ -155,7 +158,7 @@ class SVGLoader extends Loader {
 
 				if ( style.fill !== undefined && style.fill !== 'none' ) {
 
-					path.color.setStyle( style.fill );
+					path.color.setStyle( style.fill, COLOR_SPACE_SVG );
 
 				}
 
@@ -218,6 +221,8 @@ class SVGLoader extends Loader {
 
 			const d = node.getAttribute( 'd' );
 
+			if ( d === '' || d === 'none' ) return null;
+
 			// console.log( d );
 
 			const commands = d.match( /[a-df-z][^a-df-z]*/ig );
@@ -866,7 +871,7 @@ class SVGLoader extends Loader {
 
 			}
 
-			const regex = /(-?[\d\.?]+)[,|\s](-?[\d\.?]+)/g;
+			const regex = /([+-]?\d*\.?\d+(?:e[+-]?\d+)?)(?:,|\s)([+-]?\d*\.?\d+(?:e[+-]?\d+)?)/g;
 
 			const path = new ShapePath();
 
@@ -901,7 +906,7 @@ class SVGLoader extends Loader {
 
 			}
 
-			const regex = /(-?[\d\.?]+)[,|\s](-?[\d\.?]+)/g;
+			const regex = /([+-]?\d*\.?\d+(?:e[+-]?\d+)?)(?:,|\s)([+-]?\d*\.?\d+(?:e[+-]?\d+)?)/g;
 
 			const path = new ShapePath();
 
@@ -1600,7 +1605,7 @@ class SVGLoader extends Loader {
 				const sinTheta = Math.sin( curve.aRotation );
 
 				const v1 = new Vector3( a * cosTheta, a * sinTheta, 0 );
-				const v2 = new Vector3( -b * sinTheta, b * cosTheta, 0 );
+				const v2 = new Vector3( - b * sinTheta, b * cosTheta, 0 );
 
 				const f1 = v1.applyMatrix3( m );
 				const f2 = v2.applyMatrix3( m );
@@ -1608,7 +1613,7 @@ class SVGLoader extends Loader {
 				const mF = tempTransform0.set(
 					f1.x, f2.x, 0,
 					f1.y, f2.y, 0,
-					0,    0,    1,
+					0, 0, 1,
 				);
 
 				const mFInv = tempTransform1.copy( mF ).invert();
@@ -1616,7 +1621,7 @@ class SVGLoader extends Loader {
 				const mQ = mFInvT.multiply( mFInv );
 				const mQe = mQ.elements;
 
-				const ed = eigenDecomposition( mQe[0], mQe[1], mQe[4] );
+				const ed = eigenDecomposition( mQe[ 0 ], mQe[ 1 ], mQe[ 4 ] );
 				const rt1sqrt = Math.sqrt( ed.rt1 );
 				const rt2sqrt = Math.sqrt( ed.rt2 );
 
@@ -1630,18 +1635,18 @@ class SVGLoader extends Loader {
 				// Do not touch angles of a full ellipse because after transformation they
 				// would converge to a sinle value effectively removing the whole curve
 
-				if ( !isFullEllipse ) {
+				if ( ! isFullEllipse ) {
 
 					const mDsqrt = tempTransform1.set(
 						rt1sqrt, 0, 0,
 						0, rt2sqrt, 0,
-						0, 0,       1,
+						0, 0, 1,
 					);
 
 					const mRT = tempTransform2.set(
-						ed.cs,  ed.sn, 0,
-						-ed.sn, ed.cs, 0,
-						0,      0,     1,
+						ed.cs, ed.sn, 0,
+						- ed.sn, ed.cs, 0,
+						0, 0, 1,
 					);
 
 					const mDRF = mDsqrt.multiply( mRT ).multiply( mF );
@@ -1653,14 +1658,14 @@ class SVGLoader extends Loader {
 
 						return Math.atan2( sinR, cosR );
 
-					}
+					};
 
 					curve.aStartAngle = transformAngle( curve.aStartAngle );
 					curve.aEndAngle = transformAngle( curve.aEndAngle );
 
 					if ( isTransformFlipped( m ) ) {
 
-						curve.aClockwise = !curve.aClockwise;
+						curve.aClockwise = ! curve.aClockwise;
 
 					}
 
@@ -1688,16 +1693,16 @@ class SVGLoader extends Loader {
 				// `sx`, `sy`, or both might be zero.
 				const theta =
 					sx > Number.EPSILON
-					? Math.atan2( m.elements[ 1 ], m.elements[ 0 ] )
-					: Math.atan2( - m.elements[ 3 ], m.elements[ 4 ] );
+						? Math.atan2( m.elements[ 1 ], m.elements[ 0 ] )
+						: Math.atan2( - m.elements[ 3 ], m.elements[ 4 ] );
 
 				curve.aRotation += theta;
 
 				if ( isTransformFlipped( m ) ) {
 
-					curve.aStartAngle *= -1;
-					curve.aEndAngle *= -1;
-					curve.aClockwise = !curve.aClockwise;
+					curve.aStartAngle *= - 1;
+					curve.aEndAngle *= - 1;
+					curve.aClockwise = ! curve.aClockwise;
 
 				}
 
@@ -1829,7 +1834,7 @@ class SVGLoader extends Loader {
 				// This case needs to be treated separately to avoid div by 0
 
 				rt1 = 0.5 * rt;
-				rt2 = -0.5 * rt;
+				rt2 = - 0.5 * rt;
 
 			}
 
@@ -1847,7 +1852,7 @@ class SVGLoader extends Loader {
 
 			if ( Math.abs( cs ) > 2 * Math.abs( B ) ) {
 
-				t = -2 * B / cs;
+				t = - 2 * B / cs;
 				sn = 1 / Math.sqrt( 1 + t * t );
 				cs = t * sn;
 
@@ -1858,7 +1863,7 @@ class SVGLoader extends Loader {
 
 			} else {
 
-				t = -0.5 * cs / B;
+				t = - 0.5 * cs / B;
 				cs = 1 / Math.sqrt( 1 + t * t );
 				sn = t * cs;
 
@@ -1867,7 +1872,7 @@ class SVGLoader extends Loader {
 			if ( df > 0 ) {
 
 				t = cs;
-				cs = -sn;
+				cs = - sn;
 				sn = t;
 
 			}
@@ -2255,8 +2260,6 @@ class SVGLoader extends Loader {
 		// TODO
 
 		// prepare paths for hole detection
-		let identifier = 0;
-
 		let scanlineMinX = BIGNUMBER;
 		let scanlineMaxX = - BIGNUMBER;
 
@@ -2313,14 +2316,20 @@ class SVGLoader extends Loader {
 
 			}
 
-			return { curves: p.curves, points: points, isCW: ShapeUtils.isClockWise( points ), identifier: identifier ++, boundingBox: new Box2( new Vector2( minX, minY ), new Vector2( maxX, maxY ) ) };
+			return { curves: p.curves, points: points, isCW: ShapeUtils.isClockWise( points ), identifier: - 1, boundingBox: new Box2( new Vector2( minX, minY ), new Vector2( maxX, maxY ) ) };
 
 		} );
 
 		simplePaths = simplePaths.filter( sp => sp.points.length > 1 );
 
+		for ( let identifier = 0; identifier < simplePaths.length; identifier ++ ) {
+
+			simplePaths[ identifier ].identifier = identifier;
+
+		}
+
 		// check if path is solid or a hole
-		const isAHole = simplePaths.map( p => isHoleTo( p, simplePaths, scanlineMinX, scanlineMaxX, shapePath.userData?.style.fillRule ) );
+		const isAHole = simplePaths.map( p => isHoleTo( p, simplePaths, scanlineMinX, scanlineMaxX, ( shapePath.userData ? shapePath.userData.style.fillRule : undefined ) ) );
 
 
 		const shapesToReturn = [];
@@ -2378,7 +2387,7 @@ class SVGLoader extends Loader {
 
 	static pointsToStroke( points, style, arcDivisions, minDistance ) {
 
-		// Generates a stroke with some witdh around the given path.
+		// Generates a stroke with some width around the given path.
 		// The path can be open or closed (last point equals to first point)
 		// Param points: Array of Vector2D (the path). Minimum 2 points.
 		// Param style: Object with SVG properties as returned by SVGLoader.getStrokeStyle(), or SVGLoader.parse() in the path.userData.style object

package/examples/jsm/loaders/TTFLoader.js

@@ -205,14 +205,7 @@ class TTFLoader extends Loader {
 
 		}
 
-		if ( typeof opentype === 'undefined' ) {
-
-			console.warn( 'THREE.TTFLoader: The loader requires opentype.js. Make sure it\'s included before using the loader.' );
-			return null;
-
-		}
-
-		return convert( opentype.parse( arraybuffer ), this.reversed ); // eslint-disable-line no-undef
+		return convert( opentype.parse( arraybuffer ), this.reversed );
 
 	}
 

package/examples/jsm/loaders/TiltLoader.js

@@ -1,6 +1,7 @@
 import {
 	BufferAttribute,
 	BufferGeometry,
+	Color,
 	DoubleSide,
 	FileLoader,
 	Group,
@@ -182,6 +183,8 @@ class StrokeGeometry extends BufferGeometry {
 		const vector3 = new Vector3();
 		const vector4 = new Vector3();
 
+		const color = new Color();
+
 		// size = size / 2;
 
 		for ( const k in strokes ) {
@@ -190,7 +193,10 @@ class StrokeGeometry extends BufferGeometry {
 			const positions = stroke[ 0 ];
 			const quaternions = stroke[ 1 ];
 			const size = stroke[ 2 ];
-			const color = stroke[ 3 ];
+			const rgba = stroke[ 3 ];
+			const alpha = stroke[ 3 ][ 3 ];
+
+			color.fromArray( rgba ).convertSRGBToLinear();
 
 			prevPosition.fromArray( positions, 0 );
 			prevQuaternion.fromArray( quaternions, 0 );
@@ -227,13 +233,13 @@ class StrokeGeometry extends BufferGeometry {
 				prevPosition.copy( position );
 				prevQuaternion.copy( quaternion );
 
-				colors.push( ...color );
-				colors.push( ...color );
-				colors.push( ...color );
+				colors.push( ...color, alpha );
+				colors.push( ...color, alpha );
+				colors.push( ...color, alpha );
 
-				colors.push( ...color );
-				colors.push( ...color );
-				colors.push( ...color );
+				colors.push( ...color, alpha );
+				colors.push( ...color, alpha );
+				colors.push( ...color, alpha );
 
 				const p1 = i / l;
 				const p2 = ( i - 3 ) / l;

package/examples/jsm/loaders/USDZLoader.js

@@ -9,7 +9,7 @@ import {
 	MeshStandardMaterial,
 	MirroredRepeatWrapping,
 	RepeatWrapping,
-	sRGBEncoding,
+	SRGBColorSpace,
 	TextureLoader,
 	Object3D,
 } from 'three';
@@ -205,7 +205,7 @@ class USDZLoader extends Loader {
 
 		}
 
-		const zip = fflate.unzipSync( new Uint8Array( buffer ) ); // eslint-disable-line no-undef
+		const zip = fflate.unzipSync( new Uint8Array( buffer ) );
 
 		// console.log( zip );
 
@@ -254,7 +254,7 @@ class USDZLoader extends Loader {
 
 			if ( id !== undefined ) {
 
-				const def = `def "%{id}"`;
+				const def = `def "${id}"`;
 
 				if ( def in data ) {
 
@@ -457,7 +457,7 @@ class USDZLoader extends Loader {
 						const sampler = findTexture( root, /(\w+).output/.exec( path )[ 1 ] );
 
 						material.map = buildTexture( sampler );
-						material.map.encoding = sRGBEncoding;
+						material.map.colorSpace = SRGBColorSpace;
 
 					} else if ( 'color3f inputs:diffuseColor' in surface ) {
 
@@ -494,7 +494,7 @@ class USDZLoader extends Loader {
 					const sampler = data[ 'def Shader "diffuseColor_texture"' ];
 
 					material.map = buildTexture( sampler );
-					material.map.encoding = sRGBEncoding;
+					material.map.colorSpace = SRGBColorSpace;
 
 				}
 
@@ -577,7 +577,7 @@ class USDZLoader extends Loader {
 			const geometry = buildGeometry( findMeshGeometry( data ) );
 			const material = buildMaterial( findMeshMaterial( data ) );
 
-			const mesh = geometry && material ? new Mesh( geometry, material ) : new Object3D();
+			const mesh = geometry ? new Mesh( geometry, material ) : new Object3D();
 
 			if ( 'matrix4d xformOp:transform' in data ) {
 

package/examples/jsm/loaders/VOXLoader.js

@@ -1,5 +1,6 @@
 import {
 	BufferGeometry,
+	Color,
 	Data3DTexture,
 	FileLoader,
 	Float32BufferAttribute,
@@ -8,7 +9,8 @@ import {
 	Mesh,
 	MeshStandardMaterial,
 	NearestFilter,
-	RedFormat
+	RedFormat,
+	SRGBColorSpace
 } from 'three';
 
 class VOXLoader extends Loader {
@@ -184,6 +186,8 @@ class VOXMesh extends Mesh {
 		const nz = [ 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0 ];
 		const pz = [ 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1 ];
 
+		const _color = new Color();
+
 		function add( tile, x, y, z, r, g, b ) {
 
 			x -= size.x / 2;
@@ -192,8 +196,10 @@ class VOXMesh extends Mesh {
 
 			for ( let i = 0; i < 18; i += 3 ) {
 
+				_color.setRGB( r, g, b, SRGBColorSpace );
+
 				vertices.push( tile[ i + 0 ] + x, tile[ i + 1 ] + y, tile[ i + 2 ] + z );
-				colors.push( r, g, b );
+				colors.push( _color.r, _color.g, _color.b );
 
 			}
 

package/examples/jsm/loaders/VRMLLoader.js

@@ -28,6 +28,7 @@ import {
 	Scene,
 	ShapeUtils,
 	SphereGeometry,
+	SRGBColorSpace,
 	TextureLoader,
 	Vector2,
 	Vector3
@@ -41,14 +42,6 @@ class VRMLLoader extends Loader {
 
 		super( manager );
 
-		// dependency check
-
-		if ( typeof chevrotain === 'undefined' ) { // eslint-disable-line no-undef
-
-			throw Error( 'THREE.VRMLLoader: External library chevrotain.min.js required.' );
-
-		}
-
 	}
 
 	load( url, onLoad, onProgress, onError ) {
@@ -128,7 +121,7 @@ class VRMLLoader extends Loader {
 
 		function createTokens() {
 
-			const createToken = chevrotain.createToken; // eslint-disable-line no-undef
+			const createToken = chevrotain.createToken;
 
 			// from http://gun.teipir.gr/VRML-amgem/spec/part1/concepts.html#SyntaxBasics
 
@@ -203,7 +196,7 @@ class VRMLLoader extends Loader {
 			const Comment = createToken( {
 				name: 'Comment',
 				pattern: /#.*/,
-				group: chevrotain.Lexer.SKIPPED // eslint-disable-line no-undef
+				group: chevrotain.Lexer.SKIPPED
 			} );
 
 			// commas, blanks, tabs, newlines and carriage returns are whitespace characters wherever they appear outside of string fields
@@ -211,7 +204,7 @@ class VRMLLoader extends Loader {
 			const WhiteSpace = createToken( {
 				name: 'WhiteSpace',
 				pattern: /[ ,\s]/,
-				group: chevrotain.Lexer.SKIPPED // eslint-disable-line no-undef
+				group: chevrotain.Lexer.SKIPPED
 			} );
 
 			const tokens = [
@@ -926,6 +919,7 @@ class VRMLLoader extends Loader {
 				} else {
 
 					skyMaterial.color.setRGB( skyColor[ 0 ], skyColor[ 1 ], skyColor[ 2 ] );
+					skyMaterial.color.convertSRGBToLinear();
 
 				}
 
@@ -1231,10 +1225,12 @@ class VRMLLoader extends Loader {
 
 					case 'diffuseColor':
 						materialData.diffuseColor = new Color( fieldValues[ 0 ], fieldValues[ 1 ], fieldValues[ 2 ] );
+						materialData.diffuseColor.convertSRGBToLinear();
 						break;
 
 					case 'emissiveColor':
 						materialData.emissiveColor = new Color( fieldValues[ 0 ], fieldValues[ 1 ], fieldValues[ 2 ] );
+						materialData.emissiveColor.convertSRGBToLinear();
 						break;
 
 					case 'shininess':
@@ -1242,7 +1238,8 @@ class VRMLLoader extends Loader {
 						break;
 
 					case 'specularColor':
-						materialData.emissiveColor = new Color( fieldValues[ 0 ], fieldValues[ 1 ], fieldValues[ 2 ] );
+						materialData.specularColor = new Color( fieldValues[ 0 ], fieldValues[ 1 ], fieldValues[ 2 ] );
+						materialData.specularColor.convertSRGBToLinear();
 						break;
 
 					case 'transparency':
@@ -1378,6 +1375,7 @@ class VRMLLoader extends Loader {
 						}
 
 						texture = new DataTexture( data, width, height );
+						texture.colorSpace = SRGBColorSpace;
 						texture.needsUpdate = true;
 						texture.__type = textureType; // needed for material modifications
 						break;
@@ -1450,6 +1448,7 @@ class VRMLLoader extends Loader {
 
 				texture.wrapS = wrapS;
 				texture.wrapT = wrapT;
+				texture.colorSpace = SRGBColorSpace;
 
 			}
 
@@ -1708,6 +1707,8 @@ class VRMLLoader extends Loader {
 
 				}
 
+				convertColorsToLinearSRGB( colorAttribute );
+
 			}
 
 			if ( normal ) {
@@ -1909,6 +1910,8 @@ class VRMLLoader extends Loader {
 
 				}
 
+				convertColorsToLinearSRGB( colorAttribute );
+
 			}
 
 			//
@@ -1974,7 +1977,15 @@ class VRMLLoader extends Loader {
 			const geometry = new BufferGeometry();
 
 			geometry.setAttribute( 'position', new Float32BufferAttribute( coord, 3 ) );
-			if ( color ) geometry.setAttribute( 'color', new Float32BufferAttribute( color, 3 ) );
+
+			if ( color ) {
+
+				const colorAttribute = new Float32BufferAttribute( color, 3 );
+				convertColorsToLinearSRGB( colorAttribute );
+
+				geometry.setAttribute( 'color', colorAttribute );
+
+			}
 
 			geometry._type = 'points';
 
@@ -2388,6 +2399,8 @@ class VRMLLoader extends Loader {
 
 				}
 
+				convertColorsToLinearSRGB( colorAttribute );
+
 			}
 
 			// normal attribute
@@ -3075,6 +3088,21 @@ class VRMLLoader extends Loader {
 
 		}
 
+		function convertColorsToLinearSRGB( attribute ) {
+
+			const color = new Color();
+
+			for ( let i = 0; i < attribute.count; i ++ ) {
+
+				color.fromBufferAttribute( attribute, i );
+				color.convertSRGBToLinear();
+
+				attribute.setXYZ( i, color.r, color.g, color.b );
+
+			}
+
+		}
+
 		/**
 		 * Vertically paints the faces interpolating between the
 		 * specified colors at the specified angels. This is used for the Background
@@ -3172,7 +3200,7 @@ class VRMLLoader extends Loader {
 				const colorA = colors[ thresholdIndexA ];
 				const colorB = colors[ thresholdIndexB ];
 
-				color.copy( colorA ).lerp( colorB, t );
+				color.copy( colorA ).lerp( colorB, t ).convertSRGBToLinear();
 
 				colorAttribute.setXYZ( index, color.r, color.g, color.b );
 
@@ -3213,7 +3241,7 @@ class VRMLLexer {
 
 	constructor( tokens ) {
 
-		this.lexer = new chevrotain.Lexer( tokens ); // eslint-disable-line no-undef
+		this.lexer = new chevrotain.Lexer( tokens );
 
 	}
 
@@ -3235,7 +3263,7 @@ class VRMLLexer {
 
 }
 
-const CstParser = chevrotain.CstParser;// eslint-disable-line no-undef
+const CstParser = chevrotain.CstParser;
 
 class VRMLParser extends CstParser {
 

package/examples/jsm/loaders/VTKLoader.js

@@ -1,10 +1,10 @@
 import {
 	BufferAttribute,
 	BufferGeometry,
+	Color,
 	FileLoader,
 	Float32BufferAttribute,
-	Loader,
-	LoaderUtils
+	Loader
 } from 'three';
 import * as fflate from '../libs/fflate.module.js';
 
@@ -108,6 +108,8 @@ class VTKLoader extends Loader {
 			let inColorSection = false;
 			let inNormalsSection = false;
 
+			const color = new Color();
+
 			const lines = data.split( '\n' );
 
 			for ( const i in lines ) {
@@ -208,7 +210,10 @@ class VTKLoader extends Loader {
 							const r = parseFloat( result[ 1 ] );
 							const g = parseFloat( result[ 2 ] );
 							const b = parseFloat( result[ 3 ] );
-							colors.push( r, g, b );
+
+							color.set( r, g, b ).convertSRGBToLinear();
+
+							colors.push( color.r, color.g, color.b );
 
 						}
 
@@ -320,9 +325,11 @@ class VTKLoader extends Loader {
 						const g = colors[ 3 * i + 1 ];
 						const b = colors[ 3 * i + 2 ];
 
-						newColors.push( r, g, b );
-						newColors.push( r, g, b );
-						newColors.push( r, g, b );
+						color.set( r, g, b ).convertSRGBToLinear();
+
+						newColors.push( color.r, color.g, color.b );
+						newColors.push( color.r, color.g, color.b );
+						newColors.push( color.r, color.g, color.b );
 
 					}
 
@@ -780,7 +787,7 @@ class VTKLoader extends Loader {
 
 					for ( let i = 0; i < dataOffsets.length - 1; i ++ ) {
 
-						const data = fflate.unzlibSync( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ) ); // eslint-disable-line no-undef
+						const data = fflate.unzlibSync( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ) );
 						content = data.buffer;
 
 						if ( ele.attributes.type === 'Float32' ) {
@@ -1130,16 +1137,18 @@ class VTKLoader extends Loader {
 
 		}
 
+		const textDecoder = new TextDecoder();
+
 		// get the 5 first lines of the files to check if there is the key word binary
-		const meta = LoaderUtils.decodeText( new Uint8Array( data, 0, 250 ) ).split( '\n' );
+		const meta = textDecoder.decode( new Uint8Array( data, 0, 250 ) ).split( '\n' );
 
 		if ( meta[ 0 ].indexOf( 'xml' ) !== - 1 ) {
 
-			return parseXML( LoaderUtils.decodeText( data ) );
+			return parseXML( textDecoder.decode( data ) );
 
 		} else if ( meta[ 2 ].includes( 'ASCII' ) ) {
 
-			return parseASCII( LoaderUtils.decodeText( data ) );
+			return parseASCII( textDecoder.decode( data ) );
 
 		} else {
 

package/examples/jsm/loaders/XYZLoader.js

@@ -1,5 +1,6 @@
 import {
 	BufferGeometry,
+	Color,
 	FileLoader,
 	Float32BufferAttribute,
 	Loader
@@ -47,6 +48,7 @@ class XYZLoader extends Loader {
 
 		const vertices = [];
 		const colors = [];
+		const color = new Color();
 
 		for ( let line of lines ) {
 
@@ -74,9 +76,13 @@ class XYZLoader extends Loader {
 				vertices.push( parseFloat( lineValues[ 1 ] ) );
 				vertices.push( parseFloat( lineValues[ 2 ] ) );
 
-				colors.push( parseFloat( lineValues[ 3 ] ) / 255 );
-				colors.push( parseFloat( lineValues[ 4 ] ) / 255 );
-				colors.push( parseFloat( lineValues[ 5 ] ) / 255 );
+				const r = parseFloat( lineValues[ 3 ] ) / 255;
+				const g = parseFloat( lineValues[ 4 ] ) / 255;
+				const b = parseFloat( lineValues[ 5 ] ) / 255;
+
+				color.set( r, g, b ).convertSRGBToLinear();
+
+				colors.push( color.r, color.g, color.b );
 
 			}