Merge branch 'testing'

Author: omerjerk

README.md

@@ -5,6 +5,4 @@ We cannot directly render to processing's own texture because it's bound `GL_TEX
 
 **Behind the hood :**
 
-I create a framebuffer object and a custom texture object, which is bound to target `GL_TEXTURE_2D`, and attach this texture to the previously created framebuffer at `GL_COLOR_ATTACHMENT0`. I then render SurfaceTexture's shader output to this framebuffer and it atomatically gets rendered upon the custom texture I created. I then call `glReadPixels` and assign these read pixels to `PImage`'s pixel array.
-
-For an alternative approach, please head over to pixel_manipulation branch.
+I create a framebuffer object and a custom texture object, which is bound to target `GL_TEXTURE_2D`, and attach this texture to the previously created framebuffer at `GL_COLOR_ATTACHMENT0`. I then render SurfaceTexture's shader output to this framebuffer and it atomatically gets rendered upon the custom texture I created. I then follow the approach as being done in the Syphon library - https://github.com/Syphon/Processing/blob/master/Processing_2_0/src/codeanticode/syphon/SyphonClient.java#L271

src/in/omerjerk/processing/video/android/Capture.java

@@ -17,6 +17,7 @@
 import processing.core.PConstants;
 import processing.core.PApplet;
 import processing.core.PImage;
+import processing.opengl.PGL;
 import processing.opengl.PGraphicsOpenGL;
 import processing.opengl.Texture;
 
@@ -48,14 +49,18 @@ public static void log(String log) {
 	private int mTextureId;
 	private final float[] mSTMatrix = new float[16];
 
-	private Texture customTexture;
+//	private Texture customTexture;
 	private PGraphicsOpenGL pg;
 	private IntBuffer pixelBuffer;
+	
+	private PGraphicsOpenGL destpg;
+	PGL pgl;
 
 	private CameraHandler mCameraHandler;
 
 	IntBuffer frameBuffers = IntBuffer.allocate(1);
 	IntBuffer renderBuffers = IntBuffer.allocate(1);
+	IntBuffer customTexture = IntBuffer.allocate(1);
 
 	public Capture(PApplet context) {
 		this(context, -1, -1);
@@ -77,10 +82,10 @@ public Capture(final PApplet applet, int width, int height) {
 		applet.registerMethod("resume", this);
 		glView = (GLSurfaceView) applet.getSurfaceView();
 		pg = (PGraphicsOpenGL)applet.g;
-		customTexture = new Texture(pg, width, height);
-		customTexture.invertedY(true);
-		log("cusotm texture address = " + customTexture.glName);
-		pg.setCache(this, customTexture);
+//		customTexture = new Texture(pg, width, height);
+//		customTexture.invertedY(true);
+		log("cusotm texture address = " + customTexture);
+//		pg.setCache(this, customTexture);
 		applet.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
@@ -289,11 +294,14 @@ public void run() {
 				surfaceTexture.getTransformMatrix(mSTMatrix);
 				mFullScreen.drawFrame(mTextureId, mSTMatrix);
 
+				getImage(false);
+
+				/*
 				pixelBuffer.position(0);
 				GLES20.glReadPixels(0, 0, width, height, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, pixelBuffer);
 				pixelBuffer.position(0);
 				pixelBuffer.get(Capture.this.pixels);
-				updatePixels();
+				updatePixels(); */
 
 				//Fall back to default frame buffer
 				GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
@@ -326,19 +334,22 @@ public void prepareFrameBuffers() {
 		GLES20.glFramebufferRenderbuffer(GLES20.GL_FRAMEBUFFER, GLES20.GL_DEPTH_ATTACHMENT,
                 GLES20.GL_RENDERBUFFER, renderBuffers.get(0));
 		GlUtil.checkGlError("glFramebufferRenderbuffer");
+		
+		GLES20.glGenTextures(1, customTexture);
+		GlUtil.checkGlError("glGenTextures");
 
-		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, customTexture.glName);
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, customTexture.get(0));
 		GlUtil.checkGlError("glBindTexture");
-		/*
+		
 		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
 		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
 		GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
-		GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);*/
+		GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
 		GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, width, height, 0, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
 		GlUtil.checkGlError("glTexImage2D");
 
 		GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
-                GLES20.GL_TEXTURE_2D, customTexture.glName, 0);
+                GLES20.GL_TEXTURE_2D, customTexture.get(0), 0);
 		GlUtil.checkGlError("glFramebufferTexture2D");
 
 		/*
@@ -354,4 +365,29 @@ public void prepareFrameBuffers() {
             throw new RuntimeException("Framebuffer not complete, status=" + status);
         }
 	}
+	
+	public void getImage(boolean loadPixels) {
+        
+	    if (destpg == null || destpg.width != width || destpg.height != height) {
+	    	    destpg = (PGraphicsOpenGL) parent.createGraphics(width, height, PConstants.P2D);
+	    	    destpg.pgl.setGlThread(Thread.currentThread());
+	    }
+	    
+	    destpg.beginDraw();
+	    destpg.background(0, 0);
+	    PGL pgl = destpg.beginPGL();
+	    pgl.drawTexture(PGL.TEXTURE_2D, customTexture.get(0), width, height,
+	                    0, 0, width, height);
+	    destpg.endPGL();
+	    destpg.endDraw();
+
+	    // Uses the PGraphics texture as the cache object for the image
+	    Texture tex = destpg.getTexture();
+	    pg.setCache(this, tex);
+	    if (loadPixels) {
+	      this.loadPixels();
+	      tex.get(this.pixels);
+	      this.setLoaded(false);
+	    }
+	}
 }