Merge pull request cats-oss#202 from jonan/lookup-intensity

GPUImageLookupFilter updated

Author: wasabeef

library/src/jp/co/cyberagent/android/gpuimage/GPUImageLookupFilter.java

@@ -16,6 +16,8 @@
 
 package jp.co.cyberagent.android.gpuimage;
 
+import android.opengl.GLES20;
+
 public class GPUImageLookupFilter extends GPUImageTwoInputFilter {
 
     public static final String LOOKUP_FRAGMENT_SHADER = "varying highp vec2 textureCoordinate;\n" +
@@ -24,17 +26,19 @@ public class GPUImageLookupFilter extends GPUImageTwoInputFilter {
             " uniform sampler2D inputImageTexture;\n" +
             " uniform sampler2D inputImageTexture2; // lookup texture\n" +
             " \n" +
+            " uniform lowp float intensity;\n" +
+            " \n" +
             " void main()\n" +
             " {\n" +
-            "     lowp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);\n" +
+            "     highp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);\n" +
             "     \n" +
-            "     mediump float blueColor = textureColor.b * 63.0;\n" +
+            "     highp float blueColor = textureColor.b * 63.0;\n" +
             "     \n" +
-            "     mediump vec2 quad1;\n" +
+            "     highp vec2 quad1;\n" +
             "     quad1.y = floor(floor(blueColor) / 8.0);\n" +
             "     quad1.x = floor(blueColor) - (quad1.y * 8.0);\n" +
             "     \n" +
-            "     mediump vec2 quad2;\n" +
+            "     highp vec2 quad2;\n" +
             "     quad2.y = floor(ceil(blueColor) / 8.0);\n" +
             "     quad2.x = ceil(blueColor) - (quad2.y * 8.0);\n" +
             "     \n" +
@@ -50,11 +54,35 @@ public class GPUImageLookupFilter extends GPUImageTwoInputFilter {
             "     lowp vec4 newColor2 = texture2D(inputImageTexture2, texPos2);\n" +
             "     \n" +
             "     lowp vec4 newColor = mix(newColor1, newColor2, fract(blueColor));\n" +
-            "     gl_FragColor = vec4(newColor.rgb, textureColor.w);\n" +
+            "     gl_FragColor = mix(textureColor, vec4(newColor.rgb, textureColor.w), intensity);\n" +
             " }";
 
+    private int mIntensityLocation;
+    private float mIntensity;
 
     public GPUImageLookupFilter() {
+        this(1.0f);
+    }
+
+    public GPUImageLookupFilter(final float intensity) {
         super(LOOKUP_FRAGMENT_SHADER);
+        mIntensity = intensity;
+    }
+
+    @Override
+    public void onInit() {
+        super.onInit();
+        mIntensityLocation = GLES20.glGetUniformLocation(getProgram(), "intensity");
+    }
+
+    @Override
+    public void onInitialized() {
+        super.onInitialized();
+        setIntensity(mIntensity);
+    }
+
+    public void setIntensity(final float intensity) {
+        mIntensity = intensity;
+        setFloat(mIntensityLocation, mIntensity);
     }
 }