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

[orx-jumpflood] Add modelViewMatrix, shader refactor

Browse Source
This commit is contained in:
Edwin Jakobs
2020-08-03 21:59:53 +02:00
parent 555ec41530
commit d19d51f852
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
orx-jumpflood/src/main/kotlin/ShapeSDF.kt
View File

@@ -2,6 +2,7 @@ package org.openrndr.extra.jumpfill
import org.openrndr.draw.* import org.openrndr.draw.*
import org.openrndr.extra.parameters.BooleanParameter import org.openrndr.extra.parameters.BooleanParameter
import org.openrndr.math.Matrix44
import org.openrndr.math.Vector4 import org.openrndr.math.Vector4
import org.openrndr.resourceUrl import org.openrndr.resourceUrl
import org.openrndr.shape.Shape import org.openrndr.shape.Shape
@@ -19,10 +20,18 @@ class ShapeSDF : Filter(filterShaderFromUrl(resourceUrl("/shaders/gl3/shape-sdf.
@BooleanParameter("rectify distance") @BooleanParameter("rectify distance")
var rectify: Boolean by parameters var rectify: Boolean by parameters
private var modelViewMatrixInverse by parameters
var modelViewMatrix = Matrix44.IDENTITY
set(value) {
modelViewMatrixInverse = modelViewMatrix.inversed
field = value
}
init { init {
useUV = false useUV = false
rectify = false rectify = false
modelViewMatrix = Matrix44.IDENTITY
} }
fun setShapes(shapes: List<Shape>) { fun setShapes(shapes: List<Shape>) {

42
orx-jumpflood/src/main/resources/shaders/gl3/shape-sdf.frag
View File

@@ -7,6 +7,8 @@ out vec4 o_color;
uniform bool useUV; uniform bool useUV;
uniform bool rectify; uniform bool rectify;
uniform mat4 modelViewMatrixInverse;
uniform samplerBuffer toBuffer; uniform samplerBuffer toBuffer;
uniform samplerBuffer fromBuffer; uniform samplerBuffer fromBuffer;
uniform int segmentCount; uniform int segmentCount;
@@ -63,23 +65,7 @@ vec3 minimum_distance_and_perpendicular(vec4 v, vec4 w, vec2 p) {
return vec3(distance(p.xy, projection.xy), projection.z, v.w); return vec3(distance(p.xy, projection.xy), projection.z, v.w);
} }
float shapeDistance(vec2 uv, out float perpDistOut, out float contourLengthOut ) {
void main() {
vec2 uv = v_texCoord0;
vec2 fixDistance = vec2(1.0);
if (useUV) {
vec2 o = 0.5 / textureSize(tex0, 0);
uv = texture(tex0, v_texCoord0 + o).xy;
if (rectify) {
fixDistance = (fwidth(uv))*vec2(1280.0, 720.0);
}
}
uv.y = 1.0 - uv.y;
uv *= targetSize;
float mindist = 10E10; float mindist = 10E10;
float perpdist = 0.0; float perpdist = 0.0;
float contourLength = 0.0; float contourLength = 0.0;
@@ -97,7 +83,29 @@ void main() {
} }
} }
float signedDistance = mindist * (windingNr==0 ? 1.0 : -1.0); float signedDistance = mindist * (windingNr==0 ? 1.0 : -1.0);
contourLengthOut = contourLength;
perpDistOut = perpdist;
return signedDistance;
}
void main() {
vec2 uv = v_texCoord0;
vec2 fixDistance = vec2(1.0);
if (useUV) {
vec2 o = 0.5 / textureSize(tex0, 0);
uv = texture(tex0, v_texCoord0 + o).xy;
if (rectify) {
fixDistance = (fwidth(uv))*vec2(1280.0, 720.0);
}
}
uv.y = 1.0 - uv.y;
uv *= targetSize;
uv = (modelViewMatrixInverse * vec4(uv, 0.0, 1.0)).xy;
float perpdist;
float contourLength;
float signedDistance = shapeDistance(uv, perpdist, contourLength);
o_color = vec4(signedDistance / length(fixDistance), perpdist/contourLength, contourLength, 1.0); o_color = vec4(signedDistance / length(fixDistance), perpdist/contourLength, contourLength, 1.0);
} }