Changeset 982

Timestamp:

12/14/15 13:42:02 (8 years ago)

Author:

davidb

Message:

Improved TTF font support

File:

• trunk/src/org/expeditee/items/Text.java (modified) (3 diffs)

trunk/src/org/expeditee/items/Text.java

@@ -183 +183 @@
 
                                 try {
+                                    //Font customFont = Font.createFont(Font.TRUETYPE_FONT, fontFile).deriveFont(32f);
                                         Font font = Font.createFont(Font.TRUETYPE_FONT, fontFile);
 
-                                        ge.registerFont(font);
+                                        boolean registered_status_ok= ge.registerFont(font);
+
+                                        if (registered_status_ok) {
+                                            
+                                            //System.out.println("*** Just added custom TTF font file: " + fontFile);
+                                            //System.out.println("Added Font Family: '" + font.getFamily() + "'");
+
+                                            String font_family = font.getFamily();
+                                            if (!FONT_WHEEL_ADDITIONAL_LOOKUP.containsKey(font_family)) {
+
+                                                if (FONT_WHEEL_ADDITIONAL_LOOKUP.size()>0) {
+                                                    System.out.print(", ");
+                                                }
+                                                System.out.print("'" + font.getFamily() + "'");
+
+                                                FONT_WHEEL_ADDITIONAL_LOOKUP.put(font_family,font);
+                                                                                            
+                                                int cdut = font.canDisplayUpTo("09AZaz");
+                                                if (cdut>=0) {
+                                                    // Some problem has occured (should return -1 to show all chars possible)
+                                                
+                                                    System.out.println(" [Non-ASCII font]");
+                                                }
+                                                System.out.flush();
+                                            }
+                                                
+                                        }
+                                        else {
+                                            System.err.println("Error: Failed to add custom True-Type Font file: " + fontFile);
+                                        }
+                                        
+
+                                        //String []fontFamilies = ge.getAvailableFontFamilyNames();
+                                        //for (String n: fontFamilies) {
+                                        //    System.out.println("font family name: " + n);
+                                        //}
+                                        //System.out.println("====");
+                                        
                                 }
                                 catch (Exception e) {
@@ -212 +250 @@
                                         for (File fontFamilyDir : fontFamilyDirs) {
                                                 if (fontFamilyDir.isDirectory()) {
-
-                                                        if (first_item) {
-                                                                System.out.print("  " + fontFamilyDir.getName());
-                                                                first_item = false;
-                                                        }
-                                                        else {
-                                                                System.out.print(", " + fontFamilyDir.getName());
-                                                        }
-                                                        System.out.flush();
-
                                                         InitFontFamily(ge,fontFamilyDir);
                                                 }
@@ -1138 +1166 @@
         public static final String MONOSPACED_FONT = "monospaced";
 
-        public static final String[] FONT_WHEEL = { "sansserif", "monospaced",
-                        "serif", "dialog", "dialoginput" };
-
-        public static final char[] FONT_CHARS = { 's', 'm', 't', 'd', 'i' };
-
+        public static final String[] FONT_WHEEL = { "sansserif", "monospaced", "serif", "dialog", "dialoginput" };
+        public static final char[]   FONT_CHARS = { 's', 'm', 't', 'd', 'i' };
+
+        // A hashtable to store the font family names that are loaded in through the TTF files
+        // provided in the 'assets' folder
+        public static HashMap<String, Font> FONT_WHEEL_ADDITIONAL_LOOKUP = new HashMap<>();
+    
         private static final int NEARBY_GRAVITY = 2;