diff options
| author | raysan5 <[email protected]> | 2020-09-18 20:47:39 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-09-18 20:47:39 +0200 |
| commit | b5d50ee51afe7d30bbbcdd619534e9d4f432f4d3 (patch) | |
| tree | 6dac6db6b04934c37b86ca84de893d53e83e1dff /examples/models | |
| parent | 79d63e6ca1a1fa3b9e5e8647c522157e616f023f (diff) | |
| download | raylib-b5d50ee51afe7d30bbbcdd619534e9d4f432f4d3.tar.gz raylib-b5d50ee51afe7d30bbbcdd619534e9d4f432f4d3.zip | |
EXAMPLE: models_skybox works on OpenGL ES 2.0
Diffstat (limited to 'examples/models')
5 files changed, 15 insertions, 51 deletions
diff --git a/examples/models/resources/shaders/glsl100/cubemap.fs b/examples/models/resources/shaders/glsl100/cubemap.fs index 8e84bcba..402cdea0 100644 --- a/examples/models/resources/shaders/glsl100/cubemap.fs +++ b/examples/models/resources/shaders/glsl100/cubemap.fs @@ -1,12 +1,6 @@ -/******************************************************************************************* -* -* rPBR [shader] - Equirectangular to cubemap fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ +#version 100 -#version 330 +precision mediump float; // Input vertex attributes (from vertex shader) varying vec3 fragPosition; @@ -28,7 +22,7 @@ void main() vec2 uv = SampleSphericalMap(normalize(fragPosition)); // Fetch color from texture map - vec3 color = texture(equirectangularMap, uv).rgb; + vec3 color = texture2D(equirectangularMap, uv).rgb; // Calculate final fragment color gl_FragColor = vec4(color, 1.0); diff --git a/examples/models/resources/shaders/glsl100/cubemap.vs b/examples/models/resources/shaders/glsl100/cubemap.vs index 98edc334..fd8d17e1 100644 --- a/examples/models/resources/shaders/glsl100/cubemap.vs +++ b/examples/models/resources/shaders/glsl100/cubemap.vs @@ -1,12 +1,4 @@ -/******************************************************************************************* -* -* rPBR [shader] - Equirectangular to cubemap vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - -#version 330 +#version 100 // Input vertex attributes attribute vec3 vertexPosition; diff --git a/examples/models/resources/shaders/glsl100/skybox.fs b/examples/models/resources/shaders/glsl100/skybox.fs index ad0b0196..1269a96d 100644 --- a/examples/models/resources/shaders/glsl100/skybox.fs +++ b/examples/models/resources/shaders/glsl100/skybox.fs @@ -1,14 +1,6 @@ -/******************************************************************************************* -* -* rPBR [shader] - Background skybox fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -* 19-Jun-2020 - modified by Giuseppe Mastrangelo (@peppemas) - VFlip Support -* -**********************************************************************************************/ +#version 100 -#version 110 +precision mediump float; // Input vertex attributes (from vertex shader) varying vec3 fragPosition; @@ -20,11 +12,13 @@ uniform bool vflipped; void main() { // Fetch color from texture map - vec3 color = { 0.0 }; + vec4 texelColor = vec4(0.0); - if (vflipped) color = texture2D(environmentMap, vec3(fragPosition.x, -fragPosition.y, fragPosition.z)).rgb; - else color = texture2D(environmentMap, fragPosition).rgb; + if (vflipped) texelColor = textureCube(environmentMap, vec3(fragPosition.x, -fragPosition.y, fragPosition.z)); + else texelColor = textureCube(environmentMap, fragPosition); + vec3 color = vec3(texelColor.x, texelColor.y, texelColor.z); + // Apply gamma correction color = color/(color + vec3(1.0)); color = pow(color, vec3(1.0/2.2)); diff --git a/examples/models/resources/shaders/glsl100/skybox.vs b/examples/models/resources/shaders/glsl100/skybox.vs index dcbe6c3d..0d00d54f 100644 --- a/examples/models/resources/shaders/glsl100/skybox.vs +++ b/examples/models/resources/shaders/glsl100/skybox.vs @@ -1,22 +1,14 @@ -/******************************************************************************************* -* -* rPBR [shader] - Background skybox vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - -#version 330 +#version 100 // Input vertex attributes -in vec3 vertexPosition; +attribute vec3 vertexPosition; // Input uniform values uniform mat4 projection; uniform mat4 view; // Output vertex attributes (to fragment shader) -out vec3 fragPosition; +varying vec3 fragPosition; void main() { @@ -28,5 +20,5 @@ void main() vec4 clipPos = projection*rotView*vec4(vertexPosition, 1.0); // Calculate final vertex position - gl_Position = clipPos.xyww; + gl_Position = clipPos.xyzw; } diff --git a/examples/models/resources/shaders/glsl330/cubemap.fs b/examples/models/resources/shaders/glsl330/cubemap.fs index e8e28536..e4d4ddd4 100644 --- a/examples/models/resources/shaders/glsl330/cubemap.fs +++ b/examples/models/resources/shaders/glsl330/cubemap.fs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Equirectangular to cubemap fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes (from vertex shader) |
