diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java index da11521e..8d173119 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java @@ -60,7 +60,7 @@ public abstract class Filter { int mPreviewingViewWidth = 0; int mPreviewingViewHeight = 0; - public void setPreviewingViewSize(int width, int height) { + public void setOutputSize(int width, int height) { mPreviewingViewWidth = width; mPreviewingViewHeight = height; } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java index 19e5456d..a1fa2eaf 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java @@ -112,27 +112,12 @@ public class EglViewport extends EglElement { mFilterChanged = true; } - - public void drawFrame(int textureId, float[] textureMatrix) { drawFrame(textureId, textureMatrix, mVertexCoordinatesArray, mTextureCoordinatesArray); } - /** - * The issue with the CIRCLE shader is that if the textureMatrix has a scale value, - * it fails miserably, not taking the scale into account. - * So what we can do here is - * - * - read textureMatrix scaleX and scaleY values. This is pretty much impossible to do from the matrix itself - * without making risky assumptions over the order of operations. - * https://www.opengl.org/discussion_boards/showthread.php/159215-Is-it-possible-to-extract-rotation-translation-scale-given-a-matrix - * So we prefer passing scaleX and scaleY here to the draw function. - * - pass these values to the vertex shader - * - pass them to the fragment shader - * - in the fragment shader, take this scale value into account - */ private void drawFrame(int textureId, float[] textureMatrix, FloatBuffer vertexBuffer, FloatBuffer texBuffer) { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java index f95e2cfc..834b0d0b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java @@ -13,7 +13,7 @@ import com.otaliastudios.cameraview.filters.Filter; /** * A preview that support GL filters defined through the {@link Filter} interface. * - * The preview has the responsibility of calling {@link Filter#setPreviewingViewSize(int, int)} + * The preview has the responsibility of calling {@link Filter#setOutputSize(int, int)} * whenever the preview size changes and as soon as the filter is applied. */ public abstract class FilterCameraPreview extends CameraPreview { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java index f371028d..4b3b5ce0 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java @@ -171,7 +171,7 @@ public class GlCameraPreview extends FilterCameraPreview