From 9f10676dd39a91bf7c4b2dfbaf74151269b2699b Mon Sep 17 00:00:00 2001 From: Benau Date: Mon, 16 Oct 2017 07:43:00 +0800 Subject: [PATCH] Remove unused billboard shader --- data/shaders/billboard.frag | 12 ------------ data/shaders/billboard.vert | 22 ---------------------- 2 files changed, 34 deletions(-) delete mode 100644 data/shaders/billboard.frag delete mode 100644 data/shaders/billboard.vert diff --git a/data/shaders/billboard.frag b/data/shaders/billboard.frag deleted file mode 100644 index 6f583946a..000000000 --- a/data/shaders/billboard.frag +++ /dev/null @@ -1,12 +0,0 @@ -uniform sampler2D tex; - -in vec2 uv; -in vec4 vertex_color; -out vec4 FragColor; - -void main(void) -{ - vec4 color = texture(tex, uv); - color *= vertex_color; - FragColor = vec4(color.a * color.rgb, color.a); -} diff --git a/data/shaders/billboard.vert b/data/shaders/billboard.vert deleted file mode 100644 index c47b2f15a..000000000 --- a/data/shaders/billboard.vert +++ /dev/null @@ -1,22 +0,0 @@ -uniform mat4 color_matrix; -uniform vec3 Position; -uniform vec2 Size; - -#ifdef Explicit_Attrib_Location_Usable -layout(location = 0) in vec2 Corner; -layout(location = 3) in vec2 Texcoord; -#else -in vec2 Corner; -in vec2 Texcoord; -#endif - -out vec2 uv; -out vec4 vertex_color; - -void main(void) -{ - uv = Texcoord; - vec4 Center = ViewMatrix * vec4(Position, 1.); - gl_Position = ProjectionMatrix * (Center + vec4(Size * Corner, 0., 0.)); - vertex_color = color_matrix[gl_VertexID]; -}