|
|
@@ -6389,13 +6389,13 @@ function createColorManagement() {
|
|
|
|
|
|
},
|
|
|
|
|
|
- fromWorkingColorSpace: function ( color, targetColorSpace ) {
|
|
|
+ workingToColorSpace: function ( color, targetColorSpace ) {
|
|
|
|
|
|
return this.convert( color, this.workingColorSpace, targetColorSpace );
|
|
|
|
|
|
},
|
|
|
|
|
|
- toWorkingColorSpace: function ( color, sourceColorSpace ) {
|
|
|
+ colorSpaceToWorking: function ( color, sourceColorSpace ) {
|
|
|
|
|
|
return this.convert( color, sourceColorSpace, this.workingColorSpace );
|
|
|
|
|
|
@@ -6447,7 +6447,25 @@ function createColorManagement() {
|
|
|
|
|
|
return this.spaces[ colorSpace ].workingColorSpaceConfig.unpackColorSpace;
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+ // Deprecated
|
|
|
+
|
|
|
+ fromWorkingColorSpace: function ( color, targetColorSpace ) {
|
|
|
+
|
|
|
+ warnOnce( 'THREE.ColorManagement: .fromWorkingColorSpace() has been renamed to .workingToColorSpace().' ); // @deprecated, r177
|
|
|
+
|
|
|
+ return ColorManagement.workingToColorSpace( color, targetColorSpace );
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ toWorkingColorSpace: function ( color, sourceColorSpace ) {
|
|
|
+
|
|
|
+ warnOnce( 'THREE.ColorManagement: .toWorkingColorSpace() has been renamed to .colorSpaceToWorking().' ); // @deprecated, r177
|
|
|
+
|
|
|
+ return ColorManagement.colorSpaceToWorking( color, sourceColorSpace );
|
|
|
+
|
|
|
+ },
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -15479,7 +15497,7 @@ class Color {
|
|
|
this.g = ( hex >> 8 & 255 ) / 255;
|
|
|
this.b = ( hex & 255 ) / 255;
|
|
|
|
|
|
- ColorManagement.toWorkingColorSpace( this, colorSpace );
|
|
|
+ ColorManagement.colorSpaceToWorking( this, colorSpace );
|
|
|
|
|
|
return this;
|
|
|
|
|
|
@@ -15500,7 +15518,7 @@ class Color {
|
|
|
this.g = g;
|
|
|
this.b = b;
|
|
|
|
|
|
- ColorManagement.toWorkingColorSpace( this, colorSpace );
|
|
|
+ ColorManagement.colorSpaceToWorking( this, colorSpace );
|
|
|
|
|
|
return this;
|
|
|
|
|
|
@@ -15537,7 +15555,7 @@ class Color {
|
|
|
|
|
|
}
|
|
|
|
|
|
- ColorManagement.toWorkingColorSpace( this, colorSpace );
|
|
|
+ ColorManagement.colorSpaceToWorking( this, colorSpace );
|
|
|
|
|
|
return this;
|
|
|
|
|
|
@@ -15808,7 +15826,7 @@ class Color {
|
|
|
*/
|
|
|
getHex( colorSpace = SRGBColorSpace ) {
|
|
|
|
|
|
- ColorManagement.fromWorkingColorSpace( _color.copy( this ), colorSpace );
|
|
|
+ ColorManagement.workingToColorSpace( _color.copy( this ), colorSpace );
|
|
|
|
|
|
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 ) );
|
|
|
|
|
|
@@ -15838,7 +15856,7 @@ class Color {
|
|
|
|
|
|
// h,s,l ranges are in 0.0 - 1.0
|
|
|
|
|
|
- ColorManagement.fromWorkingColorSpace( _color.copy( this ), colorSpace );
|
|
|
+ ColorManagement.workingToColorSpace( _color.copy( this ), colorSpace );
|
|
|
|
|
|
const r = _color.r, g = _color.g, b = _color.b;
|
|
|
|
|
|
@@ -15888,7 +15906,7 @@ class Color {
|
|
|
*/
|
|
|
getRGB( target, colorSpace = ColorManagement.workingColorSpace ) {
|
|
|
|
|
|
- ColorManagement.fromWorkingColorSpace( _color.copy( this ), colorSpace );
|
|
|
+ ColorManagement.workingToColorSpace( _color.copy( this ), colorSpace );
|
|
|
|
|
|
target.r = _color.r;
|
|
|
target.g = _color.g;
|
|
|
@@ -15906,7 +15924,7 @@ class Color {
|
|
|
*/
|
|
|
getStyle( colorSpace = SRGBColorSpace ) {
|
|
|
|
|
|
- ColorManagement.fromWorkingColorSpace( _color.copy( this ), colorSpace );
|
|
|
+ ColorManagement.workingToColorSpace( _color.copy( this ), colorSpace );
|
|
|
|
|
|
const r = _color.r, g = _color.g, b = _color.b;
|
|
|
|
Mugen87