diff options
| author | raysan5 <raysan5@gmail.com> | 2016-05-18 12:04:27 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2016-05-18 12:04:27 +0200 |
| commit | bc08271da3e68d2880f4ef712c13e88b99f1021d (patch) | |
| tree | a2b3fb728de4984a12b97728491205613e3c951b /examples | |
| parent | 0e29aa2951fe11e9d0fabec2182ed6309fce37bb (diff) | |
| download | raylib-bc08271da3e68d2880f4ef712c13e88b99f1021d.tar.gz raylib-bc08271da3e68d2880f4ef712c13e88b99f1021d.zip | |
Updated shaders with comments
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/resources/shaders/glsl100/bloom.fs | 2 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl100/swirl.fs | 2 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl330/bloom.fs | 2 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl330/phong.fs | 3 | ||||
| -rw-r--r-- | examples/resources/shaders/glsl330/swirl.fs | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/examples/resources/shaders/glsl100/bloom.fs b/examples/resources/shaders/glsl100/bloom.fs index 5a08843d..280d2fb6 100644 --- a/examples/resources/shaders/glsl100/bloom.fs +++ b/examples/resources/shaders/glsl100/bloom.fs @@ -33,5 +33,5 @@ void main() else if (texelColor.r < 0.5) tc = sum*sum*0.009 + texelColor; else tc = sum*sum*0.0075 + texelColor; - finalColor = tc; + gl_FragColor = tc; }
\ No newline at end of file diff --git a/examples/resources/shaders/glsl100/swirl.fs b/examples/resources/shaders/glsl100/swirl.fs index e77d4f87..0d6d24f2 100644 --- a/examples/resources/shaders/glsl100/swirl.fs +++ b/examples/resources/shaders/glsl100/swirl.fs @@ -20,7 +20,7 @@ float angle = 0.8; uniform vec2 center = vec2(200.0, 200.0); -void main (void) +void main() { vec2 texSize = vec2(renderWidth, renderHeight); vec2 tc = fragTexCoord*texSize; diff --git a/examples/resources/shaders/glsl330/bloom.fs b/examples/resources/shaders/glsl330/bloom.fs index 47ddee30..0307bc06 100644 --- a/examples/resources/shaders/glsl330/bloom.fs +++ b/examples/resources/shaders/glsl330/bloom.fs @@ -17,7 +17,7 @@ void main() { vec4 sum = vec4(0); vec4 tc = vec4(0); - + for (int i = -4; i < 4; i++) { for (int j = -3; j < 3; j++) diff --git a/examples/resources/shaders/glsl330/phong.fs b/examples/resources/shaders/glsl330/phong.fs index 80e3d673..c14b346a 100644 --- a/examples/resources/shaders/glsl330/phong.fs +++ b/examples/resources/shaders/glsl330/phong.fs @@ -29,6 +29,9 @@ uniform float matGlossiness = 50.0; uniform vec3 lightPosition; uniform vec3 cameraPosition; +// Fragment shader output data +out vec4 fragColor; + // Calculate ambient lighting component vec3 AmbientLighting() { diff --git a/examples/resources/shaders/glsl330/swirl.fs b/examples/resources/shaders/glsl330/swirl.fs index da098754..80c16cc9 100644 --- a/examples/resources/shaders/glsl330/swirl.fs +++ b/examples/resources/shaders/glsl330/swirl.fs @@ -21,7 +21,7 @@ float angle = 0.8; uniform vec2 center = vec2(200.0, 200.0); -void main (void) +void main() { vec2 texSize = vec2(renderWidth, renderHeight); vec2 tc = fragTexCoord*texSize; |
