summaryrefslogtreecommitdiff
path: root/fragment.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'fragment.glsl')
-rw-r--r--fragment.glsl6
1 files changed, 4 insertions, 2 deletions
diff --git a/fragment.glsl b/fragment.glsl
index 27dbbfa..c6ef691 100644
--- a/fragment.glsl
+++ b/fragment.glsl
@@ -5,11 +5,13 @@ in vec3 position;
in vec3 normal;
in vec2 tex;
+uniform float time;
uniform sampler2D ourTexture;
void main()
{
- FragColor = vec4(normal, 1.0f);
+ //FragColor = vec4(sin(time), cos(time), -sin(time), 1.0f);
+ //FragColor = vec4(normal, 1.0f);
//FragColor = vec4(tex, 1.0f, 1.0f);
- //FragColor = texture(ourTexture, TexCoord);
+ FragColor = texture(ourTexture, tex);
}