23 files changed, 20 insertions, 38 deletions
diff --git a/src/datavis3d/engine/engine.qrc b/src/datavis3d/engine/engine.qrc
index 5ca041a4..e5760ea2 100644
--- a/src/datavis3d/engine/engine.qrc
+++ b/src/datavis3d/engine/engine.qrc
@@ -18,28 +18,26 @@
         <file alias="negativeBackground">meshes/backgroudNegatives.obj</file>
     </qresource>
     <qresource prefix="/shaders">
-        <file alias="fragment">shaders/fragmentShader</file>
-        <file alias="vertex">shaders/vertexShader</file>
-        <file alias="fragmentAmbient">shaders/fragmentShaderAmbient</file>
-        <file alias="fragmentColorOnY">shaders/fragmentShaderColorOnY</file>
-        <file alias="fragmentSelection">shaders/fragmentShaderSelection</file>
-        <file alias="vertexSelection">shaders/vertexShaderSelection</file>
-        <file alias="fragmentTexture">shaders/fragmentShaderTexture</file>
-        <file alias="vertexTexture">shaders/vertexShaderTexture</file>
-        <file alias="fragmentLabel">shaders/fragmentShaderLabel</file>
-        <file alias="vertexLabel">shaders/vertexShaderLabel</file>
-        <file alias="fragmentDepth">shaders/fragmentShaderDepth</file>
-        <file alias="vertexDepth">shaders/vertexShaderDepth</file>
-        <file alias="testDepthFrag">shaders/fragmentDepthTest</file>
-        <file alias="testDepthVert">shaders/vertexDepthTest</file>
-        <file alias="fragmentShadow">shaders/fragmentShadow</file>
-        <file alias="vertexShadow">shaders/vertexShadow</file>
-        <file alias="fragmentShadowNoTex">shaders/fragmentShadowNoTex</file>
-        <file alias="fragmentShadowNoTexColorOnY">shaders/fragmentShadowNoTexColorOnY</file>
-        <file alias="fragmentColorOnYES2">shaders/fragmentShaderColorOnYES2</file>
-        <file alias="fragmentES2">shaders/fragmentShaderES2</file>
-        <file alias="vertexES2">shaders/vertexShaderES2</file>
-        <file alias="fragmentTextureES2">shaders/fragmentShaderTextureES2</file>
+        <file alias="fragment">shaders/default.frag</file>
+        <file alias="vertex">shaders/default.vert</file>
+        <file alias="fragmentAmbient">shaders/ambient.frag</file>
+        <file alias="fragmentColorOnY">shaders/colorOnY.frag</file>
+        <file alias="fragmentSelection">shaders/selection.frag</file>
+        <file alias="vertexSelection">shaders/selection.vert</file>
+        <file alias="fragmentTexture">shaders/texture.frag</file>
+        <file alias="vertexTexture">shaders/texture.vert</file>
+        <file alias="fragmentLabel">shaders/label.frag</file>
+        <file alias="vertexLabel">shaders/label.vert</file>
+        <file alias="fragmentDepth">shaders/depth.frag</file>
+        <file alias="vertexDepth">shaders/depth.vert</file>
+        <file alias="fragmentShadow">shaders/shadow.frag</file>
+        <file alias="vertexShadow">shaders/shadow.vert</file>
+        <file alias="fragmentShadowNoTex">shaders/shadowNoTex.frag</file>
+        <file alias="fragmentShadowNoTexColorOnY">shaders/shadowNoTexColorOnY.frag</file>
+        <file alias="fragmentColorOnYES2">shaders/colorOnY_ES2.frag</file>
+        <file alias="fragmentES2">shaders/default_ES2.frag</file>
+        <file alias="vertexES2">shaders/default_ES2.vert</file>
+        <file alias="fragmentTextureES2">shaders/texture_ES2.frag</file>
     </qresource>
     <qresource prefix="/textures"/>
 </RCC>
