X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FFont.java;h=451672e4a3ad254ffdb6c3af31657b56e78e8f6c;hb=d892b1ff73b696e37812afd7d78c2eaae3342a0b;hp=fc849794a23db36d65c718c660b0be21542d9123;hpb=db4ab6de30e095d6448fb826c2e6f0d4ac53cc7b;p=org.ibex.core.git
diff --git a/src/org/ibex/Font.java b/src/org/ibex/Font.java
index fc84979..451672e 100644
--- a/src/org/ibex/Font.java
+++ b/src/org/ibex/Font.java
@@ -3,6 +3,8 @@ package org.ibex;
import org.ibex.translators.*;
import org.ibex.util.*;
import java.io.*;
+import java.util.Hashtable;
+
import org.ibex.js.JSExn;
// FEATURE: this could be cleaner
@@ -30,13 +32,18 @@ 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 Queue glyphsToBeRendered = new Queue(255);
+ 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);
public static Font getFont(Stream stream, int pointsize) {
Font ret = (Font)fontCache.get(stream, new Integer(pointsize));
@@ -49,62 +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;
- for(int i=0; i