|
1 | 1 | ( function () { |
2 | 2 |
|
3 | | - var ColorConverter = { |
4 | | - setHSV: function ( color, h, s, v ) { |
| 3 | + const _hsl = {}; |
| 4 | + |
| 5 | + class ColorConverter { |
| 6 | + |
| 7 | + static setHSV( color, h, s, v ) { |
5 | 8 |
|
6 | 9 | // https://gist.github.com/xpansive/1337890#file-index-js |
7 | 10 | h = THREE.MathUtils.euclideanModulo( h, 1 ); |
8 | 11 | s = THREE.MathUtils.clamp( s, 0, 1 ); |
9 | 12 | v = THREE.MathUtils.clamp( v, 0, 1 ); |
10 | 13 | return color.setHSL( h, s * v / ( ( h = ( 2 - s ) * v ) < 1 ? h : 2 - h ), h * 0.5 ); |
11 | 14 |
|
12 | | - }, |
13 | | - getHSV: function () { |
| 15 | + } |
| 16 | + |
| 17 | + static getHSV( color, target ) { |
14 | 18 |
|
15 | | - var hsl = {}; |
16 | | - return function getHSV( color, target ) { |
| 19 | + if ( target === undefined ) { |
17 | 20 |
|
18 | | - if ( target === undefined ) { |
| 21 | + console.warn( 'THREE.ColorConverter: .getHSV() target is now required' ); |
| 22 | + target = { |
| 23 | + h: 0, |
| 24 | + s: 0, |
| 25 | + l: 0 |
| 26 | + }; |
19 | 27 |
|
20 | | - console.warn( 'THREE.ColorConverter: .getHSV() target is now required' ); |
21 | | - target = { |
22 | | - h: 0, |
23 | | - s: 0, |
24 | | - l: 0 |
25 | | - }; |
| 28 | + } |
26 | 29 |
|
27 | | - } |
| 30 | + color.getHSL( _hsl ); // based on https://gist.github.com/xpansive/1337890#file-index-js |
28 | 31 |
|
29 | | - color.getHSL( hsl ); // based on https://gist.github.com/xpansive/1337890#file-index-js |
| 32 | + _hsl.s *= _hsl.l < 0.5 ? _hsl.l : 1 - _hsl.l; |
| 33 | + target.h = _hsl.h; |
| 34 | + target.s = 2 * _hsl.s / ( _hsl.l + _hsl.s ); |
| 35 | + target.v = _hsl.l + _hsl.s; |
| 36 | + return target; |
30 | 37 |
|
31 | | - hsl.s *= hsl.l < 0.5 ? hsl.l : 1 - hsl.l; |
32 | | - target.h = hsl.h; |
33 | | - target.s = 2 * hsl.s / ( hsl.l + hsl.s ); |
34 | | - target.v = hsl.l + hsl.s; |
35 | | - return target; |
| 38 | + } // where c, m, y, k is between 0 and 1 |
36 | 39 |
|
37 | | - }; |
38 | 40 |
|
39 | | - }(), |
40 | | - // where c, m, y, k is between 0 and 1 |
41 | | - setCMYK: function ( color, c, m, y, k ) { |
| 41 | + static setCMYK( color, c, m, y, k ) { |
42 | 42 |
|
43 | | - var r = ( 1 - c ) * ( 1 - k ); |
44 | | - var g = ( 1 - m ) * ( 1 - k ); |
45 | | - var b = ( 1 - y ) * ( 1 - k ); |
| 43 | + const r = ( 1 - c ) * ( 1 - k ); |
| 44 | + const g = ( 1 - m ) * ( 1 - k ); |
| 45 | + const b = ( 1 - y ) * ( 1 - k ); |
46 | 46 | return color.setRGB( r, g, b ); |
47 | 47 |
|
48 | | - }, |
49 | | - getCMYK: function ( color, target ) { |
| 48 | + } |
| 49 | + |
| 50 | + static getCMYK( color, target ) { |
50 | 51 |
|
51 | 52 | if ( target === undefined ) { |
52 | 53 |
|
|
60 | 61 |
|
61 | 62 | } |
62 | 63 |
|
63 | | - var r = color.r; |
64 | | - var g = color.g; |
65 | | - var b = color.b; |
66 | | - var k = 1 - Math.max( r, g, b ); |
67 | | - var c = ( 1 - r - k ) / ( 1 - k ); |
68 | | - var m = ( 1 - g - k ) / ( 1 - k ); |
69 | | - var y = ( 1 - b - k ) / ( 1 - k ); |
| 64 | + const r = color.r; |
| 65 | + const g = color.g; |
| 66 | + const b = color.b; |
| 67 | + const k = 1 - Math.max( r, g, b ); |
| 68 | + const c = ( 1 - r - k ) / ( 1 - k ); |
| 69 | + const m = ( 1 - g - k ) / ( 1 - k ); |
| 70 | + const y = ( 1 - b - k ) / ( 1 - k ); |
70 | 71 | target.c = c; |
71 | 72 | target.m = m; |
72 | 73 | target.y = y; |
73 | 74 | target.k = k; |
74 | 75 | return target; |
75 | 76 |
|
76 | 77 | } |
77 | | - }; |
| 78 | + |
| 79 | + } |
78 | 80 |
|
79 | 81 | THREE.ColorConverter = ColorConverter; |
80 | 82 |
|
|
0 commit comments