diff options
author | Sven Gothel <[email protected]> | 2011-03-29 14:29:50 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-03-29 14:29:50 +0200 |
commit | 4ed4dc3847d8d53a3424011f3d56b00ef246a81e (patch) | |
tree | a086b3800ba824f71ffa76aa7a946aa81a90833c | |
parent | 2a3a260aece0060f5aa03d83a177d3f373664324 (diff) |
Refactor / Use font name as file path, if not a java font
-rw-r--r-- | src/com/jogamp/graph/curve/HwTextRenderer.java (renamed from src/com/jogamp/graph/curve/text/HwTextRenderer.java) | 3 | ||||
-rw-r--r-- | src/demo/GPUTextGLListenerBase01.java | 2 | ||||
-rw-r--r-- | src/jogamp/graph/font/typecast/TypecastFont.java | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/com/jogamp/graph/curve/text/HwTextRenderer.java b/src/com/jogamp/graph/curve/HwTextRenderer.java index f30f42cc5..c5f11d522 100644 --- a/src/com/jogamp/graph/curve/text/HwTextRenderer.java +++ b/src/com/jogamp/graph/curve/HwTextRenderer.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.curve.text; +package com.jogamp.graph.curve; import java.nio.FloatBuffer; import java.util.HashMap; @@ -43,7 +43,6 @@ import jogamp.graph.geom.plane.AffineTransform; import jogamp.graph.geom.plane.Path2D; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.graph.curve.Region; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontFactory; import com.jogamp.graph.geom.Vertex; diff --git a/src/demo/GPUTextGLListenerBase01.java b/src/demo/GPUTextGLListenerBase01.java index 1b2dd7e17..4e3a57fd9 100644 --- a/src/demo/GPUTextGLListenerBase01.java +++ b/src/demo/GPUTextGLListenerBase01.java @@ -37,7 +37,7 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLException; import javax.media.opengl.GLPipelineFactory; -import com.jogamp.graph.curve.text.HwTextRenderer; +import com.jogamp.graph.curve.HwTextRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.geom.Vertex; import com.jogamp.newt.event.KeyEvent; diff --git a/src/jogamp/graph/font/typecast/TypecastFont.java b/src/jogamp/graph/font/typecast/TypecastFont.java index b95dccf21..c5e291a55 100644 --- a/src/jogamp/graph/font/typecast/TypecastFont.java +++ b/src/jogamp/graph/font/typecast/TypecastFont.java @@ -59,6 +59,9 @@ class TypecastFont implements FontInt { public static TypecastFont create(Vertex.Factory<? extends Vertex> factory, String name) { String path = JavaFontLoader.getByName(name); + if(null == path) { + path = name; + } OTFontCollection fontset; try { fontset = OTFontCollection.create(new File(path)); |