[fixed] BitmapFont if the font doesn't have the usual latin glyphs.

libgdx · Aug 14, 2011 · 471911b · 471911b
1 parent 78df57e
commit 471911b
Showing 1 changed file with 40 additions and 24 deletions.
diff --git a/gdx/src/com/badlogic/gdx/graphics/g2d/BitmapFont.java b/gdx/src/com/badlogic/gdx/graphics/g2d/BitmapFont.java
@@ -126,11 +126,9 @@ public BitmapFontData(FileHandle fontFile, boolean flip) {
 					tokens.nextToken();
 					tokens.nextToken();
 					int ch = Integer.parseInt(tokens.nextToken());
-					if (ch <= Character.MAX_VALUE) {
-						Glyph[] page = glyphs[ch / PAGE_SIZE];
-						if (page == null) glyphs[ch / PAGE_SIZE] = page = new Glyph[PAGE_SIZE];
-						page[ch & PAGE_SIZE - 1] = glyph;
-					} else
+					if (ch <= Character.MAX_VALUE) 
+						setGlyph(ch, glyph);
+					 else
 						continue;
 					tokens.nextToken();
 					glyph.srcX = Integer.parseInt(tokens.nextToken());
@@ -170,29 +168,30 @@ public BitmapFontData(FileHandle fontFile, boolean flip) {
 					glyph.setKerning(second, amount);
 				}
 
-				Glyph g = getGlyph(' ');
-				if (g == null) {
-					g = new Glyph();
-					g.xadvance = getGlyph('l').xadvance;
-					Glyph[] page = glyphs[' ' / PAGE_SIZE];
-					if (page == null) glyphs[' ' / PAGE_SIZE] = page = new Glyph[PAGE_SIZE];
-					page[' ' & PAGE_SIZE - 1] = g;
+				Glyph spaceGlyph = getGlyph(' ');
+				if (spaceGlyph == null) {
+					spaceGlyph = new Glyph();
+					Glyph xadvanceGlyph = getGlyph('l');
+					if (xadvanceGlyph == null) xadvanceGlyph = getFirstGlyph();
+					spaceGlyph.xadvance = xadvanceGlyph.xadvance;
+					setGlyph(' ', spaceGlyph);
 				}
-				spaceWidth = g != null ? g.xadvance + g.width : 1;
+				spaceWidth = spaceGlyph != null ? spaceGlyph.xadvance + spaceGlyph.width : 1;
 
+				Glyph xGlyph = null;
 				for (int i = 0; i < xChars.length; i++) {
-					g = getGlyph(xChars[i]);
-					if (g == null) continue;
-					xHeight = g.height;
-					break;
+					xGlyph = getGlyph(xChars[i]);
+					if (xGlyph != null) break;
 				}
+				if (xGlyph == null) xGlyph = getFirstGlyph();
+				xHeight = xGlyph.height;
 
+				Glyph capGlyph = null;
 				for (int i = 0; i < capChars.length; i++) {
-					g = getGlyph(capChars[i]);
-					if (g == null) continue;
-					capHeight = g.height;
-					break;
+					capGlyph = getGlyph(capChars[i]);
+					if (capGlyph != null) break;
 				}
+				capHeight = capGlyph.height;
 
 				ascent = baseLine - capHeight;
 				down = -lineHeight;
@@ -210,6 +209,23 @@ public BitmapFontData(FileHandle fontFile, boolean flip) {
 			}
 		}
 
+		private void setGlyph (int ch, Glyph glyph) {
+			Glyph[] page = glyphs[ch / PAGE_SIZE];
+			if (page == null) glyphs[ch / PAGE_SIZE] = page = new Glyph[PAGE_SIZE];
+			page[ch & PAGE_SIZE - 1] = glyph;
+		}
+
+		private Glyph getFirstGlyph () {
+			for (Glyph[] page : this.glyphs) {
+				if (page == null) continue;
+				for (Glyph glyph : page) {
+					if (glyph == null) continue;
+					return glyph;
+				}
+			}
+			throw new GdxRuntimeException("No glyphs found!");
+		}
+
 		public Glyph getGlyph (char ch) {
 			Glyph[] page = glyphs[ch / PAGE_SIZE];
 			if (page != null) return page[ch & PAGE_SIZE - 1];
@@ -292,9 +308,9 @@ private void load(BitmapFontData data) {
 		float u = region.u;
 		float v = region.v;
 
-		for(Glyph[] glyphs: data.glyphs) {
-			if(glyphs == null) continue;
-			for(Glyph glyph: glyphs) {
+		for(Glyph[] page : data.glyphs) {
+			if(page == null) continue;
+			for(Glyph glyph : page) {
 				if(glyph == null) continue;
 				glyph.u = u + glyph.srcX * invTexWidth;
 				glyph.u2 = u + (glyph.srcX + glyph.width) * invTexWidth;