Common demo gllistener for text; Cleanup HwTextRenderer: Use GL as parameter (matching API), only update data if necessary (uniform), hold data in GLUniform

8 files changed, 431 insertions, 402 deletions

diff --git a/src/com/jogamp/graph/curve/OutlineShape.java b/src/com/jogamp/graph/curve/OutlineShape.java
index b48804b4d..d7b941282 100755
--- a/src/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/com/jogamp/graph/curve/OutlineShape.java
@@ -36,7 +36,6 @@ import com.jogamp.graph.geom.Outline;
 import com.jogamp.graph.geom.Line;

 import com.jogamp.graph.geom.Triangle;

 import com.jogamp.graph.geom.Vertex;

-import com.jogamp.graph.geom.Vertex;

 

 import com.jogamp.graph.curve.tess.CDTriangulator2D;

 

diff --git a/src/com/jogamp/graph/curve/text/HwTextRenderer.java b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
index bbe62f158..b16d2e6fd 100644
--- a/src/com/jogamp/graph/curve/text/HwTextRenderer.java
+++ b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
@@ -32,8 +32,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 
 import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLContext;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLUniformData;
 import javax.media.opengl.fixedfunc.GLMatrixFunc;
@@ -82,37 +80,38 @@ public class HwTextRenderer {
 		return fontFactory;
 	}
 	
-	private ShaderState st;
+	private ShaderState st = new ShaderState();
+	
 	private PMVMatrix pmvMatrix = new PMVMatrix();
+	private GLUniformData mgl_PMVMatrix;
 	
 	/**Sharpness is equivalent to the value of t value of texture coord
 	 * on the off-curve vertex. The high value of sharpness will 
 	 * result in high curvature.
 	 */
-	private float sharpness = 0.5f;
-	private float alpha = 1.0f;
-	private float strength = 1.8f;
-	private boolean initialized = false;
-	
+    private GLUniformData mgl_sharpness = new GLUniformData("p1y", 0.5f);
+    private GLUniformData mgl_alpha = new GLUniformData("g_alpha", 1.0f);
+    private GLUniformData mgl_color = new GLUniformData("g_color", 3, FloatBuffer.allocate(3));
+    private GLUniformData mgl_strength = new GLUniformData("a_strength", 1.8f);
+    	
+	private boolean initialized = false;	
 	
 	private int regionType = Region.SINGLE_PASS;
-	private GLContext context;
-	private FloatBuffer color = FloatBuffer.allocate(3);
+	
 	private HashMap<String, GlyphString> strings = new HashMap<String, GlyphString>();
 	private final Vertex.Factory<? extends Vertex> pointFactory;
 	
 	int win_width = 0;
 	int win_height = 0;
 	
-	/** Create a Hardware accelerated Text Renderer
+	/** 
+	 * Create a Hardware accelerated Text Renderer.
 	 * @param context OpenGL rendering context
 	 * @param factory optional Point.Factory for Vertex construction. Default is Vertex.Factory.
 	 */
