Merge branch 'release/2.0.8'

ejeinc · Apr 5, 2016 · a898a82 · a898a82
2 parents 64d3a83 + 920d724
commit a898a82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -107,7 +107,7 @@ uploadArchives {
         mavenDeployer {
             def deployPath = file("$rootDir/../Meganekko_pages/repository")
             repository(url: "file://${deployPath.absolutePath}")
-            pom.version = '2.0.7'
+            pom.version = '2.0.8'
             pom.groupId = 'com.eje_c'
             pom.artifactId = 'meganekko'
         }

diff --git a/library/src/main/jni/OESShader.cpp b/library/src/main/jni/OESShader.cpp
@@ -48,7 +48,10 @@ static const char FRAGMENT_SHADER[] =
         "uniform float Opacity;\n"
         "varying highp vec2 oTexCoord;\n"
         "void main() {\n"
-        "  gl_FragColor = texture2D(Texture0, oTexCoord) * UniformColor * Opacity;\n"
+        "  vec4 texel = texture2D(Texture0, oTexCoord) * UniformColor * Opacity;\n"
+        "  if (texel.a < 0.1)\n"
+        "    discard;\n"
+        "  gl_FragColor = texel;\n"
         "}\n";
 
 OESShader::OESShader() {