|
2 | 2 | // https://github.com/AcademySoftwareFoundation/MaterialX/blob/main/libraries/stdlib/genglsl/lib/mx_hsv.glsl
|
3 | 3 |
|
4 | 4 | import { int, float, vec3, If, Fn } from '../../shadernode/ShaderNode.js';
|
5 |
| -import { add, sub, mul } from '../../math/OperatorNode.js'; |
| 5 | +import { add } from '../../math/OperatorNode.js'; |
6 | 6 | import { floor, trunc, max, min } from '../../math/MathNode.js';
|
7 | 7 |
|
8 |
| -export const mx_hsvtorgb = /*#__PURE__*/ Fn( ( [ hsv_immutable ] ) => { |
| 8 | +export const mx_hsvtorgb = /*#__PURE__*/ Fn( ( [ hsv ] ) => { |
9 | 9 |
|
10 |
| - const hsv = vec3( hsv_immutable ).toVar(); |
11 |
| - const h = float( hsv.x ).toVar(); |
12 |
| - const s = float( hsv.y ).toVar(); |
13 |
| - const v = float( hsv.z ).toVar(); |
| 10 | + const s = hsv.y; |
| 11 | + const v = hsv.z; |
| 12 | + |
| 13 | + const result = vec3().toVar(); |
14 | 14 |
|
15 | 15 | If( s.lessThan( 0.0001 ), () => {
|
16 | 16 |
|
17 |
| - return vec3( v, v, v ); |
| 17 | + result.assign( vec3( v, v, v ) ); |
18 | 18 |
|
19 | 19 | } ).Else( () => {
|
20 | 20 |
|
21 |
| - h.assign( mul( 6.0, h.sub( floor( h ) ) ) ); |
22 |
| - const hi = int( trunc( h ) ).toVar(); |
23 |
| - const f = float( h.sub( float( hi ) ) ).toVar(); |
24 |
| - const p = float( v.mul( sub( 1.0, s ) ) ).toVar(); |
25 |
| - const q = float( v.mul( sub( 1.0, s.mul( f ) ) ) ).toVar(); |
26 |
| - const t = float( v.mul( sub( 1.0, s.mul( sub( 1.0, f ) ) ) ) ).toVar(); |
| 21 | + let h = hsv.x; |
| 22 | + h = h.sub( floor( h ) ).mul( 6.0 ).toVar(); // TODO: check what .toVar() is needed in node system cache |
| 23 | + const hi = int( trunc( h ) ); |
| 24 | + const f = h.sub( float( hi ) ); |
| 25 | + const p = v.mul( s.oneMinus() ); |
| 26 | + const q = v.mul( s.mul( f ).oneMinus() ); |
| 27 | + const t = v.mul( s.mul( f.oneMinus() ).oneMinus() ); |
27 | 28 |
|
28 | 29 | If( hi.equal( int( 0 ) ), () => {
|
29 | 30 |
|
30 |
| - return vec3( v, t, p ); |
| 31 | + result.assign( vec3( v, t, p ) ); |
31 | 32 |
|
32 | 33 | } ).ElseIf( hi.equal( int( 1 ) ), () => {
|
33 | 34 |
|
34 |
| - return vec3( q, v, p ); |
| 35 | + result.assign( vec3( q, v, p ) ); |
35 | 36 |
|
36 | 37 | } ).ElseIf( hi.equal( int( 2 ) ), () => {
|
37 | 38 |
|
38 |
| - return vec3( p, v, t ); |
| 39 | + result.assign( vec3( p, v, t ) ); |
39 | 40 |
|
40 | 41 | } ).ElseIf( hi.equal( int( 3 ) ), () => {
|
41 | 42 |
|
42 |
| - return vec3( p, q, v ); |
| 43 | + result.assign( vec3( p, q, v ) ); |
43 | 44 |
|
44 | 45 | } ).ElseIf( hi.equal( int( 4 ) ), () => {
|
45 | 46 |
|
46 |
| - return vec3( t, p, v ); |
| 47 | + result.assign( vec3( t, p, v ) ); |
47 | 48 |
|
48 |
| - } ); |
| 49 | + } ).Else( () => { |
49 | 50 |
|
50 |
| - return vec3( v, p, q ); |
| 51 | + result.assign( vec3( v, p, q ) ); |
| 52 | + |
| 53 | + } ); |
51 | 54 |
|
52 | 55 | } );
|
53 | 56 |
|
| 57 | + return result; |
| 58 | + |
54 | 59 | } ).setLayout( {
|
55 | 60 | name: 'mx_hsvtorgb',
|
56 | 61 | type: 'vec3',
|
|
0 commit comments