diff options
author | Sven Gothel <[email protected]> | 2023-09-24 12:01:53 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-09-24 12:01:53 +0200 |
commit | 0c8700589abffe13e42f18d3c755541268d44a34 (patch) | |
tree | db8adf22d8cee7ebd1f9d0aa646ba9035eb5c951 /src/jogl | |
parent | 652cfd2f307e0a34537ff8ec5ae2d023cfc2ce5d (diff) |
Graph Fonts: Add 'Material Icons Round-Regular' (APL-2 license) and use it in UISceneDemo03 via hard coded unicode symbol numbers
Diffstat (limited to 'src/jogl')
-rw-r--r-- | src/jogl/classes/com/jogamp/graph/font/FontFactory.java | 6 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/graph/font/SymbolsFontLoader.java | 69 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/graph/font/fonts/symbols/MaterialIconsRound-Regular.ttf | bin | 0 -> 396784 bytes | |||
-rw-r--r-- | src/jogl/classes/jogamp/graph/font/fonts/symbols/README.txt | 17 |
4 files changed, 92 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java index 9b9762a05..b873b78ec 100644 --- a/src/jogl/classes/com/jogamp/graph/font/FontFactory.java +++ b/src/jogl/classes/com/jogamp/graph/font/FontFactory.java @@ -43,6 +43,7 @@ import com.jogamp.common.util.cache.TempJarCache; import jogamp.graph.font.FontConstructor; import jogamp.graph.font.JavaFontLoader; +import jogamp.graph.font.SymbolsFontLoader; import jogamp.graph.font.UbuntuFontLoader; /** @@ -60,6 +61,9 @@ public class FontFactory { /** Ubuntu is the default font family, {@value} */ public static final int UBUNTU = 0; + /** Symbols is the default symbol font family and contains rounded material symbol fonts, {@value} */ + public static final int SYMBOLS = 10; + /** Java fonts are optional, {@value} */ public static final int JAVA = 1; @@ -86,6 +90,8 @@ public class FontFactory { switch (font) { case JAVA: return JavaFontLoader.get(); + case SYMBOLS: + return SymbolsFontLoader.get(); default: return UbuntuFontLoader.get(); } diff --git a/src/jogl/classes/jogamp/graph/font/SymbolsFontLoader.java b/src/jogl/classes/jogamp/graph/font/SymbolsFontLoader.java new file mode 100644 index 000000000..66d25fd4f --- /dev/null +++ b/src/jogl/classes/jogamp/graph/font/SymbolsFontLoader.java @@ -0,0 +1,69 @@ +/** + * Copyright 2023 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 jogamp.graph.font; + +import java.io.IOException; + +import com.jogamp.common.net.Uri; +import com.jogamp.graph.font.Font; +import com.jogamp.graph.font.FontSet; + +public class SymbolsFontLoader extends FontLoaderImpl implements FontSet { + private static final Uri.Encoded jarName = Uri.Encoded.cast("jogl-fonts-p0.jar"); + + private static final String absFontPath = "jogamp/graph/font/fonts/symbols/" ; + + private static final FontSet fontLoader = new SymbolsFontLoader(); + + private static Font cachedFont = null; + + public static final FontSet get() { + return fontLoader; + } + + private SymbolsFontLoader() { + } + + @Override + public Font getDefault() throws IOException { + return get(FAMILY_REGULAR, 0) ; // Sans Serif Regular + } + + @Override + public synchronized Font get(final int family, final int style) throws IOException { + Font font = cachedFont; + if (font != null) { + return font; + } + font = readFont("MaterialIconsRound-Regular.ttf", jarName, absFontPath); + if( null != font ) { + cachedFont = font; + } + return font; + } +} diff --git a/src/jogl/classes/jogamp/graph/font/fonts/symbols/MaterialIconsRound-Regular.ttf b/src/jogl/classes/jogamp/graph/font/fonts/symbols/MaterialIconsRound-Regular.ttf Binary files differnew file mode 100644 index 000000000..8cc042212 --- /dev/null +++ b/src/jogl/classes/jogamp/graph/font/fonts/symbols/MaterialIconsRound-Regular.ttf diff --git a/src/jogl/classes/jogamp/graph/font/fonts/symbols/README.txt b/src/jogl/classes/jogamp/graph/font/fonts/symbols/README.txt new file mode 100644 index 000000000..fde0db1a3 --- /dev/null +++ b/src/jogl/classes/jogamp/graph/font/fonts/symbols/README.txt @@ -0,0 +1,17 @@ +These fonts has been fetched from +<https://github.com/google/material-design-icons> + +MaterialIconsRound-Regular.ttf + File has been extracted from font/MaterialIconsRound-Regular.otf + using fontforge. + + Licensed under: Apache License Version 2.0, January 2004 + + commit f7bd4f25f3764883717c09a1fd867f560c9a9581 + Date: Mon Sep 19 15:53:40 2022 -0700 + Update icons 9/19 + + +The Apache License, Version 2.0 (the "License") +can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>. + |