Merge pull request #61 from ChillingVan/dev

Dev release to master for v1.4.2.0

Author: ChillingVan

README-en.md

@@ -43,7 +43,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.3'
+    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.2.0'
 }
 ```
 
@@ -129,6 +129,7 @@ It has sync and async modes.
   This is kind of heavy so I do not update call this for every drawn.
 
 ## Latest Update
+* Fix FilterGroup on drawSurfaceTexture
 * Fix subtle crash issue
 * Add OrthoBitmapMatrix as One BitmapMatrix. Default BitmapMatrix uses perspective matrix.
 * Fix BitmapMatrix cut by small viewport issue when Bitmap out of screen.

README.md

@@ -48,7 +48,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.3'
+    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.2.0'
 }
 ```
 
@@ -139,6 +139,7 @@ public class MyGLView extends GLView {
 
 
 ## 最近更新
+* 修复FilterGroup无法应用在SurfaceTexture上的问题
 * 修复潜在的IndexOutOfBound exception
 * 添加OrthoBitmapMatrix以支持正交投影。 默认BitmapMatrix用的是透视投影。
 * 修复BitmapMatrix被过小的viewport剪切的问题。支持更大的放大倍数及离屏距离。

canvasgl/build.gradle

@@ -21,15 +21,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.ChillingVan'
-def VERSION_NAME="1.4.1.3"
+def VERSION_NAME="1.4.2.0"
 
 android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 104013
+        versionCode 104020
         versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -52,7 +52,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:support-annotations:28.0.0'
 }
 
 

canvasgl/src/main/java/com/chillingvan/canvasgl/CanvasGL.java

@@ -57,13 +57,14 @@ public class CanvasGL implements ICanvasGL {
 
     private Map<Bitmap, BasicTexture> bitmapTextureMap = new WeakHashMap<>();
     protected final GLCanvas glCanvas;
-    protected final BasicTextureFilter basicTextureFilter;
+    protected final BasicTextureFilter defaultTextureFilter;
     private float[] canvasBackgroundColor;
     private float[] surfaceTextureMatrix = new float[16];
     private int width;
     private int height;
-    private BasicDrawShapeFilter basicDrawShapeFilter;
+    private BasicDrawShapeFilter defaultDrawShapeFilter;
     private DrawCircleFilter drawCircleFilter = new DrawCircleFilter();
+    private TextureFilter currentTextureFilter;
 
     public CanvasGL() {
         this(new GLES20Canvas());
@@ -83,8 +84,8 @@ public void onPreDraw(int textureProgram, BasicTexture texture, TextureFilter te
                 textureFilter.onPreDraw(textureProgram, texture, CanvasGL.this);
             }
         });
-        basicTextureFilter = new BasicTextureFilter();
-        basicDrawShapeFilter = new BasicDrawShapeFilter();
+        defaultTextureFilter = new BasicTextureFilter();
+        defaultDrawShapeFilter = new BasicDrawShapeFilter();
         canvasBackgroundColor = new float[4];
     }
 
