Updated textTextRenderer 3 views each and write to tga file

3 files changed, 27 insertions, 13 deletions

diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java
index f894f4142..1b2dd7e17 100644
--- a/src/demo/GPUTextGLListenerBase01.java
+++ b/src/demo/GPUTextGLListenerBase01.java
@@ -71,7 +71,8 @@ public abstract class GPUTextGLListenerBase01 implements GLEventListener {
     static final String text2;
 
     static {
-        text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz\n0123456789";
+    	//text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz\n0123456789";
+        text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz\n#$!%-+=";
         text2 = text1.toUpperCase();        
     }
 
@@ -183,7 +184,7 @@ public abstract class GPUTextGLListenerBase01 implements GLEventListener {
     }
     
     public void printScreen(GLWindow window, String dir, String tech, boolean exportAlpha) throws GLException, IOException{
-    	String filename = dir + tech + "-" + window.getWidth()+ "x" + window.getHeight() + "-" + texSize+ ".tga";
+    	String filename = dir + tech + "-" + window.getWidth()+ "x" + window.getHeight() + "-T" + texSize + "-Z" + Math.abs(zoom) +".tga";
     	Screenshot.writeToTargaFile(new File(filename), window.getWidth(), window.getHeight(), exportAlpha);
     }
     
diff --git a/src/demo/GPUTextNewtDemo01.java b/src/demo/GPUTextNewtDemo01.java
index 362627e56..7bad55aa5 100644
--- a/src/demo/GPUTextNewtDemo01.java
+++ b/src/demo/GPUTextNewtDemo01.java
@@ -69,7 +69,6 @@ public class GPUTextNewtDemo01 {
 
 		window.setVisible(true);
 		FPSAnimator animator = new FPSAnimator(10);
-		// Animator animator = new Animator();
 		animator.add(window);
 		animator.start();
 	}
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java
index 0d48206f9..a0b04d69a 100755
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestHwTextRenderer01.java
@@ -69,7 +69,14 @@ public class TestHwTextRenderer01 {
 		}

 		

 		textGLListener.resetPrinting();

-		textGLListener.setTech(-111, 74, 0, -380, 900);

+		textGLListener.setTech(-111, 74, 0, -380, 1100);

+		Thread.sleep(100);

+		while(!textGLListener.isPrinted()){

+			Thread.sleep(100);

+		}

+		

+		textGLListener.resetPrinting();

+		textGLListener.setTech(-111, 74, 0, -80, 2500);

 		Thread.sleep(100);

 		while(!textGLListener.isPrinted()){

 			Thread.sleep(100);

@@ -81,15 +88,15 @@ public class TestHwTextRenderer01 {
 		Thread.sleep(1000);

 	}

 	

-	//@Test

+	@Test

 	public void testTextRendererMSAA01() throws InterruptedException {

 		GLProfile glp = GLProfile.get(GLProfile.GL2ES2);

 		GLCapabilities caps = new GLCapabilities(glp);

-		//caps.setAlphaBits(4);	

+		caps.setAlphaBits(4);	

 		caps.setSampleBuffers(true);

 		caps.setNumSamples(4);

 

-		GLWindow window = createWindow("r2t0msaa1", caps, 400,0);

+		GLWindow window = createWindow("r2t0msaa1", caps, 400, 400);

 		TextGLListener textGLListener = new TextGLListener(Region.SINGLE_PASS);

 		textGLListener.setTech(-10, 10, 0f, -1000, 0);

 		textGLListener.attachTo(window);

@@ -102,12 +109,19 @@ public class TestHwTextRenderer01 {
 			Thread.sleep(100);

 		}

 		

-		//textGLListener.resetPrinting();

-		//textGLListener.setTech(-111, 74, 0, -380, 0);

-		//Thread.sleep(100);

-		//while(!textGLListener.isPrinted()){

-		//	Thread.sleep(100);

-		//}

+		textGLListener.resetPrinting();

+		textGLListener.setTech(-111, 74, 0, -380, 0);

+		Thread.sleep(100);

+		while(!textGLListener.isPrinted()){

+			Thread.sleep(100);

+		}

+		

+		textGLListener.resetPrinting();

+		textGLListener.setTech(-111, 74, 0, -80, 0);

+		Thread.sleep(100);

+		while(!textGLListener.isPrinted()){

+			Thread.sleep(100);

+		}

 		

 		animator.stop();

 		destroyWindow(window);