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

[orx-jumpflood] Remove #version from jumpflood shaders (#215)

Browse Source
This commit is contained in:
Abe Pazos
2021-12-18 21:16:50 +01:00
committed by GitHub
parent ef1da87c29
commit e5312e685d
28 changed files with 19 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
orx-jumpflood/src/demo/kotlin/DemoShapeSDF01.kt
View File

@@ -4,9 +4,6 @@ import org.openrndr.draw.ColorType
import org.openrndr.draw.colorBuffer
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extra.jumpfill.ShapeSDF
import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
import org.openrndr.shape.Circle
import org.openrndr.svg.loadSVG
fun main() {
@@ -20,6 +17,8 @@ fun main() {
val df = colorBuffer(width, height, format = ColorFormat.RGBa, type = ColorType.FLOAT32)
val shapes = loadSVG("orx-jumpflood/src/demo/resources/name.svg").findShapes().map { it.shape }
sdf.setShapes(shapes)
sdf.apply(emptyArray(), df)
if (System.getProperty("takeScreenshot") == "true") {
extend(SingleScreenshot()) {
@@ -27,15 +26,10 @@ fun main() {
}
}
extend {
sdf.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280/2.0, 720.0/2)
translate(-1280/2.0, -720.0/2.0)
})
})
sdf.apply(emptyArray(), df)
drawer.image(df)
if(mouse.pressedButtons.isEmpty())
drawer.image(df)
else
drawer.shapes(shapes)
}
}
}

9
orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt
View File

