X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FFont.java;h=451672e4a3ad254ffdb6c3af31657b56e78e8f6c;hb=d892b1ff73b696e37812afd7d78c2eaae3342a0b;hp=48fd0dee7038a2d9534296adf916be41ed9deb4d;hpb=1e2ac9c2eef012a3e77133817803878bacfa91b8;p=org.ibex.core.git
diff --git a/src/org/ibex/Font.java b/src/org/ibex/Font.java
index 48fd0de..451672e 100644
--- a/src/org/ibex/Font.java
+++ b/src/org/ibex/Font.java
@@ -32,12 +32,16 @@ public class Font {
public int width = -1; ///< the width of the glyph
public int height = -1; ///< the height of the glyph
public byte[] data = null; ///< the alpha channel samples for this font
+ void render() {
+ if (!isLoaded) try { freetype.renderGlyph(this); } catch (IOException e) { Log.info(Freetype.class, e); }
+ isLoaded = true;
+ }
}
// Statics //////////////////////////////////////////////////////////////////////
- private static final Freetype freetype = new Freetype();
+ static final Freetype freetype = new Freetype();
static final Hashtable glyphsToBeCached = new Hashtable();
static final Hashtable glyphsToBeDisplayed = new Hashtable();
private static Cache fontCache = new Cache(100);
@@ -52,65 +56,30 @@ public class Font {
/**
* Rasterize the glyphs of text
.
- *
- * If all the glyphs of text
are not yet loaded,
- * spawn a Task to load them and then invoke callback. If all
- * the glyphs are loaded, rasterize them to the
- * PixelBuffer (if non-null).
- *
- * @returns (width<<32)|height
if all glyphs are loaded; else -1
+ * @returns (width<<32)|height
*/
- public long rasterizeGlyphs(final String text, PixelBuffer pb, int textcolor,
- int x, int y, int cx1, int cy1, int cx2, int cy2,
- final Scheduler.Task callback) {
- boolean encounteredUnrenderedGlyph = false;
+ public long rasterizeGlyphs(String text, PixelBuffer pb, int textcolor, int x, int y, int cx1, int cy1, int cx2, int cy2) {
int width = 0, height = 0;
-
- // preload the Latin-1 charset with low priority (we'll probably want it)
- if (!latinCharsPreloaded) {
- for(int i=48; i<57; i++) glyphsToBeCached.put(glyphs[i] = Platform.createGlyph(this, (char)i),"");
- for(int i=32; i<47; i++) glyphsToBeCached.put(glyphs[i] = Platform.createGlyph(this, (char)i),"");
- for(int i=57; i<128; i++) glyphsToBeCached.put(glyphs[i] = Platform.createGlyph(this, (char)i),"");
+ if (!latinCharsPreloaded) { // preload the Latin-1 charset with low priority (we'll probably want it)
+ for(int i=48; i<57; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
+ for(int i=32; i<47; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
+ for(int i=57; i<128; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
+ if (!glyphRenderingTaskIsScheduled) {
+ Scheduler.add(glyphRenderingTask);
+ glyphRenderingTaskIsScheduled = true;
}
- latinCharsPreloaded = true;
-
- if (!glyphRenderingTaskIsScheduled) {
- Scheduler.add(glyphRenderingTask);
- glyphRenderingTaskIsScheduled = true;
+ latinCharsPreloaded = true;
}
-
for(int i=0; i