diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-23 17:54:26 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-23 17:54:33 +0200 |
commit | 41ccb47065b9ba4418d792644415a424270b256f (patch) | |
tree | 7a1ae164efc44b4cd74344fb88d13fe1158576c4 /res/effectlib/gradient3Recolor.glsllib | |
parent | 8bb3378d0d7c82eb1896ac043570ddab7c2edae9 (diff) | |
parent | b81bba4795eea06d4dcbf39c99f986de2654077d (diff) |
Merge remote-tracking branch 'origin/2.0'v2.0.0-beta2
Change-Id: I1d34fa789a3962e6efe595fdd028db953749bd53
Diffstat (limited to 'res/effectlib/gradient3Recolor.glsllib')
-rw-r--r-- | res/effectlib/gradient3Recolor.glsllib | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/res/effectlib/gradient3Recolor.glsllib b/res/effectlib/gradient3Recolor.glsllib index 18556f3..ba7d593 100644 --- a/res/effectlib/gradient3Recolor.glsllib +++ b/res/effectlib/gradient3Recolor.glsllib @@ -35,15 +35,15 @@ float gradientInterpolate( in int interpolationMode, in float value ) case gradient_interpolation_linear : return( value ); case gradient_interpolation_off : - return( 0.0f ); + return( 0.0 ); case gradient_interpolation_ease_in : - return( 1.0f - pow( 1.0f - value, 2.0f/3.0f ) ); + return( 1.0 - pow( 1.0 - value, 2.0/3.0 ) ); case gradient_interpolation_ease_out : - return( pow( value, 2.0f/3.0f ) ); + return( pow( value, 2.0/3.0 ) ); case gradient_interpolation_ease_in_out : - return( ( value <= 0.5f ) - ? 0.5f * pow( 2.0f * value, 2.0f/3.0f ) - : 0.5f + 0.5f * ( 1.0f - pow( 2.0f * ( 1.0f - value ), 2.0f/3.0f ) ) ); + return( ( value <= 0.5 ) + ? 0.5 * pow( 2.0 * value, 2.0/3.0 ) + : 0.5 + 0.5 * ( 1.0 - pow( 2.0 * ( 1.0 - value ), 2.0/3.0 ) ) ); default: return( value ); // default is linear } @@ -67,7 +67,7 @@ texture_return gradient3Recolor( in float gradientPositions[3], in vec3 gradient float relPos = gradientInterpolate( interpolationModes[index], ( pos - gradientPositions[index] ) / ( gradientPositions[index+1] - gradientPositions[index] ) ); tr.tint = mix( gradientColors[index], gradientColors[index+1], relPos ); } - tr.mono = 0.0f; + tr.mono = 0.0; return( tr ); } |