Add OuterGlow

This commit is contained in:
Edwin Jakobs
2020-03-13 15:03:17 +01:00
parent dd7f97e7b7
commit cefc44fe7b
8 changed files with 385 additions and 5 deletions

View File

@@ -0,0 +1,61 @@
package org.openrndr.extra.jumpfill
import org.openrndr.draw.*
import org.openrndr.extra.parameters.Description
import org.openrndr.extra.parameters.DoubleParameter
import org.openrndr.math.Vector2
import org.openrndr.resourceUrl
private class InnerBevelFilter : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/fx/inner-bevel.frag"))) {
var angle: Double by parameters
var width: Double by parameters
var noise:Double by parameters
init {
angle = 0.0
width = 5.0
noise = 0.0
}
}
@Description("Inner bevel")
class InnerBevel : Filter() {
@DoubleParameter("threshold", 0.0, 1.0)
var threshold = 0.01
@DoubleParameter("distance scale", 0.0, 1.0)
var distanceScale = 1.0
@DoubleParameter("angle", -180.0, 180.0)
var angle = 0.0
@DoubleParameter("width", 0.0, 50.0)
var width = 5.0
@DoubleParameter("noise", 0.0, 1.0)
var noise = 0.1
private var jumpFlooder: JumpFlooder? = null
private val decodeFilter = PixelDirection()
private val bevelFilter = InnerBevelFilter()
private var distance: ColorBuffer? = null
override fun apply(source: Array<ColorBuffer>, target: Array<ColorBuffer>) {
if (jumpFlooder == null) {
jumpFlooder = JumpFlooder(target[0].width, target[0].height, encodePoints = EncodeSubpixel())
}
if (distance == null) {
distance = colorBuffer(target[0].width, target[0].height, type = ColorType.FLOAT32)
}
val result = jumpFlooder!!.jumpFlood(source[0])
decodeFilter.originalSize = Vector2(target[0].width * 1.0, target[0].height * 1.0)
decodeFilter.distanceScale = distanceScale
decodeFilter.apply(result, result)
result.copyTo(distance!!)
bevelFilter.angle = angle
bevelFilter.width = width
bevelFilter.noise = noise
bevelFilter.apply(arrayOf(source[0], distance!!), target[0])
}
}

View File

@@ -13,6 +13,15 @@ import kotlin.math.max
import kotlin.math.pow
class EncodePoints : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/encode-points.frag")))
class EncodeSubpixel : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/encode-subpixel.frag"))) {
var threshold by parameters
init {
threshold = 0.5
}
}
class JumpFlood : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/jumpflood.frag"))) {
var maxSteps: Int by parameters
var step: Int by parameters
@@ -49,6 +58,15 @@ class Threshold : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/threshold
}
}
class AlphaThreshold : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/alpha-threshold.frag"))) {
var threshold: Double by parameters
init {
threshold = 0.5
}
}
private val encodePoints by lazy { persistent { EncodePoints() } }
private val pixelDistance by lazy { persistent { PixelDistance() } }
private val pixelDirection by lazy { persistent { PixelDirection() } }
@@ -56,7 +74,8 @@ private val contourPoints by lazy { persistent { ContourPoints() } }
private val threshold by lazy { persistent { Threshold() } }
private val passthrough by lazy { persistent { Passthrough() } }
class JumpFlooder(val width: Int, val height: Int, format: ColorFormat = ColorFormat.RGB, type: ColorType = ColorType.FLOAT32) {
class JumpFlooder(val width: Int, val height: Int, format: ColorFormat = ColorFormat.RGB, type: ColorType = ColorType.FLOAT32,
val encodePoints: Filter = EncodePoints()) {
private val dimension = max(width, height)
private val exp = ceil(Math.log(dimension.toDouble()) / Math.log(2.0)).toInt()
@@ -70,8 +89,8 @@ class JumpFlooder(val width: Int, val height: Int, format: ColorFormat = ColorFo
val final = colorBuffer(squareDim, squareDim, format = format, type = type)
private val square = colorBuffer(squareDim, squareDim, format = format, type = type).apply {
fill(ColorRGBa.BLACK)
private val square = colorBuffer(squareDim, squareDim, format = ColorFormat.RGBa, type = type).apply {
fill(ColorRGBa.BLACK.opacify(0.0))
}
@@ -83,6 +102,7 @@ class JumpFlooder(val width: Int, val height: Int, format: ColorFormat = ColorFo
input.copyTo(square)
encodePoints.apply(square, coordinates[0])
jumpFlood.maxSteps = exp
for (i in 0 until exp) {
jumpFlood.step = i
jumpFlood.apply(coordinates[i % 2], coordinates[(i + 1) % 2])

View File

@@ -0,0 +1,76 @@
package org.openrndr.extra.jumpfill
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extra.parameters.ColorParameter
import org.openrndr.extra.parameters.Description
import org.openrndr.extra.parameters.DoubleParameter
import org.openrndr.math.Vector2
import org.openrndr.resourceUrl
private class OuterGlowFilter : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/fx/outer-glow.frag"))) {
var angle: Double by parameters
var width: Double by parameters
var noise: Double by parameters
var color: ColorRGBa by parameters
var shape: Double by parameters
var imageOpacity: Double by parameters
init {
angle = 0.0
width = 5.0
noise = 0.0
shape = 1.0
imageOpacity = 1.0
}
}
@Description("Outer glow")
class OuterGlow : Filter() {
@DoubleParameter("width", 0.0, 50.0)
var width = 5.0
@DoubleParameter("noise", 0.0, 1.0)
var noise = 0.1
@DoubleParameter("shape", 0.0, 10.0)
var shape = 1.0
@DoubleParameter("opacity", 0.0, 1.0)
var opacity = 1.0
@DoubleParameter("image opacity", 0.0, 1.0)
var imageOpacity = 1.0
@ColorParameter("color")
var color = ColorRGBa.WHITE
private var jumpFlooder: JumpFlooder? = null
private val decodeFilter = PixelDirection()
private val glowFilter = OuterGlowFilter()
private var distance: ColorBuffer? = null
override fun apply(source: Array<ColorBuffer>, target: Array<ColorBuffer>) {
if (jumpFlooder == null) {
jumpFlooder = JumpFlooder(target[0].width, target[0].height, encodePoints = EncodeSubpixel())
}
if (distance == null) {
distance = colorBuffer(target[0].width, target[0].height, type = ColorType.FLOAT32)
}
val result = jumpFlooder!!.jumpFlood(source[0])
decodeFilter.originalSize = Vector2(target[0].width * 1.0, target[0].height * 1.0)
decodeFilter.distanceScale = 1.0
decodeFilter.apply(result, result)
result.copyTo(distance!!)
glowFilter.color = color.opacify(opacity)
glowFilter.width = width
glowFilter.noise = noise
glowFilter.shape = shape
glowFilter.imageOpacity = imageOpacity
glowFilter.apply(arrayOf(source[0], distance!!), target[0])
}
}