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

[openrndr-demos] Fix shaders to be compatible with OpenGL 4.1 on macOS

Browse Source
This commit is contained in:
edwin
2020-07-20 11:38:57 +02:00
parent ed48736985
commit b963b5cfd5
23 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt
View File

@@ -2,7 +2,6 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa import org.openrndr.color.ColorRGBa
import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.Shader import org.openrndr.draw.Shader
import org.openrndr.draw.shadeStyle
import org.openrndr.extras.camera.Orbital import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.resourceUrl import org.openrndr.resourceUrl
@@ -26,11 +25,6 @@ fun main() {
shader.uniform("model", drawer.model) shader.uniform("model", drawer.model)
driver.drawVertexBuffer(shader, listOf(vb), DrawPrimitive.TRIANGLES, 0, vb.vertexCount) driver.drawVertexBuffer(shader, listOf(vb), DrawPrimitive.TRIANGLES, 0, vb.vertexCount)
shader.end() shader.end()
drawer.shadeStyle = shadeStyle {
vertexPreamble = "krak"
}
//drawer.vertexBuffer(vb, DrawPrimitive.TRIANGLES, 0, vb.vertexCount)
} }
} }
} }

4
openrndr-demos/src/demo/resources/shaders/gs-01.frag
View File

@@ -1,8 +1,8 @@
#version 430 core #version 410 core
out vec4 o_color; out vec4 o_color;
void main() { void main() {
o_color = v_addedProperty; o_color = vec4(1.0, 0.0, 0.0, 1.0);
} }

2
openrndr-demos/src/demo/resources/shaders/gs-01.geom
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout (triangles) in; layout (triangles) in;
layout (triangle_strip, max_vertices = 3) out; layout (triangle_strip, max_vertices = 3) out;

2
openrndr-demos/src/demo/resources/shaders/gs-01.vert
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
in vec3 a_position; in vec3 a_position;
in vec3 a_normal; in vec3 a_normal;

2
openrndr-demos/src/demo/resources/shaders/ts-01.frag
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
out vec4 o_color; out vec4 o_color;

2
openrndr-demos/src/demo/resources/shaders/ts-01.tesc
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout(vertices = 4) out; // 4 points per patch layout(vertices = 4) out; // 4 points per patch

2
openrndr-demos/src/demo/resources/shaders/ts-01.tese
View File

@@ -1,5 +1,5 @@
#version 430 core #version 410 core
vec3 bezier2(vec3 a, vec3 b, float t) { vec3 bezier2(vec3 a, vec3 b, float t) {
return mix(a, b, t); return mix(a, b, t);

2
openrndr-demos/src/demo/resources/shaders/ts-01.vert
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
in vec3 a_position; in vec3 a_position;

2
openrndr-demos/src/demo/resources/shaders/ts-02.frag
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
out vec4 o_color; out vec4 o_color;

2
openrndr-demos/src/demo/resources/shaders/ts-02.geom
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout (lines) in; layout (lines) in;
layout (line_strip, max_vertices = 2) out; layout (line_strip, max_vertices = 2) out;

2
openrndr-demos/src/demo/resources/shaders/ts-02.tesc
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout(vertices = 4) out; // 4 points per patch layout(vertices = 4) out; // 4 points per patch

2
openrndr-demos/src/demo/resources/shaders/ts-02.tese
View File

@@ -1,5 +1,5 @@
#version 430 core #version 410 core
vec3 bezier2(vec3 a, vec3 b, float t) { vec3 bezier2(vec3 a, vec3 b, float t) {
return mix(a, b, t); return mix(a, b, t);

2
openrndr-demos/src/demo/resources/shaders/ts-02.vert
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
in vec3 a_position; in vec3 a_position;

2
openrndr-demos/src/demo/resources/shaders/ts-03.frag
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
out vec4 o_color; out vec4 o_color;

2
openrndr-demos/src/demo/resources/shaders/ts-03.geom
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout (lines) in; layout (lines) in;
layout (triangle_strip, max_vertices = 4) out; layout (triangle_strip, max_vertices = 4) out;

2
openrndr-demos/src/demo/resources/shaders/ts-03.tesc
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout(vertices = 4) out; // 4 points per patch layout(vertices = 4) out; // 4 points per patch

2
openrndr-demos/src/demo/resources/shaders/ts-03.tese
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
vec3 bezier2(vec3 a, vec3 b, float t) { vec3 bezier2(vec3 a, vec3 b, float t) {
return mix(a, b, t); return mix(a, b, t);

2
openrndr-demos/src/demo/resources/shaders/ts-03.vert
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
in vec3 a_position; in vec3 a_position;

2
openrndr-demos/src/demo/resources/shaders/ts-04.frag
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
out vec4 o_color; out vec4 o_color;

2
openrndr-demos/src/demo/resources/shaders/ts-04.geom
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout (lines) in; layout (lines) in;
layout (triangle_strip, max_vertices = 4) out; layout (triangle_strip, max_vertices = 4) out;

2
openrndr-demos/src/demo/resources/shaders/ts-04.tesc
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
layout(vertices = 4) out; // 4 points per patch layout(vertices = 4) out; // 4 points per patch

2
openrndr-demos/src/demo/resources/shaders/ts-04.tese
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
vec3 bezier2(vec3 a, vec3 b, float t) { vec3 bezier2(vec3 a, vec3 b, float t) {
return mix(a, b, t); return mix(a, b, t);

2
openrndr-demos/src/demo/resources/shaders/ts-04.vert
View File

@@ -1,4 +1,4 @@
#version 430 core #version 410 core
#pragma import org.openrndr.extra.noise.phrases.SimplexKt.phraseSimplex3; #pragma import org.openrndr.extra.noise.phrases.SimplexKt.phraseSimplex3;