diff options
Diffstat (limited to 'assets')
-rw-r--r-- | assets/shaders/glsl100/skybox.fs | 13 | ||||
-rw-r--r-- | assets/shaders/glsl330/skybox.fs | 13 | ||||
-rw-r--r-- | assets/skybox.png | bin | 10992 -> 11307 bytes |
3 files changed, 2 insertions, 24 deletions
diff --git a/assets/shaders/glsl100/skybox.fs b/assets/shaders/glsl100/skybox.fs index 0ea6876..0861a7a 100644 --- a/assets/shaders/glsl100/skybox.fs +++ b/assets/shaders/glsl100/skybox.fs @@ -7,25 +7,14 @@ varying vec3 fragPosition; // Input uniform values uniform samplerCube environmentMap; -uniform bool vflipped; -uniform bool doGamma; void main() { // Fetch color from texture map - vec4 texelColor = vec4(0.0); - - if (vflipped) texelColor = textureCube(environmentMap, vec3(fragPosition.x, -fragPosition.y, fragPosition.z)); - else texelColor = textureCube(environmentMap, fragPosition); + vec4 texelColor = textureCube(environmentMap, fragPosition); vec3 color = vec3(texelColor.x, texelColor.y, texelColor.z); - if (doGamma) // Apply gamma correction - { - color = color/(color + vec3(1.0)); - color = pow(color, vec3(1.0/2.2)); - } - // Calculate final fragment color gl_FragColor = vec4(color, 1.0); } diff --git a/assets/shaders/glsl330/skybox.fs b/assets/shaders/glsl330/skybox.fs index d71fef0..cb64db0 100644 --- a/assets/shaders/glsl330/skybox.fs +++ b/assets/shaders/glsl330/skybox.fs @@ -5,8 +5,6 @@ in vec3 fragPosition; // Input uniform values uniform samplerCube environmentMap; -uniform bool vflipped; -uniform bool doGamma; // Output fragment color out vec4 finalColor; @@ -14,16 +12,7 @@ out vec4 finalColor; void main() { // Fetch color from texture map - vec3 color = vec3(0.0); - - if (vflipped) color = texture(environmentMap, vec3(fragPosition.x, -fragPosition.y, fragPosition.z)).rgb; - else color = texture(environmentMap, fragPosition).rgb; - - if (doGamma)// Apply gamma correction - { - color = color/(color + vec3(1.0)); - color = pow(color, vec3(1.0/2.2)); - } + vec3 color = texture(environmentMap, fragPosition).rgb; // Calculate final fragment color finalColor = vec4(color, 1.0); diff --git a/assets/skybox.png b/assets/skybox.png Binary files differindex 36a79b2..6bc64c2 100644 --- a/assets/skybox.png +++ b/assets/skybox.png |