diff --git a/openrndr-demos/build.gradle b/openrndr-demos/build.gradle index db6f81f0..1a191199 100644 --- a/openrndr-demos/build.gradle +++ b/openrndr-demos/build.gradle @@ -14,6 +14,8 @@ dependencies { demoImplementation(project(":orx-parameters")) demoImplementation(project(":orx-noise")) demoImplementation(project(":orx-shader-phrases")) + demoImplementation("org.slf4j:slf4j-simple:1.7.30") + demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion") diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt index 2cf9238d..7be9c755 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt @@ -43,10 +43,7 @@ fun main() { shader.uniform("model", drawer.model) driver.drawVertexBuffer(shader, listOf(vb), DrawPrimitive.PATCHES, 0, vb.vertexCount) - shader.end() - - } } } diff --git a/openrndr-demos/src/demo/resources/shaders/gs-01.frag b/openrndr-demos/src/demo/resources/shaders/gs-01.frag index 583b387e..cf332b7a 100644 --- a/openrndr-demos/src/demo/resources/shaders/gs-01.frag +++ b/openrndr-demos/src/demo/resources/shaders/gs-01.frag @@ -2,9 +2,6 @@ out vec4 o_color; -in vec3 va_position; -in vec3 va_normal; -in vec4 v_addedProperty; void main() { o_color = v_addedProperty; diff --git a/openrndr-demos/src/demo/resources/shaders/gs-01.geom b/openrndr-demos/src/demo/resources/shaders/gs-01.geom index ee72c021..b68b3cf6 100644 --- a/openrndr-demos/src/demo/resources/shaders/gs-01.geom +++ b/openrndr-demos/src/demo/resources/shaders/gs-01.geom @@ -19,9 +19,6 @@ uniform vec3 offset; void main() { int i; for(i = 0;i < gl_in.length();i++) { - v_addedProperty = vertices[i].v_addedProperty; - va_normal = vertices[i].va_normal; - va_position = vertices[i].va_position; gl_Position = gl_in[i].gl_Position; EmitVertex(); } diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.frag b/openrndr-demos/src/demo/resources/shaders/ts-01.frag index 4bd82929..eae18655 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.frag @@ -2,12 +2,6 @@ out vec4 o_color; - - -//in vec3 va_position; -//in vec3 va_normal; -//in vec4 v_addedProperty; - void main() { o_color = vec4(1.0, 0.0, 0.0, 1.0); } \ No newline at end of file diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.tese b/openrndr-demos/src/demo/resources/shaders/ts-01.tese index c8f6af6a..fdf7a038 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.tese @@ -11,16 +11,9 @@ vec3 bezier4(vec3 a, vec3 b, vec3 c, vec3 d, float t) { return mix(bezier3(a, b, c, t), bezier3(b, c, d, t), t); } -struct Vertex { - vec3 va_position; - vec3 va_normal; - vec4 v_addedProperty; -}; - layout(isolines) in; in vec3 cva_position[]; - uniform mat4 proj; uniform mat4 view; uniform mat4 model; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.frag b/openrndr-demos/src/demo/resources/shaders/ts-02.frag index 4bd82929..eae18655 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.frag @@ -2,12 +2,6 @@ out vec4 o_color; - - -//in vec3 va_position; -//in vec3 va_normal; -//in vec4 v_addedProperty; - void main() { o_color = vec4(1.0, 0.0, 0.0, 1.0); } \ No newline at end of file diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.geom b/openrndr-demos/src/demo/resources/shaders/ts-02.geom index 7e73046b..24b57728 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.geom @@ -3,11 +3,6 @@ layout (lines) in; layout (line_strip, max_vertices = 2) out; -in InVertex { - vec3 va_position; - vec3 va_normal; - vec4 v_addedProperty; -} vertices[]; out vec3 va_position; out vec3 va_normal; @@ -19,9 +14,6 @@ uniform vec3 offset; void main() { int i; for(i = 0;i < gl_in.length();i++) { - v_addedProperty = vertices[i].v_addedProperty; - va_normal = vertices[i].va_normal; - va_position = vertices[i].va_position; gl_Position = gl_in[i].gl_Position; EmitVertex(); } diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.tesc b/openrndr-demos/src/demo/resources/shaders/ts-02.tesc index d23e30e9..ed78fe82 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.tesc +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.tesc @@ -4,7 +4,6 @@ layout(vertices = 4) out; // 4 points per patch uniform int resolution; - in vec3 va_position[]; out vec3 cva_position[]; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.tese b/openrndr-demos/src/demo/resources/shaders/ts-02.tese index 5920e650..96cfc370 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.tese @@ -11,17 +11,9 @@ vec3 bezier4(vec3 a, vec3 b, vec3 c, vec3 d, float t) { return mix(bezier3(a, b, c, t), bezier3(b, c, d, t), t); } -struct Vertex { - vec3 va_position; - vec3 va_normal; - vec4 v_addedProperty; -}; - layout(isolines) in; in vec3 cva_position[]; - - uniform mat4 proj; uniform mat4 view; uniform mat4 model; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.geom b/openrndr-demos/src/demo/resources/shaders/ts-03.geom index e31ba695..97728fbc 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.geom @@ -34,27 +34,15 @@ void main() { // output a triangle strip encoded quad - v_addedProperty = vertices[0].v_addedProperty; - va_normal = vertices[0].va_normal; - va_position = vertices[0].va_position; gl_Position = pvm * vec4( vec4(position[0],1.0) + perp0 * weight); EmitVertex(); - v_addedProperty = vertices[0].v_addedProperty; - va_normal = vertices[0].va_normal; - va_position = vertices[0].va_position; gl_Position = pvm * vec4( vec4(position[0],1.0) - perp0 * weight); EmitVertex(); - v_addedProperty = vertices[1].v_addedProperty; - va_normal = vertices[1].va_normal; - va_position = vertices[1].va_position; gl_Position = pvm * vec4( vec4(position[1],1.0) + perp1 * weight); EmitVertex(); - v_addedProperty = vertices[1].v_addedProperty; - va_normal = vertices[1].va_normal; - va_position = vertices[1].va_position; gl_Position = pvm * vec4( vec4(position[1],1.0) - perp1 * weight); EmitVertex(); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.geom b/openrndr-demos/src/demo/resources/shaders/ts-04.geom index 993a682b..b08c0ecc 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.geom @@ -2,12 +2,12 @@ layout (lines) in; layout (triangle_strip, max_vertices = 4) out; - -in InVertex { - vec3 va_position; - vec3 va_normal; - vec4 v_addedProperty; -} vertices[]; +// +//in InVertex { +// vec3 va_position; +// vec3 va_normal; +// vec4 v_addedProperty; +//} vertices[]; out vec3 va_position; out vec3 va_normal; @@ -49,27 +49,27 @@ void main() { vec4 perp0 = vec4(direction0.y, -direction0.x, 0.0, 0.0); vec4 perp1 = vec4(direction1.y, -direction1.x, 0.0, 0.0); - v_addedProperty = vertices[0].v_addedProperty; - va_normal = vertices[0].va_normal; - va_position = vertices[0].va_position; +// v_addedProperty = vertices[0].v_addedProperty; +// va_normal = vertices[0].va_normal; +// va_position = vertices[0].va_position; gl_Position = pvm * vec4(vec4(position[0], 1.0)) + perp0 * weight * 0.01; EmitVertex(); - v_addedProperty = vertices[0].v_addedProperty; - va_normal = vertices[0].va_normal; - va_position = vertices[0].va_position; +// v_addedProperty = vertices[0].v_addedProperty; +// va_normal = vertices[0].va_normal; +// va_position = vertices[0].va_position; gl_Position = pvm * vec4(vec4(position[0], 1.0)) - perp0 * weight * 0.01; EmitVertex(); - v_addedProperty = vertices[1].v_addedProperty; - va_normal = vertices[1].va_normal; - va_position = vertices[1].va_position; +// v_addedProperty = vertices[1].v_addedProperty; +// va_normal = vertices[1].va_normal; +// va_position = vertices[1].va_position; gl_Position = pvm * vec4(vec4(position[1], 1.0)) + perp1 * weight * 0.01; EmitVertex(); - v_addedProperty = vertices[1].v_addedProperty; - va_normal = vertices[1].va_normal; - va_position = vertices[1].va_position; +// v_addedProperty = vertices[1].v_addedProperty; +// va_normal = vertices[1].va_normal; +// va_position = vertices[1].va_position; gl_Position = pvm * vec4(vec4(position[1], 1.0)) - perp1 * weight * 0.01; EmitVertex(); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.vert b/openrndr-demos/src/demo/resources/shaders/ts-04.vert index f4319fd8..da99b146 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.vert +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.vert @@ -3,7 +3,6 @@ #pragma import org.openrndr.extra.noise.phrases.SimplexKt.phraseSimplex3; in vec3 a_position; - out vec3 va_position; uniform mat4 view;