From 3c9ba50944f1b136125e1191ccbc49fda1381123 Mon Sep 17 00:00:00 2001 From: sanine Date: Fri, 7 Apr 2023 00:53:03 -0500 Subject: renormalize line endings --- fragment.glsl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'fragment.glsl') diff --git a/fragment.glsl b/fragment.glsl index c6ef691..532d1ac 100644 --- a/fragment.glsl +++ b/fragment.glsl @@ -1,17 +1,17 @@ -#version 410 core -out vec4 FragColor; - -in vec3 position; -in vec3 normal; -in vec2 tex; - -uniform float time; -uniform sampler2D ourTexture; - -void main() -{ - //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, tex); -} +#version 410 core +out vec4 FragColor; + +in vec3 position; +in vec3 normal; +in vec2 tex; + +uniform float time; +uniform sampler2D ourTexture; + +void main() +{ + //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, tex); +} -- cgit v1.2.1