From bec1a399751e26c98e15883f5e3c01b2b099b23d Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 15 Dec 2015 11:28:34 +0300 Subject: [PATCH] Deleted unused shader --- drape/drape.pro | 26 ++++++++++++---------- drape/shaders/position_accuracy_shader.vsh | 24 -------------------- 2 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 drape/shaders/position_accuracy_shader.vsh diff --git a/drape/drape.pro b/drape/drape.pro index 2e260e52c0..0e9376ec67 100644 --- a/drape/drape.pro +++ b/drape/drape.pro @@ -12,8 +12,10 @@ include($$DRAPE_DIR/drape_common.pri) SOURCES += glfunctions.cpp OTHER_FILES += \ - shaders/area_vertex_shader.vsh \ shaders/area3d_vertex_shader.vsh \ + shaders/area_vertex_shader.vsh \ + shaders/arrow3d_fragment_shader.fsh \ + shaders/arrow3d_vertex_shader.vsh \ shaders/button_fragment_shader.fsh \ shaders/button_vertex_shader.vsh \ shaders/circle_shader.fsh \ @@ -27,25 +29,25 @@ OTHER_FILES += \ shaders/line_vertex_shader.vsh \ shaders/my_position_shader.vsh \ shaders/path_symbol_vertex_shader.vsh \ - shaders/position_accuracy_shader.vsh \ - shaders/solid_color_fragment_shader.fsh \ + shaders/position_accuracy3d_shader.vsh \ shaders/route_arrow_fragment_shader.fsh \ shaders/route_fragment_shader.fsh \ shaders/route_vertex_shader.vsh \ shaders/ruler_vertex_shader.vsh \ shaders/shader_index.txt \ - shaders/text_fragment_shader.fsh \ - shaders/texturing_fragment_shader.fsh \ - shaders/texturing_vertex_shader.vsh \ - shaders/user_mark.vsh \ - shaders/text_outlined_vertex_shader.vsh \ - shaders/text_vertex_shader.vsh \ - shaders/arrow3d_vertex_shader.vsh \ - shaders/arrow3d_fragment_shader.fsh \ + shaders/solid_color_fragment_shader.fsh \ shaders/text_billboard_vertex_shader.vsh \ + shaders/text_fragment_shader.fsh \ shaders/text_outlined_billboard_vertex_shader.vsh \ shaders/text_outlined_gui_vertex_shader.vsh \ - shaders/texturing_billboard_vertex_shader.vsh \ + shaders/text_outlined_vertex_shader.vsh \ + shaders/text_vertex_shader.vsh \ shaders/texturing3d_fragment_shader.fsh \ shaders/texturing3d_vertex_shader.vsh \ + shaders/texturing_billboard_vertex_shader.vsh \ + shaders/texturing_fragment_shader.fsh \ + shaders/texturing_vertex_shader.vsh \ + shaders/transparent_layer_fragment_shader.fsh \ + shaders/transparent_layer_vertex_shader.vsh \ + shaders/user_mark.vsh \ shaders/user_mark_billboard.vsh \ diff --git a/drape/shaders/position_accuracy_shader.vsh b/drape/shaders/position_accuracy_shader.vsh deleted file mode 100644 index bd2b58b05b..0000000000 --- a/drape/shaders/position_accuracy_shader.vsh +++ /dev/null @@ -1,24 +0,0 @@ -attribute vec2 a_normal; -attribute vec2 a_colorTexCoords; - -uniform vec3 u_position; -uniform float u_accuracy; - -uniform mat4 modelView; -uniform mat4 projection; -uniform mat4 pivotTransform; - -varying vec2 v_colorTexCoords; - -void main(void) -{ - vec4 position = vec4(u_position, 1.0) * modelView; - vec4 normal = vec4(normalize(a_normal) * u_accuracy, 0.0, 0.0); - position = (position + normal) * projection; - float w = position.w; - position.xyw = (pivotTransform * vec4(position.xy, 0.0, w)).xyw; - position.z *= position.w / w; - gl_Position = position; - - v_colorTexCoords = a_colorTexCoords; -}