@@ -116,11 +117,16 @@ public GLCanvas getGlCanvas() {
 
     @Override
     public void drawSurfaceTexture(BasicTexture texture, SurfaceTexture surfaceTexture, int left, int top, int right, int bottom) {
-        drawSurfaceTexture(texture, surfaceTexture, left, top, right, bottom, basicTextureFilter);
+        drawSurfaceTexture(texture, surfaceTexture, left, top, right, bottom, defaultTextureFilter);
     }
 
     @Override
-    public void drawSurfaceTexture(BasicTexture texture, SurfaceTexture surfaceTexture, int left, int top, int right, int bottom, TextureFilter basicTextureFilter) {
+    public void drawSurfaceTexture(BasicTexture texture, final SurfaceTexture surfaceTexture, int left, int top, int right, int bottom, TextureFilter basicTextureFilter) {
+        currentTextureFilter = basicTextureFilter;
+        if (basicTextureFilter instanceof FilterGroup) {
+            drawSurfaceTextureWithFilterGroup(texture, surfaceTexture, left, top, right, bottom, basicTextureFilter);
+            return;
+        }
         if (surfaceTexture == null) {
             glCanvas.drawTexture(texture, left, top, right - left, bottom - top, basicTextureFilter, null);
         } else {
@@ -129,10 +135,26 @@ public void drawSurfaceTexture(BasicTexture texture, SurfaceTexture surfaceTextu
         }
     }
 
+    private void drawSurfaceTextureWithFilterGroup(BasicTexture texture, final SurfaceTexture surfaceTexture, int left, int top, int right, int bottom, TextureFilter basicTextureFilter) {
+        FilterGroup filterGroup = (FilterGroup) basicTextureFilter;
+        texture = filterGroup.draw(texture, glCanvas, new FilterGroup.OnDrawListener() {
+            @Override
+            public void onDraw(BasicTexture drawTexture, TextureFilter textureFilter, boolean isFirst) {
+                if (isFirst) {
+                    surfaceTexture.getTransformMatrix(surfaceTextureMatrix);
+                    glCanvas.drawTexture(drawTexture, surfaceTextureMatrix, 0, 0, drawTexture.getWidth(), drawTexture.getHeight(), textureFilter, null);
+                } else {
+                    glCanvas.drawTexture(drawTexture, 0, 0, drawTexture.getWidth(), drawTexture.getHeight(), textureFilter, null);
+                }
+            }
+        });
+        glCanvas.drawTexture(texture, left, top, right - left, bottom - top, basicTextureFilter, null);
+    }
+
 
     @Override
     public void drawBitmap(Bitmap bitmap, @NonNull IBitmapMatrix matrix) {
-        drawBitmap(bitmap, matrix, basicTextureFilter);
+        drawBitmap(bitmap, matrix, defaultTextureFilter);
     }
 
     @Override
@@ -150,12 +172,12 @@ public float[] getMVPMatrix(int viewportW, int viewportH, float x, float y, floa
 
     @Override
     public void drawBitmap(Bitmap bitmap, Rect src, RectF dst) {
-        drawBitmap(bitmap, new RectF(src), dst, basicTextureFilter);
+        drawBitmap(bitmap, new RectF(src), dst, defaultTextureFilter);
     }
 
     @Override
     public void drawBitmap(Bitmap bitmap, int left, int top) {
-        drawBitmap(bitmap, left, top, basicTextureFilter);
+        drawBitmap(bitmap, left, top, defaultTextureFilter);
     }
 
     @Override
@@ -180,7 +202,7 @@ public void drawBitmap(Bitmap bitmap, RectF src, RectF dst, TextureFilter textur
 
     @Override
     public void drawBitmap(Bitmap bitmap, int left, int top, int width, int height) {
-        drawBitmap(bitmap, left, top, width, height, basicTextureFilter);
+        drawBitmap(bitmap, left, top, width, height, defaultTextureFilter);
     }
 
     @Override
@@ -190,19 +212,29 @@ public void drawBitmap(Bitmap bitmap, int left, int top, int width, int height,
     }
 
     protected BasicTexture getTexture(Bitmap bitmap, @Nullable TextureFilter textureFilter) {
+        currentTextureFilter = textureFilter;
         throwIfCannotDraw(bitmap);
 
         BasicTexture resultTexture = getTextureFromMap(bitmap);
 
         if (textureFilter instanceof FilterGroup) {
             FilterGroup filterGroup = (FilterGroup) textureFilter;
-            resultTexture = filterGroup.draw(resultTexture, glCanvas);
+            resultTexture = filterGroup.draw(resultTexture, glCanvas, new FilterGroup.OnDrawListener() {
+                @Override
+                public void onDraw(BasicTexture drawTexture, TextureFilter textureFilter, boolean isFirst) {
+                    glCanvas.drawTexture(drawTexture, 0, 0, drawTexture.getWidth(), drawTexture.getHeight(), textureFilter, null);
+                }
+            });
         }
 
 
         return resultTexture;
     }
 
+    /***
+     * Use this to the bitmap to texture. Called when your bitmap content pixels changed
+     * @param bitmap the bitmap whose content pixels changed
+     */
     @Override
     public void invalidateTextureContent(Bitmap bitmap) {
         BasicTexture resultTexture = getTextureFromMap(bitmap);
@@ -234,7 +266,7 @@ public void drawCircle(float x, float y, float radius, GLPaint paint) {
 
     @Override
     public void drawLine(float startX, float startY, float stopX, float stopY, GLPaint paint) {
-        glCanvas.drawLine(startX, startY, stopX, stopY, paint, basicDrawShapeFilter);
+        glCanvas.drawLine(startX, startY, stopX, stopY, paint, defaultDrawShapeFilter);
     }
 
 
@@ -251,9 +283,9 @@ public void drawRect(@NonNull Rect r, GLPaint paint) {
     @Override
     public void drawRect(float left, float top, float right, float bottom, GLPaint paint) {
         if (paint.getStyle() == Paint.Style.STROKE) {
-            glCanvas.drawRect(left, top, right - left, bottom - top, paint, basicDrawShapeFilter);
+            glCanvas.drawRect(left, top, right - left, bottom - top, paint, defaultDrawShapeFilter);
         } else {
-            glCanvas.fillRect(left, top, right - left, bottom - top, paint.getColor(), basicDrawShapeFilter);
+            glCanvas.fillRect(left, top, right - left, bottom - top, paint.getColor(), defaultDrawShapeFilter);
         }
     }
 
@@ -338,6 +370,18 @@ public int getHeight() {
         return height;
     }
 
+    @Override
+    public void resume() {
+
+    }
+
+    @Override
+    public void pause() {
+        if (currentTextureFilter != null) {
+            currentTextureFilter.destroy();
+        }
+    }
+
     @Override
     public void setAlpha(@IntRange(from = 0, to = 255) int alpha) {
         glCanvas.setAlpha(alpha/(float)255);

canvasgl/src/main/java/com/chillingvan/canvasgl/ICanvasGL.java

@@ -117,6 +117,10 @@ public interface ICanvasGL {
 
     int getHeight();
 
+    void resume();
+
+    void pause();
+
     /**
      * If used in a texture view, make sure the setOpaque(false) is called.
      *

canvasgl/src/main/java/com/chillingvan/canvasgl/MultiTexOffScreenCanvas.java

@@ -267,6 +267,7 @@ public void onDrawFrame() {
         if (producedTextureTarget != GLES20.GL_TEXTURE_2D) {
             for (GLTexture glTexture : producedTextureList) {
                 glTexture.getSurfaceTexture().updateTexImage();
+                glTexture.getRawTexture().setNeedInvalidate(true);
             }
         }
         onGLDraw(mCanvas, producedTextureList, consumedTextures);

canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/RawTexture.java

@@ -31,6 +31,7 @@ public class RawTexture extends BasicTexture {
     private final boolean mOpaque;
     private boolean mIsFlipped;
     private int target = GL11.GL_TEXTURE_2D;
+    protected boolean needInvalidate;
 
     public RawTexture(int width, int height, boolean opaque) {
         this(width, height, opaque, GL11.GL_TEXTURE_2D);
@@ -88,4 +89,15 @@ public void yield() {
     protected int getTarget() {
         return target;
     }
+
+    /**
+     * Call this when surfaceTexture calls updateTexImage
+     */
+    public void setNeedInvalidate(boolean needInvalidate) {
+        this.needInvalidate = needInvalidate;
+    }
+
+    public boolean isNeedInvalidate() {
+        return needInvalidate;
+    }
 }

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/GLView.java

@@ -103,6 +103,9 @@ public void restart() {
 
     public void stop() {
         onPause();
+        if (mCanvas != null) {
+            mCanvas.pause();
+        }
     }
 
     public void destroy() {

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLCanvasTextureView.java

@@ -9,9 +9,9 @@
 
 import com.chillingvan.canvasgl.CanvasGL;
 import com.chillingvan.canvasgl.ICanvasGL;
-import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.canvasgl.OpenGLUtil;
 import com.chillingvan.canvasgl.glview.GLView;
+import com.chillingvan.canvasgl.util.Loggers;
 
 /**
  *
@@ -46,7 +46,7 @@ protected void init() {
 
     @Override
     public void onSurfaceCreated() {
-        Loggers.d("BaseGLCanvasTextureView", "onSurfaceCreated: ");
+        Loggers.d(TAG, "onSurfaceCreated: ");
         mCanvas = new CanvasGL();
     }
 
@@ -63,6 +63,14 @@ public void onDrawFrame() {
         onGLDraw(mCanvas);
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mCanvas != null) {
+            mCanvas.pause();
+        }
+    }
+
     protected abstract void onGLDraw(ICanvasGL canvas);
 
 

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLTextureView.java

@@ -80,7 +80,7 @@ public BaseGLTextureView(Context context, AttributeSet attrs, int defStyleAttr)
     // TODO: 2018/3/25 This may be duplicated. onSurfaceTextureSizeChanged is doing same thing.
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        Loggers.d("BaseGLTextureView", "onSizeChanged: ");
+        Loggers.d(TAG, "onSizeChanged: ");
         super.onSizeChanged(w, h, oldw, oldh);
         if (mGLThread != null) {
             mGLThread.onWindowResize(w, h);
@@ -153,7 +153,7 @@ protected void surfaceRedrawNeeded() {
 
     @Override
     protected void onDetachedFromWindow() {
-        Loggers.d("BaseGLTextureView", "onDetachedFromWindow: ");
+        Loggers.d(TAG, "onDetachedFromWindow: ");
         if (mGLThread != null) {
             mGLThread.requestExitAndWait();
         }
@@ -208,7 +208,7 @@ public void setRenderer(GLViewRenderer renderer) {
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        Loggers.d("BaseGLTextureView", "onSurfaceTextureAvailable: ");
+        Loggers.d(TAG, "onSurfaceTextureAvailable: ");
         surfaceAvailable = true;
         glThreadBuilder = new GLThread.Builder();
         if (mGLThread == null) {
@@ -229,7 +229,7 @@ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int hei
     }
 
     protected void createGLThread() {
-        Loggers.d("BaseGLTextureView", "createGLThread: ");
+        Loggers.d(TAG, "createGLThread: ");
         hasCreateGLThreadCalledOnce = true;
         if (!surfaceAvailable) {
             return;
@@ -267,7 +267,7 @@ private void freshSurface(int width, int height) {
 
     @Override
     public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        Loggers.d("BaseGLTextureView", "onSurfaceTextureSizeChanged: ");
+        Loggers.d(TAG, "onSurfaceTextureSizeChanged: ");
         surfaceChanged(width, height);
         surfaceRedrawNeeded();
         if (surfaceTextureListener != null) {
@@ -280,7 +280,7 @@ public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int h
      */
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        Loggers.d("BaseGLTextureView", "onSurfaceTextureDestroyed: ");
+        Loggers.d(TAG, "onSurfaceTextureDestroyed: ");
         surfaceDestroyed();
         if (surfaceTextureListener != null) {
             surfaceTextureListener.onSurfaceTextureDestroyed(surface);