diff --git a/orx-shade-styles/src/main/kotlin/LinearGradient.kt b/orx-shade-styles/src/main/kotlin/LinearGradient.kt index c5c933a0..fc6c81c8 100644 --- a/orx-shade-styles/src/main/kotlin/LinearGradient.kt +++ b/orx-shade-styles/src/main/kotlin/LinearGradient.kt @@ -2,7 +2,6 @@ package org.openrndr.extra.shadestyles import org.openrndr.color.ColorRGBa import org.openrndr.draw.ShadeStyle -import org.openrndr.draw.shadeStyle import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.parameters.DoubleParameter @@ -13,7 +12,8 @@ class LinearGradient( color0: ColorRGBa, color1: ColorRGBa, offset: Vector2, - rotation: Double) : ShadeStyle() { + rotation: Double, + exponent: Double) : ShadeStyle() { @ColorParameter("start color", order = 0) var color0: ColorRGBa by Parameter() @@ -22,12 +22,15 @@ class LinearGradient( var offset: Vector2 by Parameter() @DoubleParameter("rotation", -180.0, 180.0, order = 2) var rotation: Double by Parameter() + @DoubleParameter("exponent", 0.01, 10.0, order = 3) + var exponent: Double by Parameter() init { this.color0 = color0 this.color1 = color1 this.offset = offset this.rotation = rotation + this.exponent = exponent fragmentTransform = """ vec2 coord = (c_boundsPosition.xy - vec2(0.5) + p_offset); @@ -36,23 +39,27 @@ class LinearGradient( mat2 rm = mat2(cr, -sr, sr, cr); float f = clamp((rm * coord).y + 0.5, 0.0, 1.0); - vec4 color0 = p_color0 * vec4(p_color0.aaa, 1.0); - vec4 color1 = p_color1 * vec4(p_color1.aaa, 1.0); + vec4 color0 = p_color0; + color0.rgb *= color0.a; + + vec4 color1 = p_color1; + color1.rgb *= color1.a; + + vec4 gradient = mix(color0, color1, pow(f, p_exponent)); - vec4 gradient = color0 * (1.0-f) + color1 * f; - vec4 fn = vec4(x_fill.rgb, 1.0) * x_fill.a; x_fill = fn * gradient; - if (x_fill.a !=0) { + if (x_fill.a != 0) { x_fill.rgb /= x_fill.a; } """ } } -fun linearGradient(color0: ColorRGBa, color1: ColorRGBa, offset: Vector2 = Vector2.ZERO, rotation: Double = 0.0) = - LinearGradient(color0, color1, offset, rotation) +fun linearGradient(color0: ColorRGBa, color1: ColorRGBa, offset: Vector2 = + Vector2.ZERO, rotation: Double = 0.0, exponent: Double = 1.0) = + LinearGradient(color0, color1, offset, rotation, exponent)