|
@@ -8943,30 +8943,30 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
|
|
|
if ( color = /^\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*(\d*\.?\d+)\s*)?$/.exec( components ) ) {
|
|
|
|
|
|
// rgb(255,0,0) rgba(255,0,0,0.5)
|
|
|
- this.r = Math.min( 255, parseInt( color[ 1 ], 10 ) ) / 255;
|
|
|
- this.g = Math.min( 255, parseInt( color[ 2 ], 10 ) ) / 255;
|
|
|
- this.b = Math.min( 255, parseInt( color[ 3 ], 10 ) ) / 255;
|
|
|
-
|
|
|
- ColorManagement.toWorkingColorSpace( this, colorSpace );
|
|
|
|
|
|
handleAlpha( color[ 4 ] );
|
|
|
|
|
|
- return this;
|
|
|
+ return this.setRGB(
|
|
|
+ Math.min( 255, parseInt( color[ 1 ], 10 ) ) / 255,
|
|
|
+ Math.min( 255, parseInt( color[ 2 ], 10 ) ) / 255,
|
|
|
+ Math.min( 255, parseInt( color[ 3 ], 10 ) ) / 255,
|
|
|
+ colorSpace
|
|
|
+ );
|
|
|
|
|
|
}
|
|
|
|
|
|
if ( color = /^\s*(\d+)\%\s*,\s*(\d+)\%\s*,\s*(\d+)\%\s*(?:,\s*(\d*\.?\d+)\s*)?$/.exec( components ) ) {
|
|
|
|
|
|
// rgb(100%,0%,0%) rgba(100%,0%,0%,0.5)
|
|
|
- this.r = Math.min( 100, parseInt( color[ 1 ], 10 ) ) / 100;
|
|
|
- this.g = Math.min( 100, parseInt( color[ 2 ], 10 ) ) / 100;
|
|
|
- this.b = Math.min( 100, parseInt( color[ 3 ], 10 ) ) / 100;
|
|
|
-
|
|
|
- ColorManagement.toWorkingColorSpace( this, colorSpace );
|
|
|
|
|
|
handleAlpha( color[ 4 ] );
|
|
|
|
|
|
- return this;
|
|
|
+ return this.setRGB(
|
|
|
+ Math.min( 100, parseInt( color[ 1 ], 10 ) ) / 100,
|
|
|
+ Math.min( 100, parseInt( color[ 2 ], 10 ) ) / 100,
|
|
|
+ Math.min( 100, parseInt( color[ 3 ], 10 ) ) / 100,
|
|
|
+ colorSpace
|
|
|
+ );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -8978,13 +8978,15 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
|
|
|
if ( color = /^\s*(\d*\.?\d+)\s*,\s*(\d*\.?\d+)\%\s*,\s*(\d*\.?\d+)\%\s*(?:,\s*(\d*\.?\d+)\s*)?$/.exec( components ) ) {
|
|
|
|
|
|
// hsl(120,50%,50%) hsla(120,50%,50%,0.5)
|
|
|
- const h = parseFloat( color[ 1 ] ) / 360;
|
|
|
- const s = parseFloat( color[ 2 ] ) / 100;
|
|
|
- const l = parseFloat( color[ 3 ] ) / 100;
|
|
|
|
|
|
handleAlpha( color[ 4 ] );
|
|
|
|
|
|
- return this.setHSL( h, s, l, colorSpace );
|
|
|
+ return this.setHSL(
|
|
|
+ parseFloat( color[ 1 ] ) / 360,
|
|
|
+ parseFloat( color[ 2 ] ) / 100,
|
|
|
+ parseFloat( color[ 3 ] ) / 100,
|
|
|
+ colorSpace
|
|
|
+ );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -9111,7 +9113,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
|
|
|
|
|
|
ColorManagement.fromWorkingColorSpace( _color.copy( this ), colorSpace );
|
|
|
|
|
|
- return clamp( _color.r * 255, 0, 255 ) << 16 ^ clamp( _color.g * 255, 0, 255 ) << 8 ^ clamp( _color.b * 255, 0, 255 ) << 0;
|
|
|
+ return Math.round( clamp( _color.r * 255, 0, 255 ) ) * 65536 + Math.round( clamp( _color.g * 255, 0, 255 ) ) * 256 + Math.round( clamp( _color.b * 255, 0, 255 ) );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -9191,7 +9193,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
|
|
|
|
|
|
}
|
|
|
|
|
|
- return `rgb(${( r * 255 ) | 0},${( g * 255 ) | 0},${( b * 255 ) | 0})`;
|
|
|
+ return `rgb(${ Math.round( r * 255 ) },${ Math.round( g * 255 ) },${ Math.round( b * 255 ) })`;
|
|
|
|
|
|
}
|
|
|
|