-	public HwTextRenderer(GLContext context, Vertex.Factory<? extends Vertex> factory, int type) {
+	public HwTextRenderer(Vertex.Factory<? extends Vertex> factory, int type) {
 		this.pointFactory = (null != factory) ? factory : SVertex.factory();
-		this.context = context;
 		this.regionType = type;
-		init(context, 0.5f);
 	}
 
     public Font createFont(Vertex.Factory<? extends Vertex> factory, String name, int size) {
@@ -129,22 +128,22 @@ public class HwTextRenderer {
     	return fontFactory.createFont(factory, families, style, variant, weight, size);
     }
 	
-	/** initialize shaders and bindings for GPU based text Rendering, should 
-	 * be called only onceangle
+	/** 
+	 * Initialize shaders and bindings for GPU based text Rendering, 
+	 * should be called only once.
+	 * Leaves the renderer enables, ie ShaderState on.
+	 *  
 	 * @param drawable the current drawable
 	 * @param shapvalue shaprness around the off-curve vertices
 	 * @return true if init succeeded, false otherwise
 	 */
-	private boolean init(GLContext context, float sharpvalue){
+	public boolean init(GL2ES2 gl){
 		if(initialized){
 			if(DEBUG) {
 				System.err.println("HWTextRenderer: Already initialized!");
 			}
 			return true;
 		}
-		sharpness = sharpvalue;
-		
-		GL2ES2 gl = context.getGL().getGL2ES2();
 		
 		boolean VBOsupported = gl.isFunctionAvailable("glGenBuffers") &&
 			gl.isFunctionAvailable("glBindBuffer") &&
@@ -161,12 +160,25 @@ public class HwTextRenderer {
 			return false;
 		}
 		
-		gl.setSwapInterval(1);
-		
 		gl.glEnable(GL2ES2.GL_BLEND);
 		gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA);
 		
-		initShader(gl);
+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, HwTextRenderer.class,
+                "../shader", "../shader/bin", "curverenderer");
+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, HwTextRenderer.class,
+                "../shader", "../shader/bin", "curverenderer");
+
+        ShaderProgram sp = new ShaderProgram();
+        sp.add(rsVp);
+        sp.add(rsFp);
+
+        if(!sp.link(gl, System.err)) {
+            throw new GLException("HWTextRenderer: Couldn't link program: "+sp);
+        }
+
+        st.attachShaderProgram(gl, sp);
+        gl.glBindAttribLocation(sp.id(), 0, "v_position");
+        gl.glBindAttribLocation(sp.id(), 1, "texCoord");
 		
 		st.glUseProgram(gl, true);
 
@@ -177,38 +189,41 @@ public class HwTextRenderer {
 		
 		pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
 		pmvMatrix.glLoadIdentity();
-		resetMatrix();
-
-		if(!st.glUniform(gl, new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf()))) {
+		resetMatrix(null);
+		
+		mgl_PMVMatrix = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf());		    		
+		if(!st.glUniform(gl, mgl_PMVMatrix)) {
 			if(DEBUG){
 				System.err.println("Error setting PMVMatrix in shader: "+st);
 			}
 			return false;
 		}
-		if(!st.glUniform(gl, new GLUniformData("p1y", sharpness))) {
+		
+		if(!st.glUniform(gl, mgl_sharpness)) {
 			if(DEBUG){
 				System.err.println("Error setting sharpness in shader: "+st);
 			}
 			return false;
 		}
-		if(!st.glUniform(gl, new GLUniformData("g_alpha", alpha))) {
+				
+		if(!st.glUniform(gl, mgl_alpha)) {
 			if(DEBUG){
 				System.err.println("Error setting global alpha in shader: "+st);
 			}
 			return false;
-		}
-		if(!st.glUniform(gl, new GLUniformData("g_color", 3, color))) {
+		}		
+		
+		if(!st.glUniform(gl, mgl_color)) {
 			if(DEBUG){
 				System.err.println("Error setting global color in shader: "+st);
 			}
 			return false;
-		}
-		if(!st.glUniform(gl, new GLUniformData("a_strength", strength))) {
+		}		
+		
+		if(!st.glUniform(gl, mgl_strength)) {
 			System.err.println("Error setting antialias strength in shader: "+st);
 		}
 		
-		st.glUseProgram(gl, false);
-		
 		if(DEBUG) {
 			System.err.println("HWTextRenderer initialized: " + Thread.currentThread()+" "+st);
 		}
@@ -216,41 +231,75 @@ public class HwTextRenderer {
 		return true;
 	}
 	
+	public void dispose(GL2ES2 gl) {
+	    st.destroy(gl);
+	    clearCached();
+	}
+	
 	public float getAlpha() {
-		return alpha;
+		return mgl_alpha.floatValue();
 	}
-	public void setAlpha(float alpha_t) {
-		alpha = alpha_t;
+	
+	public ShaderState getShaderState() {
+	    return st;
 	}
 	
-	public void setColor(float r, float g, float b){
-		color.put(r);
-		color.put(g);
-		color.put(b);
-		color.rewind();
+	public void setAlpha(GL2ES2 gl, float alpha_t) {
+	    mgl_alpha.setData(alpha_t);
+	    if(null != gl && st.inUse()) {
+	        st.glUniform(gl, mgl_alpha);
+	    }
 	}
 	
-	public void rotate(float angle, float x, float y, float z){
+	public void setColor(GL2ES2 gl, float r, float g, float b){
+	    FloatBuffer fb = (FloatBuffer) mgl_color.getBuffer();
+	    fb.put(0, r);
+	    fb.put(1, r);
+	    fb.put(2, r);
+	    if(null != gl && st.inUse()) {
+	        st.glUniform(gl, mgl_color);
+	    }
+	}
+	
+	public void rotate(GL2ES2 gl, float angle, float x, float y, float z){
 		pmvMatrix.glRotatef(angle, x, y, z);
+		if(null != gl && st.inUse()) {
+		    st.glUniform(gl, mgl_PMVMatrix);
+		}
 	}
-	public void translate(float x, float y, float z){
+	public void translate(GL2ES2 gl, float x, float y, float z){
 		pmvMatrix.glTranslatef(x, y, z);
+		if(null != gl && st.inUse()) {
+		    st.glUniform(gl, mgl_PMVMatrix);
+		}
 	}
 	
-	public  void resetMatrix(){
+	public  void resetMatrix(GL2ES2 gl){
 		pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
 		pmvMatrix.glLoadIdentity();
+		if(null != gl && st.inUse()) {
+		    st.glUniform(gl, mgl_PMVMatrix);
+		}
 	}
 	
+    public  void updateAllShaderValues(GL2ES2 gl) {
+        if(null != gl && st.inUse()) {
+            st.glUniform(gl, mgl_PMVMatrix);
+            st.glUniform(gl, mgl_alpha);
+            st.glUniform(gl, mgl_color);
+            st.glUniform(gl, mgl_strength);
+        }
+    }
+    
 	/**
-	 * @param drawable
+	 * @param gl
 	 * @param angle
 	 * @param ratio
 	 * @param near
 	 * @param far
 	 * @return
 	 */
-	public boolean reshape(GLAutoDrawable drawable, float angle, int width, int height, float near, float far){
+	public boolean reshape(GL2ES2 gl, float angle, int width, int height, float near, float far){
 		win_width = width;
 		win_height = height;
 		float ratio = (float)width/(float)height;
@@ -258,44 +307,12 @@ public class HwTextRenderer {
 		pmvMatrix.glLoadIdentity();
 		pmvMatrix.gluPerspective(angle, ratio, near, far);
 		
-		if(null==st) {
-			if(DEBUG){
-				System.err.println("HWTextRenderer: Shader State is null, or not");
-			}
-			return false;
-		}
-		GL2ES2 gl = drawable.getGL().getGL2ES2();
-
-		st.glUseProgram(gl, true);
-		GLUniformData ud = st.getUniform("mgl_PMVMatrix");
-		if(null!=ud) {
-			st.glUniform(gl, ud);
-		} 
-		st.glUseProgram(gl, false);
+		st.glUniform(gl, mgl_PMVMatrix);
+		
 		return true;
 	}
 
-	private void initShader(GL2ES2 gl) {
-		ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, HwTextRenderer.class,
-				"../shader", "../shader/bin", "curverenderer");
-		ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, HwTextRenderer.class,
-				"../shader", "../shader/bin", "curverenderer");
-
-		ShaderProgram sp = new ShaderProgram();
-		sp.add(rsVp);
-		sp.add(rsFp);
-
-		if(!sp.link(gl, System.err)) {
-			throw new GLException("HWTextRenderer: Couldn't link program: "+sp);
-		}
-
-		st = new ShaderState();
-		st.attachShaderProgram(gl, sp);
-		gl.glBindAttribLocation(sp.id(), 0, "v_position");
-		gl.glBindAttribLocation(sp.id(), 1, "texCoord");
-	}
-	
-	private GlyphString createString(Font font, String str) {
+	private GlyphString createString(GL2ES2 gl, Font font, String str) {
 		AffineTransform affineTransform = new AffineTransform(pointFactory);
 		
 		Path2D[] paths = new Path2D[str.length()];
@@ -304,11 +321,17 @@ public class HwTextRenderer {
 		GlyphString glyphString = new GlyphString(pointFactory, font.getName(), str);
 		glyphString.createfromFontPath(paths, affineTransform);
 		
-		glyphString.generateRegion(context, sharpness, st, regionType);
+		glyphString.generateRegion(gl.getContext(), mgl_sharpness.floatValue(), st, regionType);
 		return glyphString;
 	}
 	
 	
+	public void enable(GL2ES2 gl, boolean enable) {
+	    if(null != gl) {
+	        st.glUseProgram(gl, enable);
+	    }
+	}
+	
 	/** Render the String in 3D space wrt to the font provided at the position provided
 	 * the outlines will be generated, if not yet generated
 	 * @param font font to be used
@@ -317,36 +340,18 @@ public class HwTextRenderer {
 	 * @param size texture size for multipass render
 	 * @throws Exception if TextRenderer not initialized
 	 */
-	public void renderString3D(Font font, String str, float[] position, int size) throws Exception{
+	public void renderString3D(GL2ES2 gl, Font font, String str, float[] position, int size) {
 		if(!initialized){
-			throw new Exception("HWTextRenderer: not initialized!");
+			throw new GLException("HWTextRenderer: not initialized!");
 		}
 		String fontStrHash = getTextHashCode(font, str);
 		GlyphString glyphString = strings.get(fontStrHash);
 		if(null == glyphString) {
-			glyphString = createString(font, str);
+			glyphString = createString(gl, font, str);
 			strings.put(fontStrHash, glyphString);
 		}
 		
-		GL2ES2 gl = context.getGL().getGL2ES2();
-		st.glUseProgram(gl, true);
-		GLUniformData ud = st.getUniform("mgl_PMVMatrix");
-		if(null!=ud) {
-			st.glUniform(gl, ud);
-		} 
-		if(!st.glUniform(gl, new GLUniformData("g_alpha", alpha))) {
-			System.err.println("Error setting global alpha in shader: "+st);
-		}	
-		GLUniformData gcolorUD = st.getUniform("g_color");
-		if(null!=gcolorUD) {
-			st.glUniform(gl, gcolorUD);
-		} 
-		
-		if(!st.glUniform(gl, new GLUniformData("a_strength", strength))) {
-			System.err.println("Error setting antialias strength in shader: "+st);
-		}	
 		glyphString.renderString3D(pmvMatrix, win_width, win_height, size);
-		st.glUseProgram(gl, false);
 	}
 	
 	private String getTextHashCode(Font font, String str){
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java
index 7de9efa43..f9d7bb944 100755
--- a/src/demo/GPURegionNewtDemo02.java
+++ b/src/demo/GPURegionNewtDemo02.java
@@ -37,7 +37,6 @@ import javax.media.opengl.GLProfile;
 
 import com.jogamp.graph.curve.HwRegionRenderer;
 import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.curve.Region;
 import com.jogamp.graph.geom.opengl.SVertex;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.KeyListener;
diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java
new file mode 100644
index 000000000..afdec1220
--- /dev/null
+++ b/src/demo/GPUTextGLListenerBase01.java
@@ -0,0 +1,223 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package demo;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLPipelineFactory;
+
+import com.jogamp.graph.curve.text.HwTextRenderer;
+import com.jogamp.graph.font.Font;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.newt.event.KeyEvent;
+import com.jogamp.newt.event.KeyListener;
+import com.jogamp.newt.opengl.GLWindow;
+
+public abstract class GPUTextGLListenerBase01 implements GLEventListener {
+    Vertex.Factory<? extends Vertex> vfactory;
+    HwTextRenderer textRenderer;    
+    KeyAction keyAction;
+    
+    boolean fontUpdate = true;
+    int fontSize = 40;
+    final int fontSizeModulo = 100;    
+    Font font;
+    
+    final float[] position = new float[] {0,0,0};
+    
+    float xTran = -10;
+    float yTran =  10;    
+    float ang = 0f;
+    float zoom = -70f;
+    // float zoom = -1000f;
+    int texSize = 400; // FBO/tex size ..
+
+    boolean doMatrix = true;
+    boolean debug;
+    boolean trace;
+    static final String text1;
+    static final String text2;
+
+    static {
+        text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz"; // \n0123456789";
+        text2 = text1.toUpperCase();        
+    }
+
+    public GPUTextGLListenerBase01(Vertex.Factory<? extends Vertex> vfactory, int mode, boolean debug, boolean trace) {
+        this.textRenderer = new HwTextRenderer(vfactory, mode);
+        this.vfactory = vfactory;
+        this.debug = debug;
+        this.trace = trace;
+    }
+
+    public void setMatrix(float xtrans, float ytrans, float angle, int zoom, int fbosize) {
+        this.xTran = xtrans;
+        this.yTran = ytrans; 
+        this.ang = angle;  
+        this.zoom = zoom;
+        this.texSize = fbosize;        
+    }
+    
+    public void init(GLAutoDrawable drawable) {
+        GL2ES2 gl = drawable.getGL().getGL2ES2();
+        
+        if(debug) {
+            gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, gl, null) ).getGL2ES2();
+        }
+        if(trace) {
+            gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2();
+        }
+        gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+    }
+    
+    public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height) {
+        GL2ES2 gl = drawable.getGL().getGL2ES2();
+        
+        gl.glViewport(xstart, ystart, width, height);
+        textRenderer.reshape(gl, 45.0f, width, height, 0.1f, 7000.0f);
+        
+        dumpMatrix();
+    }
+    
+    public void display(GLAutoDrawable drawable) {
+        GL2ES2 gl = drawable.getGL().getGL2ES2();
+        
+        gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f); // Demo02 needs to have this set here as well .. hmm ?
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+
+        if(doMatrix) {
+            textRenderer.resetMatrix(gl);
+            textRenderer.translate(gl, xTran, yTran, zoom);
+            textRenderer.rotate(gl, ang, 0, 1, 0);
+            doMatrix = false;
+        }
+
+        if(fontUpdate) {
+            font = textRenderer.createFont(vfactory, "Lucida Sans Regular", fontSize);
+            fontUpdate = false;
+        }
+        textRenderer.renderString3D(gl, font, text2, position, texSize);
+    }        
+        
+    public void dispose(GLAutoDrawable drawable) {
+        GL2ES2 gl = drawable.getGL().getGL2ES2();
+        textRenderer.dispose(gl);
+    }    
+    
+    public void fontIncr(int v) {
+        fontSize = Math.abs((fontSize + v) % fontSizeModulo) ;
+        fontUpdate = true;
+        dumpMatrix();
+    }
+
+    public void zoom(int v){
+        zoom += v;
+        doMatrix = true;
+        dumpMatrix();
+    }
+    
+    public void move(float x, float y){
+        xTran += x;
+        yTran += y;
+        doMatrix = true;
+        dumpMatrix();
+    }
+    public void rotate(float delta){
+        ang += delta;
+        ang %= 360.0f;
+        doMatrix = true;
+        dumpMatrix();
+    }
+    
+    void dumpMatrix() {
+        System.err.println("Matrix: " + xTran + "/" + yTran + " x"+zoom + " @"+ang +" fontSize "+fontSize);
+    }
+    
+    public void attachTo(GLWindow window) {
+        if ( null == keyAction ) {
+            keyAction = new KeyAction();
+        }
+        window.addGLEventListener(this);
+        window.addKeyListener(keyAction);        
+    }
+    
+    public void detachFrom(GLWindow window) {
+        if ( null == keyAction ) {
+            return;
+        }
+        window.removeGLEventListener(this);
+        window.removeKeyListener(keyAction);
+    }
+    
+    public class KeyAction implements KeyListener {
+        public void keyPressed(KeyEvent arg0) {
+            if(arg0.getKeyCode() == KeyEvent.VK_1){
+                zoom(10);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_2){
+                zoom(-10);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_3){
+                fontIncr(10);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_4){
+                fontIncr(-10);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_UP){
+                move(0, -1);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){
+                move(0, 1);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){
+                move(1, 0);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){
+                move(-1, 0);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_6){
+                texSize -= 10;
+                System.err.println("Tex Size: " + texSize);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_7){
+                texSize += 10;
+                System.err.println("Tex Size: " + texSize);
+            }            
+            else if(arg0.getKeyCode() == KeyEvent.VK_0){
+                rotate(1);
+            }
+            else if(arg0.getKeyCode() == KeyEvent.VK_9){
+                rotate(-1);
+            }                           
+        }
+        public void keyTyped(KeyEvent arg0) {}
+        public void keyReleased(KeyEvent arg0) {}
+    }
+}
\ No newline at end of file
diff --git a/src/demo/GPUTextNewtDemo01.java b/src/demo/GPUTextNewtDemo01.java
index 25c40b433..ad1020122 100644
--- a/src/demo/GPUTextNewtDemo01.java
+++ b/src/demo/GPUTextNewtDemo01.java
@@ -27,44 +27,28 @@
  */
 package demo;
 
-import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GL2GL3;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.curve.text.HwTextRenderer;
-import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.opengl.SVertex;
-import com.jogamp.newt.event.KeyEvent;
-import com.jogamp.newt.event.KeyListener;
-import com.jogamp.newt.event.WindowAdapter;
-import com.jogamp.newt.event.WindowEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.FPSAnimator;
 
 public class GPUTextNewtDemo01 {
-	private static void create(){
-		new TextNewtWindow1();
-	}
+    static final boolean DEBUG = false;
+    static final boolean TRACE = false;
+    
 	public static void main(String[] args) {
-		create();
+	    GPUTextNewtDemo01 test = new GPUTextNewtDemo01();
+	    test.testMe();
 	}
-}
-
-class TextNewtWindow1 {
-	Vertex.Factory<SVertex> pointFactory = SVertex.factory();
 	
 	TextGLListener textGLListener = null; 
 
-	public TextNewtWindow1(){
-		createWindow();
-	}
-	private void createWindow() {
+	public void testMe() {
 		GLProfile.initSingleton(true);
 		GLProfile glp = GLProfile.getGL2ES2();
 		GLCapabilities caps = new GLCapabilities(glp);
@@ -80,120 +64,36 @@ class TextNewtWindow1 {
 
 		window.setTitle("GPU Text Newt Demo 01 - r2t0 msaa1");
 		textGLListener = new TextGLListener();
-		window.addGLEventListener(textGLListener);
+		textGLListener.attachTo(window);
 
 		window.setVisible(true);
-
-		window.addKeyListener(new KeyListener() {
-			public void keyPressed(KeyEvent arg0) {
-				if(arg0.getKeyCode() == KeyEvent.VK_1){
-					textGLListener.zoomIn();
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_2){
-					textGLListener.zoomOut();
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_UP){
-					textGLListener.move(0, -1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){
-					textGLListener.move(0, 1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){
-					textGLListener.move(1, 0);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){
-					textGLListener.move(-1, 0);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_0){
-					textGLListener.rotate(1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_9){
-					textGLListener.rotate(-1);
-				}
-			}
-			public void keyTyped(KeyEvent arg0) {}
-			public void keyReleased(KeyEvent arg0) {}
-		});
-
-		FPSAnimator animator = new FPSAnimator(60);
+		FPSAnimator animator = new FPSAnimator(10);
+		// Animator animator = new Animator();
 		animator.add(window);
-		window.addWindowListener(new WindowAdapter() {
-			public void windowDestroyNotify(WindowEvent arg0) {
-				System.exit(0);
-			};
-		});
 		animator.start();
 	}
-	private class TextGLListener implements GLEventListener{
-		HwTextRenderer textRenderer = null;
-
-		public TextGLListener(){
-
+	
+	private class TextGLListener extends GPUTextGLListenerBase01 {
+	    public TextGLListener() {
+		    super(SVertex.factory(), Region.SINGLE_PASS, DEBUG, TRACE);
+            setMatrix(-10, 10, 0f, -70, 0);		    
 		}
-
+		
 		public void init(GLAutoDrawable drawable) {
-			GL2ES2 gl = drawable.getGL().getGL2ES2();
+            GL2ES2 gl = drawable.getGL().getGL2ES2();
+		    
+            super.init(drawable);
+            
 			gl.setSwapInterval(1);
 			gl.glEnable(GL2ES2.GL_DEPTH_TEST);
-			textRenderer = new HwTextRenderer(drawable.getContext(), pointFactory, Region.SINGLE_PASS);
-			textRenderer.setAlpha(1.0f);
-			textRenderer.setColor(0.0f, 0.0f, 0.0f);
+			textRenderer.init(gl);
+			textRenderer.setAlpha(gl, 1.0f);
+			textRenderer.setColor(gl, 0.0f, 0.0f, 0.0f);
 			//gl.glSampleCoverage(0.95f, false);
 			//gl.glEnable(GL2GL3.GL_SAMPLE_COVERAGE); // sample coverage doesn't really make a difference to lines
+			//gl.glEnable(GL2GL3.GL_SAMPLE_ALPHA_TO_COVERAGE);
 			//gl.glEnable(GL2GL3.GL_SAMPLE_ALPHA_TO_ONE);
 			MSAATool.dump(drawable);
 		}
-		
-		float ang = 0;
-		float zoom = -70;
-		float xTran = -10;
-		float yTran = 10;
-
-		public void display(GLAutoDrawable drawable) {
-			GL2ES2 gl = drawable.getGL().getGL2ES2();
-
-			gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-			gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
-
-			textRenderer.resetMatrix();
-			textRenderer.translate(xTran, yTran, zoom);
-			textRenderer.rotate(ang, 0, 1, 0);
-
-			String text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz";
-			String text2 = text1.toUpperCase();
-
-			Font font = textRenderer.createFont(pointFactory, "Lucida Sans Regular",40);		
-			float[] position = new float[]{0,0,0};
-
-			try {
-				textRenderer.renderString3D(font, text2, position, 0);
-			} catch (Exception e) { 
-				e.printStackTrace();
-			}
-		}
-		public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height){
-			GL2ES2 gl = drawable.getGL().getGL2ES2();
-			gl.glViewport(xstart, ystart, width, height);
-
-			textRenderer.reshape(drawable, 45.0f, width, height, 0.1f, 7000.0f);
-		}
-
-		public void zoomIn(){
-			zoom++;
-		}
-		public void zoomOut(){
-			zoom--;
-		}
-		public void move(float x, float y){
-			xTran += x;
-			yTran += y;
-		}
-		public void rotate(float delta){
-			ang+= delta;
-			ang%=360;
-		}
-		public void dispose(GLAutoDrawable arg0) {
-			textRenderer.clearCached();
-		}
 	}
 }
diff --git a/src/demo/GPUTextNewtDemo02.java b/src/demo/GPUTextNewtDemo02.java
index 4f5e62b31..c7e7504ab 100644
--- a/src/demo/GPUTextNewtDemo02.java
+++ b/src/demo/GPUTextNewtDemo02.java
@@ -28,188 +28,79 @@
 package demo;
 
 import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2GL3;
 import javax.media.opengl.GL3;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.curve.text.HwTextRenderer;
-import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.opengl.SVertex;
-import com.jogamp.newt.event.KeyEvent;
-import com.jogamp.newt.event.KeyListener;
-import com.jogamp.newt.event.WindowAdapter;
-import com.jogamp.newt.event.WindowEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.FPSAnimator;
 
 public class GPUTextNewtDemo02 {
-	private static void create(){
-		new TextNewtWindow();
-	}
-	public static void main(String[] args) {
-		create();
-	}
-}
-
-class TextNewtWindow {
-	Vertex.Factory<SVertex> pointFactory = SVertex.factory();
+    /**
+     * If DEBUG is enabled:
+     *  
+     * Caused by: javax.media.opengl.GLException: Thread[main-Display-X11_:0.0-1-EDT-1,5,main] glGetError() returned the following error codes after a call to glFramebufferRenderbuffer(<int> 0x8D40, <int> 0x1902, <int> 0x8D41, <int> 0x1): GL_INVALID_ENUM ( 1280 0x500), 
+     * at javax.media.opengl.DebugGL4bc.checkGLGetError(DebugGL4bc.java:33961)
+     * at javax.media.opengl.DebugGL4bc.glFramebufferRenderbuffer(DebugGL4bc.java:33077)
+     * at jogamp.graph.curve.opengl.VBORegion2PGL3.initFBOTexture(VBORegion2PGL3.java:295)
+     */
+    static final boolean DEBUG = false;
+    static final boolean TRACE = false;
+    
+    public static void main(String[] args) {
+        GPUTextNewtDemo02 test = new GPUTextNewtDemo02();
+        test.testMe();
+    }
+    
+    GLWindow window;
 	TextGLListener textGLListener = null; 
 
-	public TextNewtWindow(){
-		createWindow();
-	}
-	private void createWindow() {
+	public void testMe() {
 		GLProfile.initSingleton(true);
-		GLProfile glp = GLProfile.get(GLProfile.GL3);
+		GLProfile glp = GLProfile.get(GLProfile.GL3bc);
 		
 		GLCapabilities caps = new GLCapabilities(glp);
 		caps.setAlphaBits(4);		
 		System.out.println("Requested: "+caps);
 		
-		final GLWindow window = GLWindow.create(caps);
+		window = GLWindow.create(caps);
 		
 		window.setPosition(10, 10);
-		window.setSize(1000, 1000);
+        window.setSize(400, 400);		
 
-        window.setTitle("GPU Text Newt Demo 01 - r2t1 msaa0");		
-		textGLListener = new TextGLListener();
-		window.addGLEventListener(textGLListener);
+        window.setTitle("GPU Text Newt Demo 02 - r2t1 msaa0");
+        textGLListener = new TextGLListener();
+        textGLListener.attachTo(window);
 
 		window.setVisible(true);
 
-		window.addKeyListener(new KeyListener() {
-			public void keyPressed(KeyEvent arg0) {
-				if(arg0.getKeyCode() == KeyEvent.VK_1){
-					textGLListener.zoomIn(1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_2){
-					textGLListener.zoomOut(1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_3){
-					textGLListener.zoomIn(10);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_4){
-					textGLListener.zoomOut(10);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_UP){
-					textGLListener.move(0, -1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_DOWN){
-					textGLListener.move(0, 1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_LEFT){
-					textGLListener.move(1, 0);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_RIGHT){
-					textGLListener.move(-1, 0);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_0){
-					textGLListener.rotate(1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_9){
-					textGLListener.rotate(-1);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_6){
-					textGLListener.size -= 10;
-					System.err.println("Tex Size: " + textGLListener.size);
-				}
-				else if(arg0.getKeyCode() == KeyEvent.VK_7){
-					textGLListener.size += 10;
-					System.err.println("Tex Size: " + textGLListener.size);
-				}
-			}
-			public void keyTyped(KeyEvent arg0) {}
-			public void keyReleased(KeyEvent arg0) {}
-		});
-
 		FPSAnimator animator = new FPSAnimator(60);
 		animator.add(window);
-		window.addWindowListener(new WindowAdapter() {
-			public void windowDestroyNotify(WindowEvent arg0) {
-				System.exit(0);
-			};
-		});
 		animator.start();
 	}
-	private class TextGLListener implements GLEventListener{
-		HwTextRenderer textRenderer = null;
-
-		public TextGLListener(){
-
-		}
-
+	
+	private class TextGLListener extends GPUTextGLListenerBase01 {
+        public TextGLListener() {
+            super(SVertex.factory(), Region.TWO_PASS, DEBUG, TRACE);
+            setMatrix(-10, 10, 0f, -1000, window.getWidth());                       
+        }
+	    
 		public void init(GLAutoDrawable drawable) {
-			GL3 gl = drawable.getGL().getGL3();
+            GL3 gl = drawable.getGL().getGL3();
+            
+            super.init(drawable);
+            
 			gl.setSwapInterval(1);
 			gl.glEnable(GL3.GL_DEPTH_TEST);
-			
-			textRenderer = new HwTextRenderer(drawable.getContext(), pointFactory, Region.TWO_PASS);
-			textRenderer.setAlpha(1.0f);
-			textRenderer.setColor(0.0f, 0.0f, 0.0f);
+			textRenderer.init(gl);
+			textRenderer.setAlpha(gl, 1.0f);
+			textRenderer.setColor(gl, 0.0f, 0.0f, 0.0f);
 			gl.glDisable(GL.GL_MULTISAMPLE); // this state usually doesn't matter in driver - but document here: no MSAA 
-			gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL3.GL_NICEST);
+			//gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL3.GL_NICEST);
 			MSAATool.dump(drawable);
 		}
-
-		float ang = 0;
-		float zoom = -4000;
-		float xTran = -100;
-		float yTran = 40;
-		int size = 190;
-
-		public void display(GLAutoDrawable drawable) {
-			GL3 gl = drawable.getGL().getGL3();
-
-			gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-			gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
-
-			textRenderer.resetMatrix();
-			textRenderer.translate(xTran, yTran, zoom);
-			textRenderer.rotate(ang, 0, 1, 0);
-
-			String text1 = "abcdef\nghijklmn\nopqrstuv\nwxyz";
-			String text2 = text1.toUpperCase();
-
-			Font font = textRenderer.createFont(pointFactory, "Lucida Sans Regular",40);
-			float[] position = new float[]{0,0,0};
-
-			try {
-				textRenderer.renderString3D(font, text2, position, size);
-			} catch (Exception e) { 
-				e.printStackTrace();
-			}
-		}
-		public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height){
-			GL3 gl = drawable.getGL().getGL3();
-			gl.glViewport(xstart, ystart, width, height);
-
-			textRenderer.reshape(drawable, 45.0f, width , height, 0.1f, 7000.0f);
-		}
-
-		public void zoomIn(float f){
-			zoom+=f;
-		}
-		public void zoomOut(float f){
-			zoom-=f;
-			System.err.println("Zoom: " + zoom);
-		}
-		public void move(float x, float y){
-			xTran += x;
-			yTran += y;
-		}
-		public void rotate(float delta){
-			ang+= delta;
-			ang%=360;
-		}
-		
-		public void dispose(GLAutoDrawable arg0) {
-			textRenderer.clearCached();
-		}
 	}
 }
diff --git a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
index 4f2714494..0330accbe 100644
--- a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
+++ b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
@@ -64,9 +64,9 @@ public class VBORegion2PGL3  implements Region{
 	private boolean dirty = false;
 	
 	private AABBox box = null;
-	private IntBuffer texture = IntBuffer.allocate(1);
-	private IntBuffer fbo = IntBuffer.allocate(1);
-	private IntBuffer rbo = IntBuffer.allocate(1);
+	private int[] texture = { 0 } ;
+	private int[] fbo = { 0 } ;
+	private int[] rbo_depth = { 0 } ;
 	private boolean texInitialized = false;
 
 	private int tex_width_c = 0;
@@ -178,9 +178,9 @@ public class VBORegion2PGL3  implements Region{
 	    }
 	    gl.glEnable(GL3.GL_TEXTURE_2D);
 	    gl.glActiveTexture(GL3.GL_TEXTURE0);
-	    gl.glBindTexture(GL3.GL_TEXTURE_2D, texture.get(0));
+	    gl.glBindTexture(GL3.GL_TEXTURE_2D, texture[0]);
 	    
-	    st.glUniform(gl, new GLUniformData("texture", texture.get(0)));
+	    st.glUniform(gl, new GLUniformData("texture", texture[0]));
 	    int loc = gl.glGetUniformLocation(st.shaderProgram().id(), "texture");
 	    gl.glUniform1i(loc, 0);
 	    
@@ -257,14 +257,27 @@ public class VBORegion2PGL3  implements Region{
 	
 	private void initFBOTexture(PMVMatrix m, int width, int hight){
 		tex_height_c = (int)(tex_width_c*box.getHeight()/box.getWidth());
-		System.out.println("Scale: " + m.glGetMatrixf().get(0) +" " + m.glGetMatrixf().get(5));
+	    // tex_height_c = tex_width_c;
+	    System.out.println("FBO Size: "+tex_height_c+"x"+tex_width_c);
+		System.out.println("FBO Scale: " + m.glGetMatrixf().get(0) +" " + m.glGetMatrixf().get(5));
 		GL3 gl = context.getGL().getGL3();
 		
-		gl.glDeleteFramebuffers(1, fbo);
-		gl.glDeleteTextures(1, texture);
+		if(fbo[0] > 0) {
+		    gl.glDeleteFramebuffers(1, fbo, 0);
+		    fbo[0] = 0;
+		}
+		if(texture[0]>0) {
+		    gl.glDeleteTextures(1, texture, 0);
+		    texture[0] = 0;
+		}
+		
+        gl.glGenFramebuffers(1, fbo, 0);
+		gl.glGenTextures(1, texture, 0);
+        gl.glGenRenderbuffers(1,rbo_depth, 0);
+        System.out.println("FBO: fbo " + fbo[0] + ", tex " + texture[0] + ", depth " + rbo_depth[0]);
 		
-		gl.glGenTextures(1, texture);
-		gl.glBindTexture(GL3.GL_TEXTURE_2D, texture.get(0));
+        gl.glBindFramebuffer(GL3.GL_DRAW_FRAMEBUFFER, fbo[0]);
+		gl.glBindTexture(GL3.GL_TEXTURE_2D, texture[0]);
 		gl.glTexImage2D(GL3.GL_TEXTURE_2D, 0, GL3.GL_RGBA, tex_width_c, 
 				tex_height_c, 0, GL3.GL_RGBA, GL3.GL_UNSIGNED_BYTE, null);
 		
@@ -272,16 +285,14 @@ public class VBORegion2PGL3  implements Region{
 		gl.glTexParameterf(GL3.GL_TEXTURE_2D, GL3.GL_TEXTURE_MAG_FILTER, GL3.GL_LINEAR);
 		gl.glTexParameterf(GL3.GL_TEXTURE_2D, GL3.GL_TEXTURE_WRAP_S, GL3.GL_CLAMP_TO_EDGE);
 		gl.glTexParameterf(GL3.GL_TEXTURE_2D, GL3.GL_TEXTURE_WRAP_T, GL3.GL_CLAMP_TO_EDGE);
-		
-	    gl.glGenRenderbuffers(1,rbo);
-	    gl.glBindRenderbuffer(GL3.GL_RENDERBUFFER, rbo.get(0));
-	    gl.glRenderbufferStorage(GL3.GL_RENDERBUFFER, GL3.GL_DEPTH_COMPONENT, tex_width_c, tex_height_c);
-	    
-	    gl.glGenFramebuffers(1, fbo);
-	    gl.glBindFramebuffer(GL3.GL_DRAW_FRAMEBUFFER, fbo.get(0));
+
 	    gl.glFramebufferTexture2D(GL3.GL_DRAW_FRAMEBUFFER, GL3.GL_COLOR_ATTACHMENT0, 
-	    		GL3.GL_TEXTURE_2D, texture.get(0), 0);
-	    gl.glFramebufferRenderbuffer(GL3.GL_FRAMEBUFFER, GL3.GL_DEPTH_COMPONENT, GL3.GL_RENDERBUFFER, rbo.get(0));
+	                              GL3.GL_TEXTURE_2D, texture[0], 0);
+
+        // Set up the depth buffer
+	    gl.glBindRenderbuffer(GL3.GL_RENDERBUFFER, rbo_depth[0]);
+	    gl.glRenderbufferStorage(GL3.GL_RENDERBUFFER, GL3.GL_DEPTH_COMPONENT, tex_width_c, tex_height_c);
+	    gl.glFramebufferRenderbuffer(GL3.GL_FRAMEBUFFER, GL3.GL_DEPTH_COMPONENT, GL3.GL_RENDERBUFFER, rbo_depth[0]);
 
 	    int status = gl.glCheckFramebufferStatus(GL3.GL_FRAMEBUFFER);
 	    if(status != GL3.GL_FRAMEBUFFER_COMPLETE){
@@ -290,7 +301,7 @@ public class VBORegion2PGL3  implements Region{
 	    
 	    //render texture
 		PMVMatrix tex_matrix = new PMVMatrix();
-	    gl.glBindFramebuffer(GL3.GL_DRAW_FRAMEBUFFER, fbo.get(0));
+	    gl.glBindFramebuffer(GL3.GL_DRAW_FRAMEBUFFER, fbo[0]);
 	    gl.glViewport(0, 0, tex_width_c, tex_height_c);
 	    tex_matrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
 	    tex_matrix.glLoadIdentity();
@@ -349,8 +360,12 @@ public class VBORegion2PGL3  implements Region{
 	public void destroy() {
 		GL3 gl = context.getGL().getGL3();
 		gl.glDeleteBuffers(numBuffers, vboIds);
-		gl.glDeleteFramebuffers(1, fbo);
-		gl.glDeleteTextures(1, texture);
+		gl.glDeleteFramebuffers(1, fbo, 0);
+		fbo[0] = 0;
+		gl.glDeleteTextures(1, texture, 0);
+		texture[0] = 0;
+		gl.glDeleteRenderbuffers(1, rbo_depth, 0);
+		rbo_depth[0] = 0;
 	}
 	
 	public boolean isFlipped() {
diff --git a/src/jogamp/graph/font/typecast/TypecastFont.java b/src/jogamp/graph/font/typecast/TypecastFont.java
index b44a7d86b..86c9601de 100644
--- a/src/jogamp/graph/font/typecast/TypecastFont.java
+++ b/src/jogamp/graph/font/typecast/TypecastFont.java
@@ -34,7 +34,6 @@ import jogamp.graph.font.FontInt;
 import jogamp.graph.font.JavaFontLoader;
 import jogamp.graph.geom.plane.AffineTransform;
 import jogamp.graph.geom.plane.Path2D;
-
 import net.java.dev.typecast.ot.OTFont;
 import net.java.dev.typecast.ot.OTFontCollection;
 import net.java.dev.typecast.ot.table.CmapFormat;
@@ -42,10 +41,8 @@ import net.java.dev.typecast.ot.table.CmapTable;
 import net.java.dev.typecast.ot.table.ID;
 
 import com.jogamp.common.util.IntObjectHashMap;
-import com.jogamp.graph.font.Font;
 import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.geom.Vertex;
 
 class TypecastFont implements FontInt {
 	static final boolean DEBUG = false;