Final core and demo changes for jogl merge

Core:
- Region: Cleanup up constant names
- Renderer: Add getRenderType()
- TextRenderer: Add cache size limit
- JavaFontLoader: Add FIXME 'Add cache size to limit memory usage'
- UbuntuFontLoader: Add cache and FIXME 'Add cache size to limit memory usage'
- TypecastFont: Add FIXME 'Add cache size to limit memory usage ??'

Demos:
- Relocated and split (main/listener) for jogl merge
- Add 's' for screenshot
- Text:
  - Add 'i' for live editing mode (until CR, backspace supported)

1 files changed, 0 insertions, 179 deletions

diff --git a/src/demo/GPURegionNewtDemo01.java b/src/demo/GPURegionNewtDemo01.java
deleted file mode 100755
index 676621692..000000000
--- a/src/demo/GPURegionNewtDemo01.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * 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.GLCapabilities;
-import javax.media.opengl.GLProfile;
-
-import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.curve.opengl.RegionRenderer;
-import com.jogamp.graph.geom.opengl.SVertex;
-import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.opengl.util.Animator;
-
-/** Demonstrate the rendering of multiple outlines into one region/OutlineShape
- *  These Outlines are not necessary connected or contained.
- *  The output of this demo shows two identical shapes but the left one
- *  has some vertices with off-curve flag set to true, and the right allt he vertices 
- *  are on the curve. Demos the Res. Independent Nurbs based Curve rendering 
- *
- */
-public class GPURegionNewtDemo01 {
-    static final boolean DEBUG = false;
-    static final boolean TRACE = false;
-    
-    public static void main(String[] args) {
-        GPURegionNewtDemo01 test = new GPURegionNewtDemo01();
-        test.testMe();
-    }
-    
-	RegionGLListener regionGLListener = null; 
-    GLWindow window;
-    
-    public void testMe() {
-		GLProfile.initSingleton(true);
-        GLProfile glp = GLProfile.getGL2ES2();
-        GLCapabilities caps = new GLCapabilities(glp);
-        caps.setAlphaBits(4);
-        caps.setSampleBuffers(true);
-        caps.setNumSamples(4); // 2 samples is not enough ..
-        System.out.println("Requested: " + caps);
-        
-        GLWindow w = GLWindow.create(caps);
-        w.setPosition(10, 10);
-        w.setSize(800, 400);
-        w.setTitle("GPU Curve Region Newt Demo 01 - r2t0 msaa1");
-        
-        regionGLListener = createRegionRendererListener(w);
-        
-        window.addGLEventListener(regionGLListener);
-
-        window.enablePerfLog(true);     
-		window.setVisible(true);
-
-		//FPSAnimator animator = new FPSAnimator(60);
-        Animator animator = new Animator();
-		animator.add(window);
-		animator.start();
-	}
-    
-    public RegionGLListener createRegionRendererListener(GLWindow w) {
-        this.window = w;
-        
-        RegionGLListener l = new RegionGLListener();
-        l.attachInputListenerTo(w);
-
-        return l;
-    }
-    
-	public class RegionGLListener extends GPURegionRendererListenerBase01 {
-		OutlineShape outlineShape = null;
-		
-		public RegionGLListener() {
-            super(SVertex.factory(), Region.SINGLE_PASS, DEBUG, TRACE);
-            setMatrix(-20, 00, 0f, -50, 400);
-		}
-		
-		private void createTestOutline(){
-			float offset = 0;
-			outlineShape = new OutlineShape(getRenderer().getFactory());
-			outlineShape.addVertex(0.0f,-10.0f, true);
-			outlineShape.addVertex(15.0f,-10.0f, true);
-			outlineShape.addVertex(10.0f,5.0f, false);
-			outlineShape.addVertex(15.0f,10.0f, true);
-			outlineShape.addVertex(6.0f,15.0f, false);
-			outlineShape.addVertex(5.0f,8.0f, false);
-			outlineShape.addVertex(0.0f,10.0f,true);
-			outlineShape.closeLastOutline();
-			outlineShape.addEmptyOutline();
-			outlineShape.addVertex(5.0f,-5.0f,true);
-			outlineShape.addVertex(10.0f,-5.0f, false);
-			outlineShape.addVertex(10.0f,0.0f, true);
-			outlineShape.addVertex(5.0f,0.0f, false);
-			outlineShape.closeLastOutline();
-			
-			/** Same shape as above but without any off-curve vertices */
-			outlineShape.addEmptyOutline();
-			offset = 30;
-			outlineShape.addVertex(offset+0.0f,-10.0f, true);
-			outlineShape.addVertex(offset+17.0f,-10.0f, true);
-			outlineShape.addVertex(offset+11.0f,5.0f, true);
-			outlineShape.addVertex(offset+16.0f,10.0f, true);
-			outlineShape.addVertex(offset+7.0f,15.0f, true);
-			outlineShape.addVertex(offset+6.0f,8.0f, true);
-			outlineShape.addVertex(offset+0.0f,10.0f, true);
-			outlineShape.closeLastOutline();
-			outlineShape.addEmptyOutline();
-			outlineShape.addVertex(offset+5.0f,0.0f, true);
-			outlineShape.addVertex(offset+5.0f,-5.0f, true);
-			outlineShape.addVertex(offset+10.0f,-5.0f, true);
-			outlineShape.addVertex(offset+10.0f,0.0f, true);
-			outlineShape.closeLastOutline();
-		}
-
-		public void init(GLAutoDrawable drawable) {
-			super.init(drawable);
-			
-            GL2ES2 gl = drawable.getGL().getGL2ES2();
-
-            final RegionRenderer regionRenderer = (RegionRenderer) getRenderer();
-
-			gl.setSwapInterval(1);
-			gl.glEnable(GL2ES2.GL_DEPTH_TEST);
-			regionRenderer.init(gl);
-            regionRenderer.setAlpha(gl, 1.0f);
-            regionRenderer.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_ONE);
-            MSAATool.dump(drawable);
-            
-			createTestOutline();
-		}
-
-		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);
-
-            final RegionRenderer regionRenderer = (RegionRenderer) getRenderer();
-            
-			regionRenderer.resetModelview(null);
-			regionRenderer.translate(null, getXTran(), getYTran(), getZoom());
-			regionRenderer.rotate(gl, getAngle(), 0, 1, 0);
-
-			regionRenderer.renderOutlineShape(gl, outlineShape, getPosition(), getTexSize());
-		}		
-	}
-}