kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #67 from hamoid/linearGradientExpo

Browse Source 
Add LinearGradient exponent
This commit is contained in:
Edwin Jakobs
2020-04-07 15:36:35 +02:00
committed by GitHub
parent 957ba03b9b 43d44cc895
commit 9200519672
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
orx-shade-styles/src/main/kotlin/LinearGradient.kt
View File

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