diff --git a/src/datavis3d/engine/shaders/fragmentShaderAmbient b/src/datavis3d/engine/shaders/ambient.frag
index 88f850f3..88f850f3 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderAmbient
+++ b/src/datavis3d/engine/shaders/ambient.frag
diff --git a/src/datavis3d/engine/shaders/fragmentShaderColorOnY b/src/datavis3d/engine/shaders/colorOnY.frag
index ee57e8e5..ee57e8e5 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderColorOnY
+++ b/src/datavis3d/engine/shaders/colorOnY.frag
diff --git a/src/datavis3d/engine/shaders/fragmentShaderColorOnYES2 b/src/datavis3d/engine/shaders/colorOnY_ES2.frag
index dd7c0cf3..dd7c0cf3 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderColorOnYES2
+++ b/src/datavis3d/engine/shaders/colorOnY_ES2.frag
diff --git a/src/datavis3d/engine/shaders/fragmentShader b/src/datavis3d/engine/shaders/default.frag
index 5bf9c654..5bf9c654 100644
--- a/src/datavis3d/engine/shaders/fragmentShader
+++ b/src/datavis3d/engine/shaders/default.frag
diff --git a/src/datavis3d/engine/shaders/vertexShader b/src/datavis3d/engine/shaders/default.vert
index 14f77773..14f77773 100644
--- a/src/datavis3d/engine/shaders/vertexShader
+++ b/src/datavis3d/engine/shaders/default.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShaderES2 b/src/datavis3d/engine/shaders/default_ES2.frag
index a70ed241..a70ed241 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderES2
+++ b/src/datavis3d/engine/shaders/default_ES2.frag
diff --git a/src/datavis3d/engine/shaders/vertexShaderES2 b/src/datavis3d/engine/shaders/default_ES2.vert
index efb40862..efb40862 100644
--- a/src/datavis3d/engine/shaders/vertexShaderES2
+++ b/src/datavis3d/engine/shaders/default_ES2.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShaderDepth b/src/datavis3d/engine/shaders/depth.frag
index 5cfd4b10..5cfd4b10 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderDepth
+++ b/src/datavis3d/engine/shaders/depth.frag
diff --git a/src/datavis3d/engine/shaders/vertexShaderDepth b/src/datavis3d/engine/shaders/depth.vert
index 9fe5a193..9fe5a193 100644
--- a/src/datavis3d/engine/shaders/vertexShaderDepth
+++ b/src/datavis3d/engine/shaders/depth.vert
diff --git a/src/datavis3d/engine/shaders/fragmentDepthTest b/src/datavis3d/engine/shaders/fragmentDepthTest
deleted file mode 100644
index d6c502e1..00000000
--- a/src/datavis3d/engine/shaders/fragmentDepthTest
+++ /dev/null
@@ -1,7 +0,0 @@
-uniform sampler2D textureSampler;
-
-varying highp vec2 UV;
-
-void main() {
-    gl_FragColor = texture2D(textureSampler, UV);
-}
diff --git a/src/datavis3d/engine/shaders/fragmentShaderLabel b/src/datavis3d/engine/shaders/label.frag
index 86021410..86021410 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderLabel
+++ b/src/datavis3d/engine/shaders/label.frag
diff --git a/src/datavis3d/engine/shaders/vertexShaderLabel b/src/datavis3d/engine/shaders/label.vert
index b4debe53..b4debe53 100644
--- a/src/datavis3d/engine/shaders/vertexShaderLabel
+++ b/src/datavis3d/engine/shaders/label.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShaderSelection b/src/datavis3d/engine/shaders/selection.frag
index 1658b316..1658b316 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderSelection
+++ b/src/datavis3d/engine/shaders/selection.frag
diff --git a/src/datavis3d/engine/shaders/vertexShaderSelection b/src/datavis3d/engine/shaders/selection.vert
index 64d17e15..64d17e15 100644
--- a/src/datavis3d/engine/shaders/vertexShaderSelection
+++ b/src/datavis3d/engine/shaders/selection.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShadow b/src/datavis3d/engine/shaders/shadow.frag
index 919cedee..919cedee 100644
--- a/src/datavis3d/engine/shaders/fragmentShadow
+++ b/src/datavis3d/engine/shaders/shadow.frag
diff --git a/src/datavis3d/engine/shaders/vertexShadow b/src/datavis3d/engine/shaders/shadow.vert
index e29a8a30..e29a8a30 100644
--- a/src/datavis3d/engine/shaders/vertexShadow
+++ b/src/datavis3d/engine/shaders/shadow.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShadowNoTex b/src/datavis3d/engine/shaders/shadowNoTex.frag
index 50f900ba..50f900ba 100644
--- a/src/datavis3d/engine/shaders/fragmentShadowNoTex
+++ b/src/datavis3d/engine/shaders/shadowNoTex.frag
diff --git a/src/datavis3d/engine/shaders/fragmentShadowNoTexColorOnY b/src/datavis3d/engine/shaders/shadowNoTexColorOnY.frag
index 75f0e6d3..75f0e6d3 100644
--- a/src/datavis3d/engine/shaders/fragmentShadowNoTexColorOnY
+++ b/src/datavis3d/engine/shaders/shadowNoTexColorOnY.frag
diff --git a/src/datavis3d/engine/shaders/fragmentShaderTexture b/src/datavis3d/engine/shaders/texture.frag
index a6d7b2eb..a6d7b2eb 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderTexture
+++ b/src/datavis3d/engine/shaders/texture.frag
diff --git a/src/datavis3d/engine/shaders/vertexShaderTexture b/src/datavis3d/engine/shaders/texture.vert
index 01f922e0..01f922e0 100644
--- a/src/datavis3d/engine/shaders/vertexShaderTexture
+++ b/src/datavis3d/engine/shaders/texture.vert
diff --git a/src/datavis3d/engine/shaders/fragmentShaderTextureES2 b/src/datavis3d/engine/shaders/texture_ES2.frag
index 16161035..16161035 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderTextureES2
+++ b/src/datavis3d/engine/shaders/texture_ES2.frag
diff --git a/src/datavis3d/engine/shaders/vertexDepthTest b/src/datavis3d/engine/shaders/vertexDepthTest
deleted file mode 100644
index d62f1aa7..00000000
--- a/src/datavis3d/engine/shaders/vertexDepthTest
+++ /dev/null
@@ -1,9 +0,0 @@
-attribute highp vec3 vertexPosition_mdl;
-
-varying highp vec2 UV;
-
-void main() {
-    gl_Position = vec4(vertexPosition_mdl, 1.0);
-    UV = (vertexPosition_mdl.xy + vec2(1.0, 1.0)) / 2.0;
-}
-