diff options
author | Péter Diviánszky <divipp@gmail.com> | 2016-02-14 15:02:55 +0100 |
---|---|---|
committer | Péter Diviánszky <divipp@gmail.com> | 2016-02-14 15:02:55 +0100 |
commit | 34e78f10452d1a1628a85eab443a4a672fd44ec3 (patch) | |
tree | 56321512ba2cdc3f3f62395818fa5c2f8b9a17f4 /testdata/editor-examples/Texturing.out | |
parent | 87cefc9cacb9e82c4340c8552d9373175980faca (diff) |
refactoring
Diffstat (limited to 'testdata/editor-examples/Texturing.out')
-rw-r--r-- | testdata/editor-examples/Texturing.out | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/testdata/editor-examples/Texturing.out b/testdata/editor-examples/Texturing.out index 305c4a1c..776af2b9 100644 --- a/testdata/editor-examples/Texturing.out +++ b/testdata/editor-examples/Texturing.out | |||
@@ -27,29 +27,31 @@ Pipeline | |||
27 | , vertexShader = | 27 | , vertexShader = |
28 | """ | 28 | """ |
29 | #version 330 core | 29 | #version 330 core |
30 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 30 | vec4 texture2D(sampler2D s,vec2 uv) { |
31 | uniform mat4 MVP ; | 31 | return texture(s,uv); |
32 | in vec4 vi1 ; | 32 | } |
33 | in vec2 vi2 ; | 33 | uniform mat4 MVP; |
34 | smooth out vec2 vo1 ; | 34 | in vec4 vi1; |
35 | in vec2 vi2; | ||
36 | smooth out vec2 vo1; | ||
35 | void main() { | 37 | void main() { |
36 | gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0)); | 38 | gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0)); |
37 | vo1 = vi2; | 39 | vo1 = vi2; |
38 | } | 40 | } |
39 | |||
40 | """ | 41 | """ |
41 | , geometryShader = Nothing | 42 | , geometryShader = Nothing |
42 | , fragmentShader = | 43 | , fragmentShader = |
43 | """ | 44 | """ |
44 | #version 330 core | 45 | #version 330 core |
45 | vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);} | 46 | vec4 texture2D(sampler2D s,vec2 uv) { |
46 | uniform sampler2D Diffuse ; | 47 | return texture(s,uv); |
47 | smooth in vec2 vo1 ; | 48 | } |
48 | out vec4 f0 ; | 49 | uniform sampler2D Diffuse; |
50 | smooth in vec2 vo1; | ||
51 | out vec4 f0; | ||
49 | void main() { | 52 | void main() { |
50 | f0 = texture2D (Diffuse,vo1); | 53 | f0 = texture2D (Diffuse,vo1); |
51 | } | 54 | } |
52 | |||
53 | """ | 55 | """ |
54 | } | 56 | } |
55 | ] | 57 | ] |