diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-09-20 17:54:09 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-01-13 03:39:32 +0100 |
commit | 6bab0ab86a72881c3e0b88284c211e01fb22435a (patch) | |
tree | 3594305ad612f0e59ee630c2b5a59d974fc8bac5 /cwd/shaders/face.fs | |
parent | 2017-09-19 (diff) | |
download | AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar.gz AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar.bz2 AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar.lz AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar.xz AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.tar.zst AltCraft-6bab0ab86a72881c3e0b88284c211e01fb22435a.zip |
Diffstat (limited to 'cwd/shaders/face.fs')
-rw-r--r-- | cwd/shaders/face.fs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cwd/shaders/face.fs b/cwd/shaders/face.fs index f4fd1ff..aa45997 100644 --- a/cwd/shaders/face.fs +++ b/cwd/shaders/face.fs @@ -2,10 +2,9 @@ in VS_OUT { vec2 UvPosition; - flat vec4 Texture; - flat vec3 Color; - flat vec2 Light; - flat int Face; + vec4 Texture; + vec3 Color; + vec2 Light; } fs_in; uniform sampler2D textureAtlas; @@ -40,10 +39,6 @@ vec3 hsv2rgb(vec3 c) } void main() { -// gl_FragColor = vec4(fs_in.Face / 1000.0f, fs_in.Face / 1000.0f, fs_in.Face / 1000.0f, 1.0f); - gl_FragColor = vec4(fs_in.UvPosition.xy,0.0f,1.0f); - return; - gl_FragColor = texture(textureAtlas,TransformTextureCoord(fs_in.Texture,fs_in.UvPosition)); if (gl_FragColor.a < 0.3) discard; @@ -52,4 +47,4 @@ void main() { gl_FragColor = vec4(hsv2rgb(hsvColor),1); //float faceLight = clamp((fs_in.Light.x + fs_in.Light.y) / 15.0,0.2,1.0); //gl_FragColor = vec4(gl_FragColor.rgb * faceLight,gl_FragColor.a); -} +}
\ No newline at end of file |