@@ -42,14 +42,9 @@ fun main() {
extend {
drawer.clear(ColorRGBa.PINK)
sdf0.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf0.setShapes(shapes)
sdf1.setShapes(shapes.mapIndexed { index, it ->
sdf1.setShapes(shapes.map {
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
rotate(Vector3.Companion.UNIT_Z, seconds * 45.0 - 30.0)

16
orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt
View File

@@ -31,6 +31,9 @@ fun main() {
val shapes = loadSVG("orx-jumpflood/src/demo/resources/name.svg").findShapes().map { it.shape }
val union = SDFSmoothDifference()
sdf0.setShapes(shapes)
sdf1.setShapes(shapes)
val strokeFill = SDFStrokeFill()
if (System.getProperty("takeScreenshot") == "true") {
@@ -43,19 +46,6 @@ fun main() {
fd.apply(emptyArray(), uvmap)
sdf0.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf1.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf0.useUV = true
sdf0.apply(uvmap, df0)
sdf1.apply(uvmap, df1)

19
orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt
View File

@@ -9,7 +9,6 @@ import org.openrndr.extra.gui.GUI
import org.openrndr.extra.jumpfill.ShapeSDF
import org.openrndr.extra.jumpfill.draw.SDFStrokeFill
import org.openrndr.extra.jumpfill.ops.*
import org.openrndr.math.transforms.transform
import org.openrndr.shape.Circle
import org.openrndr.svg.loadSVG
@@ -32,8 +31,11 @@ fun main() {
val uvmap = colorBuffer(width, height, type = ColorType.FLOAT16)
val circleShapes = List(1) { Circle(width/2.0, height/2.0, 200.0).shape}
val shapes = loadSVG("orx-jumpflood/src/demo/resources/name.svg").findShapes().map { it.shape }
sdf0.setShapes(circleShapes)
sdf1.setShapes(shapes)
val difference = SDFSmoothDifference()
val strokeFill = SDFStrokeFill()
@@ -50,19 +52,6 @@ fun main() {
perturb.phase = seconds * 0.1
perturb.apply(uvmap, uvmap)
sdf0.setShapes(circleShapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf1.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf0.useUV = true
sdf0.apply(uvmap, df0)
sdf1.apply(uvmap, df1)

21
orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt
View File

@@ -9,9 +9,7 @@ import org.openrndr.extra.gui.GUI
import org.openrndr.extra.jumpfill.ShapeSDF
import org.openrndr.extra.jumpfill.draw.SDFStrokeFill
import org.openrndr.extra.jumpfill.ops.*
import org.openrndr.ffmpeg.ScreenRecorder
import org.openrndr.math.Vector2
import org.openrndr.math.transforms.transform
import org.openrndr.shape.Circle
import org.openrndr.svg.loadSVG
import kotlin.math.cos
@@ -38,8 +36,11 @@ fun main() {
val uvmap2 = colorBuffer(width, height, type = ColorType.FLOAT16)
val circleShapes = List(1) { Circle(width/2.0, height/2.0, 200.0).shape}
val shapes = loadSVG("orx-jumpflood/src/demo/resources/name.svg").findShapes().map { it.shape }
sdf0.setShapes(circleShapes)
sdf1.setShapes(shapes)
val difference = SDFSmoothDifference()
val strokeFill = SDFStrokeFill()
sdf0.useUV = true
@@ -68,20 +69,6 @@ fun main() {
perturb.phase = seconds * 0.05
perturb.apply(uvmap, uvmap2)
sdf0.setShapes(circleShapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf1.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform {
translate(1280 / 2.0, 720.0 / 2)
translate(-1280 / 2.0, -720.0 / 2.0)
})
})
sdf0.apply(uvmap2, df0)
sdf1.apply(uvmap2, df1)

1
orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt
View File

@@ -7,7 +7,6 @@ import org.openrndr.draw.isolatedWithTarget
import org.openrndr.draw.renderTarget
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extra.jumpfill.fx.Skeleton
import org.openrndr.extra.jumpfill.fx.StraightSkeleton
import org.openrndr.extra.noise.simplex
fun main() {

2
orx-jumpflood/src/main/resources/shaders/gl3/alpha-threshold.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
in vec2 v_texCoord0;
uniform float threshold;

2
orx-jumpflood/src/main/resources/shaders/gl3/contour-points.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
in vec2 v_texCoord0;

2
orx-jumpflood/src/main/resources/shaders/gl3/draw/sdf-stroke-fill.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform float radius;

2
orx-jumpflood/src/main/resources/shaders/gl3/encode-points.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
in vec2 v_texCoord0;

2
orx-jumpflood/src/main/resources/shaders/gl3/encode-subpixel.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
in vec2 v_texCoord0;
uniform float threshold;

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/inner-bevel.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0; // image
uniform sampler2D tex1; // distance

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/inner-glow.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0; // image
uniform sampler2D tex1; // distance

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/inpaint.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// image
uniform sampler2D tex1;// distance

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/outer-glow.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0; // image
uniform sampler2D tex1; // distance

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/skeleton.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform vec4 skeletonColor;
uniform vec4 backgroundColor;

2
orx-jumpflood/src/main/resources/shaders/gl3/fx/straight-skeleton.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform vec4 skeletonColor;
uniform vec4 backgroundColor;

1
orx-jumpflood/src/main/resources/shaders/gl3/jumpflood.frag
View File

@@ -1,4 +1,3 @@
#version 330 core
in vec2 v_texCoord0;
uniform sampler2D tex0;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-blend.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform sampler2D tex1;// signed distance
uniform float factor;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-onion.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform float radius;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-round.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0; // signed distance
uniform float radius;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-smooth-difference.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform sampler2D tex1;// signed distance
uniform float radius;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-smooth-intersection.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;// signed distance
uniform sampler2D tex1;// signed distance
uniform float radius;

2
orx-jumpflood/src/main/resources/shaders/gl3/ops/sdf-smooth-union.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0; // signed distance
uniform sampler2D tex1; // signed distance
uniform float radius;

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

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
uniform sampler2D tex1;
uniform vec2 originalSize;

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

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
uniform sampler2D tex1;

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

@@ -1,5 +1,3 @@
#version 330
in vec2 v_texCoord0;
uniform float iTime;
out vec4 o_color;

2
orx-jumpflood/src/main/resources/shaders/gl3/threshold.frag
View File

@@ -1,5 +1,3 @@
#version 330 core
uniform sampler2D tex0;
in vec2 v_texCoord0;
uniform float threshold;