From 55356d999638491980a90cb2263b55c5d2e53e91 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 30 Mar 2011 06:59:43 +0200 Subject: Font Refactoring ; Misc Changes ; Demo/Test Update Font Refactoring - Notion of distributed FontSet - FontFactory may produce FontSet and/or a Font by absolute ttf file path - Adding support for free Ubuntu fonts - Remove Vertex.Factory dependency for Font creation - Typecast Impl - Fix CmapTable selection - Fix horizontal spacing of space - Misc Changes - HwTextRenderer - Offer reshape for perspective and orthogonal view - Expose PMVMatrix, allowing user to setup their own view math. Demo Update - Dump font set a-zA-Z... - Dump 'lazy dog ..' text - Action: - s: toogle 'font set' - f: toggle fps - v: toggle v-sync - space: toggle font (ubuntu/java) - formated screenshot filename w/ font name Test Update: - add font set iteration --- src/com/jogamp/graph/curve/HwTextRenderer.java | 72 +++++++++++--------------- src/com/jogamp/graph/font/Font.java | 10 ++++ src/com/jogamp/graph/font/FontFactory.java | 60 +++++++++++++++++---- src/com/jogamp/graph/font/FontSet.java | 60 +++++++++++++++++++++ 4 files changed, 148 insertions(+), 54 deletions(-) create mode 100644 src/com/jogamp/graph/font/FontSet.java (limited to 'src/com/jogamp') diff --git a/src/com/jogamp/graph/curve/HwTextRenderer.java b/src/com/jogamp/graph/curve/HwTextRenderer.java index c5f11d522..f3a15975a 100644 --- a/src/com/jogamp/graph/curve/HwTextRenderer.java +++ b/src/com/jogamp/graph/curve/HwTextRenderer.java @@ -38,13 +38,10 @@ import javax.media.opengl.fixedfunc.GLMatrixFunc; import jogamp.graph.curve.text.GlyphString; import jogamp.graph.font.FontInt; -import jogamp.graph.font.typecast.TypecastFontFactory; import jogamp.graph.geom.plane.AffineTransform; import jogamp.graph.geom.plane.Path2D; -import com.jogamp.common.util.ReflectionUtil; import com.jogamp.graph.font.Font; -import com.jogamp.graph.font.FontFactory; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.opengl.SVertex; import jogamp.opengl.Debug; @@ -57,28 +54,6 @@ public class HwTextRenderer { protected static final boolean DEBUG = Debug.debug("TextRenderer"); static final boolean FONTTOOL_CUSTOM = false; - private static FontFactory fontFactory; - - static { - FontFactory _fontFactory = null; - - if(FONTTOOL_CUSTOM) { - _fontFactory = (FontFactory) ReflectionUtil.createInstance("jogamp.graph.font.ttf.TTFFontFactory", HwTextRenderer.class.getClassLoader()); - if(null!=_fontFactory) { - System.err.println("Using custom font tool"); - } - } - if(null==_fontFactory) { - _fontFactory = new TypecastFontFactory(); - } - fontFactory = _fontFactory; - } - - - public static FontFactory getFontFactory() { - return fontFactory; - } - private ShaderState st = new ShaderState(); private PMVMatrix pmvMatrix = new PMVMatrix(); @@ -113,19 +88,6 @@ public class HwTextRenderer { this.regionType = type; } - public Font createFont(Vertex.Factory factory, String name) { - return fontFactory.createFont(factory, name); - } - - - public Font createFont(Vertex.Factory factory, - String[] families, - String style, - String variant, - String weight) { - return fontFactory.createFont(factory, families, style, variant, weight); - } - /** * Initialize shaders and bindings for GPU based text Rendering, * should be called only once. @@ -162,9 +124,9 @@ public class HwTextRenderer { gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA); ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, HwTextRenderer.class, - "../shader", "../shader/bin", "curverenderer"); + "shader", "shader/bin", "curverenderer"); ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, HwTextRenderer.class, - "../shader", "../shader/bin", "curverenderer"); + "shader", "shader/bin", "curverenderer"); ShaderProgram sp = new ShaderProgram(); sp.add(rsVp); @@ -259,6 +221,8 @@ public class HwTextRenderer { } } + public final PMVMatrix matrix() { return pmvMatrix; } + public void rotate(GL2ES2 gl, float angle, float x, float y, float z){ pmvMatrix.glRotatef(angle, x, y, z); if(null != gl && st.inUse()) { @@ -279,7 +243,13 @@ public class HwTextRenderer { st.glUniform(gl, mgl_PMVMatrix); } } - + + public void setMatrix(GL2ES2 gl){ + 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); @@ -297,7 +267,7 @@ public class HwTextRenderer { * @param far * @return */ - public boolean reshape(GL2ES2 gl, float angle, int width, int height, float near, float far){ + public boolean reshapePerspective(GL2ES2 gl, float angle, int width, int height, float near, float far){ win_width = width; win_height = height; float ratio = (float)width/(float)height; @@ -305,10 +275,26 @@ public class HwTextRenderer { pmvMatrix.glLoadIdentity(); pmvMatrix.gluPerspective(angle, ratio, near, far); - st.glUniform(gl, mgl_PMVMatrix); + if(null != gl) { + st.glUniform(gl, mgl_PMVMatrix); + } return true; } + + public boolean reshapeOrtho(GL2ES2 gl, int width, int height, float near, float far) { + win_width = width; + win_height = height; + pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION); + pmvMatrix.glLoadIdentity(); + pmvMatrix.glOrthof(0, width, 0, height, near, far); + + if(null != gl) { + st.glUniform(gl, mgl_PMVMatrix); + } + + return true; + } private GlyphString createString(GL2ES2 gl, Font font, int size, String str) { AffineTransform affineTransform = new AffineTransform(pointFactory); diff --git a/src/com/jogamp/graph/font/Font.java b/src/com/jogamp/graph/font/Font.java index fbdf1f474..a4ab527e2 100644 --- a/src/com/jogamp/graph/font/Font.java +++ b/src/com/jogamp/graph/font/Font.java @@ -34,17 +34,27 @@ import com.jogamp.graph.geom.AABBox; * * TrueType Font Specification: * http://developer.apple.com/fonts/ttrefman/rm06/Chap6.html + * + * TrueType Font Table Introduction: + * http://scripts.sil.org/cms/scripts/page.php?item_id=IWS-Chapter08 */ public interface Font { /** * Metrics for font + * + * Depending on the font's direction, horizontal or vertical, + * the following tables shall be used: + * + * Vertical http://developer.apple.com/fonts/TTRefMan/RM06/Chap6vhea.html + * Horizontal http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html */ public interface Metrics { float getAscent(float pixelSize); float getDescent(float pixelSize); float getLineGap(float pixelSize); + float getMaxExtend(float pixelSize); float getScale(float pixelSize); AABBox getBBox(float pixelSize); } diff --git a/src/com/jogamp/graph/font/FontFactory.java b/src/com/jogamp/graph/font/FontFactory.java index b595413ba..1752a693c 100644 --- a/src/com/jogamp/graph/font/FontFactory.java +++ b/src/com/jogamp/graph/font/FontFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2010 JogAmp Community. All rights reserved. + * Copyright 2011 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: @@ -27,16 +27,54 @@ */ package com.jogamp.graph.font; -import com.jogamp.graph.geom.Vertex; +import java.security.AccessController; -public interface FontFactory { +import com.jogamp.common.util.ReflectionUtil; - Font createFont(Vertex.Factory factory, - String[] families, - String style, - String variant, - String weight); +import jogamp.graph.font.FontConstructor; +import jogamp.graph.font.JavaFontLoader; +import jogamp.graph.font.UbuntuFontLoader; +import jogamp.opengl.Debug; - Font createFont(Vertex.Factory factory, - String name); -} \ No newline at end of file +public class FontFactory { + /** Ubuntu is the default font family */ + public static final int UBUNTU = 0; + + /** Java fonts are optional */ + public static final int JAVA = 1; + + private static final FontConstructor fontConstr; + + static { + /** + * For example: + * "jogamp.graph.font.typecast.TypecastFontFactory" (default) + * "jogamp.graph.font.ttf.TTFFontImpl" + */ + String fontImplName = Debug.getProperty("FontImpl", true, AccessController.getContext()); + if(null == fontImplName) { + fontImplName = "jogamp.graph.font.typecast.TypecastFontConstructor"; + } + fontConstr = (FontConstructor) ReflectionUtil.createInstance(fontImplName, FontFactory.class.getClassLoader()); + } + + public static final FontConstructor getFontConstr() { return fontConstr; } + + public static final FontSet getDefault() { + return get(UBUNTU); + } + + public static final FontSet get(int font) { + switch (font) { + case JAVA: + return JavaFontLoader.get(); + default: + return UbuntuFontLoader.get(); + } + } + + public static final Font get(String path) { + return fontConstr.create(path); + } + +} diff --git a/src/com/jogamp/graph/font/FontSet.java b/src/com/jogamp/graph/font/FontSet.java new file mode 100644 index 000000000..0cee81124 --- /dev/null +++ b/src/com/jogamp/graph/font/FontSet.java @@ -0,0 +1,60 @@ +/** + * Copyright 2011 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 com.jogamp.graph.font; + + +public interface FontSet { + + /** Font family REGULAR **/ + public static final int FAMILY_REGULAR = 0; + + /** Font family LIGHT **/ + public static final int FAMILY_LIGHT = 1; + + /** Font family MEDIUM **/ + public static final int FAMILY_MEDIUM = 2; + + /** Font family CONDENSED **/ + public static final int FAMILY_CONDENSED = 3; + + /** Font family MONO **/ + public static final int FAMILY_MONOSPACED = 4; + + /** SERIF style/family bit flag. Fallback to Sans Serif. */ + public static final int STYLE_SERIF = 1 << 1; + + /** BOLD style bit flag */ + public static final int STYLE_BOLD = 1 << 2; + + /** ITALIC style bit flag */ + public static final int STYLE_ITALIC = 1 << 3; + + Font getDefault(); + + Font get(int family, int stylebits); +} -- cgit v1.2.3