summaryrefslogtreecommitdiffstats
path: root/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-04-01 06:48:52 +0200
committerSven Gothel <[email protected]>2011-04-01 06:48:52 +0200
commit4b8bd5ec58cb2edfb51bd9ee930beb9c539a8a0b (patch)
tree5567f56606ea248707fe002015b90a9635250e91 /src/jogamp/graph/curve/opengl/TextRendererImpl01.java
parente8c69e69374b6650e37594ebf104602fb06b548b (diff)
Final core and demo changes for jogl merge
Core: - Region: Cleanup up constant names - Renderer: Add getRenderType() - TextRenderer: Add cache size limit - JavaFontLoader: Add FIXME 'Add cache size to limit memory usage' - UbuntuFontLoader: Add cache and FIXME 'Add cache size to limit memory usage' - TypecastFont: Add FIXME 'Add cache size to limit memory usage ??' Demos: - Relocated and split (main/listener) for jogl merge - Add 's' for screenshot - Text: - Add 'i' for live editing mode (until CR, backspace supported)
Diffstat (limited to 'src/jogamp/graph/curve/opengl/TextRendererImpl01.java')
-rw-r--r--src/jogamp/graph/curve/opengl/TextRendererImpl01.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/jogamp/graph/curve/opengl/TextRendererImpl01.java b/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
index aa3202805..cebe7a19e 100644
--- a/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
+++ b/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
@@ -176,11 +176,10 @@ public class TextRendererImpl01 extends TextRenderer {
if(!isInitialized()){
throw new GLException("TextRendererImpl01: not initialized!");
}
- String fontStrHash = getTextHashCode(font, str, fontSize);
- GlyphString glyphString = strings.get(fontStrHash);
+ GlyphString glyphString = getCachedGlyphString(font, str, fontSize);
if(null == glyphString) {
glyphString = createString(gl, font, fontSize, str, mgl_sharpness.floatValue());
- strings.put(fontStrHash, glyphString);
+ addCachedGlyphString(font, str, fontSize, glyphString);
}
glyphString.renderString3D(pmvMatrix, vp_width, vp_height, texSize);