Merge pull request ClearVolume#5 from ClearVolume/develop

skalarproduktraum · skalarproduktraum · commit 5693824f6dff · 2015-06-12T15:21:37.000+02:00
Fix video recording in ClearGL
diff --git a/src/java/cleargl/util/recorder/GLVideoRecorder.java b/src/java/cleargl/util/recorder/GLVideoRecorder.java
@@ -328,7 +328,6 @@ private void writeDrawableToFile(	GLAutoDrawable pDrawable,
 
 				final GL lGL = pDrawable.getGL();
 
-				lGL.getGL3().glReadBuffer(GL.GL_BACK);
 				lGL.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);
 				lGL.glReadPixels(0, // GLint x
 													0, // GLint y
@@ -361,9 +360,6 @@ public void run()
 
 						}
 					});
-
-					mImageCounter++;
-					// System.out.println("saved image!");
 				}
 			}
 
@@ -460,6 +456,7 @@ private void writeBufferToFile(	File pOutputFile,
 														pWidth);
 
 			ImageIO.write(lBufferedImage, "PNG", pOutputFile);
+			mImageCounter++;
 		}
 		catch (final Throwable e)
 		{

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,6 @@ private void writeDrawableToFile( GLAutoDrawable pDrawable,`
`328`	`328`
`329`	`329`	`final GL lGL = pDrawable.getGL();`
`330`	`330`
`331`		`- lGL.getGL3().glReadBuffer(GL.GL_BACK);`
`332`	`331`	`lGL.glPixelStorei(GL.GL_PACK_ALIGNMENT, 1);`
`333`	`332`	`lGL.glReadPixels(0, // GLint x`
`334`	`333`	`0, // GLint y`
`@@ -361,9 +360,6 @@ public void run()`
`361`	`360`
`362`	`361`	`}`
`363`	`362`	`});`
`364`		`-`
`365`		`- mImageCounter++;`
`366`		`- // System.out.println("saved image!");`
`367`	`363`	`}`
`368`	`364`	`}`
`369`	`365`
`@@ -460,6 +456,7 @@ private void writeBufferToFile( File pOutputFile,`
`460`	`456`	`pWidth);`
`461`	`457`
`462`	`458`	`ImageIO.write(lBufferedImage, "PNG", pOutputFile);`
	`459`	`+ mImageCounter++;`
`463`	`460`	`}`
`464`	`461`	`catch (final Throwable e)`
`465`	`462`	`{`