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

Fix support for NPOT inputs in orx-jumpflood

Browse Source
This commit is contained in:
Edwin Jakobs
2019-11-28 22:12:58 +01:00
parent 4db7ad114a
commit 50446eeb1b
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
orx-jumpflood/src/main/kotlin/JumpFlood.kt
View File

@@ -4,6 +4,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.draw.* import org.openrndr.draw.*
import org.openrndr.filter.blend.passthrough import org.openrndr.filter.blend.passthrough
import org.openrndr.math.Matrix44 import org.openrndr.math.Matrix44
import org.openrndr.math.Vector2
import org.openrndr.resourceUrl import org.openrndr.resourceUrl
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.max import kotlin.math.max
@@ -15,8 +16,12 @@ class JumpFlood : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/jumpflood
var step: Int by parameters var step: Int by parameters
} }
class PixelDirection : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/pixel-direction.frag"))) class PixelDirection : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/pixel-direction.frag"))) {
class PixelDistance : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/pixel-distance.frag"))) var originalSize: Vector2 by parameters
}
class PixelDistance : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/pixel-distance.frag"))) {
var originalSize: Vector2 by parameters
}
class ContourPoints : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/contour-points.frag"))) class ContourPoints : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/contour-points.frag")))
class Threshold : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/threshold.frag"))) { class Threshold : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/threshold.frag"))) {
var threshold by parameters var threshold by parameters
@@ -37,7 +42,7 @@ class JumpFlooder(val width: Int, val height: Int, format:ColorFormat = ColorFor
private val dimension = max(width, height) private val dimension = max(width, height)
private val exp = ceil(Math.log(dimension.toDouble()) / Math.log(2.0)).toInt() private val exp = ceil(Math.log(dimension.toDouble()) / Math.log(2.0)).toInt()
private val squareDim = 2.0.pow(exp.toDouble()).toInt() val squareDim = 2.0.pow(exp.toDouble()).toInt()
private val coordinates = private val coordinates =
listOf(colorBuffer(squareDim, squareDim, format = format, type = type), listOf(colorBuffer(squareDim, squareDim, format = format, type = type),
@@ -105,6 +110,7 @@ private fun encodeDecodeBitmap(drawer: Drawer, preprocess: Filter, decoder: Filt
val encoded = _jumpFlooder.jumpFlood(drawer, _result) val encoded = _jumpFlooder.jumpFlood(drawer, _result)
decoder.parameters["originalSize"] = Vector2(_jumpFlooder.squareDim.toDouble(), _jumpFlooder.squareDim.toDouble())
decoder.apply(arrayOf(encoded, bitmap), _result) decoder.apply(arrayOf(encoded, bitmap), _result)
if (jumpFlooder == null) { if (jumpFlooder == null) {
_jumpFlooder.destroy() _jumpFlooder.destroy()

8
orx-jumpflood/src/main/resources/shaders/gl3/pixel-direction.frag
View File

@@ -2,13 +2,19 @@
uniform sampler2D tex0; uniform sampler2D tex0;
uniform sampler2D tex1; uniform sampler2D tex1;
uniform vec2 originalSize;
in vec2 v_texCoord0; in vec2 v_texCoord0;
out vec4 o_color; out vec4 o_color;
void main() { void main() {
vec2 size = textureSize(tex0, 0); vec2 size = textureSize(tex0, 0);
vec2 pixelPosition = v_texCoord0; vec2 fixUp = v_texCoord0;
fixUp.y = 1.0 - fixUp.y;
fixUp *= (size/originalSize);
fixUp.y = 1.0 - fixUp.y;
vec2 pixelPosition = fixUp;
vec2 centroidPixelPosition = texture(tex0, v_texCoord0).xy; vec2 centroidPixelPosition = texture(tex0, v_texCoord0).xy;
vec2 pixelDistance = (centroidPixelPosition - pixelPosition) * size * vec2(1.0, -1.0); vec2 pixelDistance = (centroidPixelPosition - pixelPosition) * size * vec2(1.0, -1.0);
float threshold = texture(tex1, v_texCoord0).r; float threshold = texture(tex1, v_texCoord0).r;

9
orx-jumpflood/src/main/resources/shaders/gl3/pixel-distance.frag
View File

@@ -2,13 +2,20 @@
uniform sampler2D tex0; uniform sampler2D tex0;
uniform sampler2D tex1; uniform sampler2D tex1;
uniform vec2 originalSize;
in vec2 v_texCoord0; in vec2 v_texCoord0;
out vec4 o_color; out vec4 o_color;
void main() { void main() {
vec2 size = textureSize(tex0, 0); vec2 size = textureSize(tex0, 0);
vec2 pixelPosition = v_texCoord0; vec2 fixUp = v_texCoord0;
fixUp.y = 1.0 - fixUp.y;
fixUp *= (size/originalSize);
fixUp.y = 1.0 - fixUp.y;
vec2 pixelPosition = fixUp;
vec2 centroidPixelPosition = texture(tex0, v_texCoord0).xy; vec2 centroidPixelPosition = texture(tex0, v_texCoord0).xy;
vec2 pixelDistance = (centroidPixelPosition - pixelPosition) * size * vec2(1.0, -1.0); vec2 pixelDistance = (centroidPixelPosition - pixelPosition) * size * vec2(1.0, -1.0);
float threshold = texture(tex1, v_texCoord0).r; float threshold = texture(tex1, v_texCoord0).r;