From 0ab395036b597c960c3c9450d82d3a8ceef98dcf Mon Sep 17 00:00:00 2001 From: Dmitri K Date: Wed, 9 Nov 2016 20:17:54 -0500 Subject: [PATCH] HAZA! --- src/shaders/skyboxShader.frag | 22 +++++++++++----------- src/shaders/skyboxshader.frag | 11 ----------- 2 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 src/shaders/skyboxshader.frag diff --git a/src/shaders/skyboxShader.frag b/src/shaders/skyboxShader.frag index f1b865c..3cacd66 100644 --- a/src/shaders/skyboxShader.frag +++ b/src/shaders/skyboxShader.frag @@ -1,11 +1,11 @@ -#version 400 core -in vec2 texCoords; -out vec4 fColor; - -uniform sampler2D skybox; - -void main() -{ - //fColor = texture(skybox, texCoords); - fColor = vec4(1.0, 0, 1.0, 1.0);// * texture(skybox, texCoords); -} +#version 400 core +in vec2 texCoords; +out vec4 fColor; + +uniform sampler2D skybox; + +void main() +{ + //fColor = texture(skybox, texCoords); + fColor = texture(skybox, texCoords); +} diff --git a/src/shaders/skyboxshader.frag b/src/shaders/skyboxshader.frag deleted file mode 100644 index 053285a..0000000 --- a/src/shaders/skyboxshader.frag +++ /dev/null @@ -1,11 +0,0 @@ -#version 400 core -in vec2 texCoords; -out vec4 fColor; - -uniform sampler2D skybox; - -void main() -{ - //fColor = texture(skybox, texCoords); - fColor = texture(skybox, texCoords); -}