diff --git a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt index 0c9798fc..9d6922c6 100644 --- a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt @@ -2,7 +2,6 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.Shader -import org.openrndr.draw.shadeStyle import org.openrndr.extras.camera.Orbital import org.openrndr.extras.meshgenerators.boxMesh import org.openrndr.resourceUrl @@ -26,11 +25,6 @@ fun main() { shader.uniform("model", drawer.model) driver.drawVertexBuffer(shader, listOf(vb), DrawPrimitive.TRIANGLES, 0, vb.vertexCount) shader.end() - - drawer.shadeStyle = shadeStyle { - vertexPreamble = "krak" - } - //drawer.vertexBuffer(vb, DrawPrimitive.TRIANGLES, 0, vb.vertexCount) } } } diff --git a/openrndr-demos/src/demo/resources/shaders/gs-01.frag b/openrndr-demos/src/demo/resources/shaders/gs-01.frag index cf332b7a..2a60498a 100644 --- a/openrndr-demos/src/demo/resources/shaders/gs-01.frag +++ b/openrndr-demos/src/demo/resources/shaders/gs-01.frag @@ -1,8 +1,8 @@ -#version 430 core +#version 410 core out vec4 o_color; void main() { - o_color = v_addedProperty; + 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/gs-01.geom b/openrndr-demos/src/demo/resources/shaders/gs-01.geom index b68b3cf6..422ee2e2 100644 --- a/openrndr-demos/src/demo/resources/shaders/gs-01.geom +++ b/openrndr-demos/src/demo/resources/shaders/gs-01.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout (triangles) in; layout (triangle_strip, max_vertices = 3) out; diff --git a/openrndr-demos/src/demo/resources/shaders/gs-01.vert b/openrndr-demos/src/demo/resources/shaders/gs-01.vert index e53a745c..6a81c839 100644 --- a/openrndr-demos/src/demo/resources/shaders/gs-01.vert +++ b/openrndr-demos/src/demo/resources/shaders/gs-01.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core in vec3 a_position; in vec3 a_normal; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.frag b/openrndr-demos/src/demo/resources/shaders/ts-01.frag index eae18655..660dc5e4 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core out vec4 o_color; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.tesc b/openrndr-demos/src/demo/resources/shaders/ts-01.tesc index 43b682e2..e9ca834d 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.tesc +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.tesc @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout(vertices = 4) out; // 4 points per patch diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.tese b/openrndr-demos/src/demo/resources/shaders/ts-01.tese index fdf7a038..bb107c62 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.tese @@ -1,5 +1,5 @@ -#version 430 core +#version 410 core vec3 bezier2(vec3 a, vec3 b, float t) { return mix(a, b, t); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-01.vert b/openrndr-demos/src/demo/resources/shaders/ts-01.vert index bbd9d98c..a5f37377 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-01.vert +++ b/openrndr-demos/src/demo/resources/shaders/ts-01.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core in vec3 a_position; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.frag b/openrndr-demos/src/demo/resources/shaders/ts-02.frag index eae18655..660dc5e4 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core out vec4 o_color; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.geom b/openrndr-demos/src/demo/resources/shaders/ts-02.geom index 24b57728..7c706234 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout (lines) in; layout (line_strip, max_vertices = 2) out; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.tesc b/openrndr-demos/src/demo/resources/shaders/ts-02.tesc index ed78fe82..0dd13870 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.tesc +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.tesc @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout(vertices = 4) out; // 4 points per patch diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.tese b/openrndr-demos/src/demo/resources/shaders/ts-02.tese index 96cfc370..04a7e26f 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.tese @@ -1,5 +1,5 @@ -#version 430 core +#version 410 core vec3 bezier2(vec3 a, vec3 b, float t) { return mix(a, b, t); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-02.vert b/openrndr-demos/src/demo/resources/shaders/ts-02.vert index bbd9d98c..a5f37377 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-02.vert +++ b/openrndr-demos/src/demo/resources/shaders/ts-02.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core in vec3 a_position; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.frag b/openrndr-demos/src/demo/resources/shaders/ts-03.frag index 1d56f915..5604a5ff 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core out vec4 o_color; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.geom b/openrndr-demos/src/demo/resources/shaders/ts-03.geom index 97728fbc..3e485133 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout (lines) in; layout (triangle_strip, max_vertices = 4) out; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.tesc b/openrndr-demos/src/demo/resources/shaders/ts-03.tesc index d23e30e9..698180ce 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.tesc +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.tesc @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout(vertices = 4) out; // 4 points per patch diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.tese b/openrndr-demos/src/demo/resources/shaders/ts-03.tese index 7ea74b8b..600844ff 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.tese @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core vec3 bezier2(vec3 a, vec3 b, float t) { return mix(a, b, t); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-03.vert b/openrndr-demos/src/demo/resources/shaders/ts-03.vert index 9cafb623..44f14186 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-03.vert +++ b/openrndr-demos/src/demo/resources/shaders/ts-03.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core in vec3 a_position; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.frag b/openrndr-demos/src/demo/resources/shaders/ts-04.frag index 1d56f915..5604a5ff 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.frag +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core out vec4 o_color; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.geom b/openrndr-demos/src/demo/resources/shaders/ts-04.geom index b08c0ecc..820f504f 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.geom +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout (lines) in; layout (triangle_strip, max_vertices = 4) out; diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.tesc b/openrndr-demos/src/demo/resources/shaders/ts-04.tesc index d23e30e9..698180ce 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.tesc +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.tesc @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core layout(vertices = 4) out; // 4 points per patch diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.tese b/openrndr-demos/src/demo/resources/shaders/ts-04.tese index 7ea74b8b..600844ff 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.tese +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.tese @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core vec3 bezier2(vec3 a, vec3 b, float t) { return mix(a, b, t); diff --git a/openrndr-demos/src/demo/resources/shaders/ts-04.vert b/openrndr-demos/src/demo/resources/shaders/ts-04.vert index da99b146..79a8af65 100644 --- a/openrndr-demos/src/demo/resources/shaders/ts-04.vert +++ b/openrndr-demos/src/demo/resources/shaders/ts-04.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 410 core #pragma import org.openrndr.extra.noise.phrases.SimplexKt.phraseSimplex3;