aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogamp/graph/font
diff options
context:
space:
mode:
authorRami Santina <[email protected]>2011-03-25 12:00:55 +0200
committerRami Santina <[email protected]>2011-03-25 12:00:55 +0200
commit526af50c03af2e00a028caf4b8504e6c3f3c4221 (patch)
tree69b63713bc99051f26bb7ca172ed5464fec13485 /src/jogamp/graph/font
parentb01b243241635ab4d210aa88cdbff6cc5713a815 (diff)
Refactored Vertex Point PointTex GraphPoint namings
Vertex class --> SVertex (Simple vertex wwhere memory impl is float[]) Point interface --> Vertex (which combines in it PointTex Interface) GraphPoint --> GraphVertex
Diffstat (limited to 'src/jogamp/graph/font')
-rw-r--r--src/jogamp/graph/font/typecast/TypecastFont.java10
-rw-r--r--src/jogamp/graph/font/typecast/TypecastFontFactory.java8
-rw-r--r--src/jogamp/graph/font/typecast/TypecastRenderer.java6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/jogamp/graph/font/typecast/TypecastFont.java b/src/jogamp/graph/font/typecast/TypecastFont.java
index d054635e4..b44a7d86b 100644
--- a/src/jogamp/graph/font/typecast/TypecastFont.java
+++ b/src/jogamp/graph/font/typecast/TypecastFont.java
@@ -44,13 +44,13 @@ import net.java.dev.typecast.ot.table.ID;
import com.jogamp.common.util.IntObjectHashMap;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.geom.AABBox;
-import com.jogamp.graph.geom.PointTex;
-import com.jogamp.graph.geom.Point;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.Vertex;
class TypecastFont implements FontInt {
static final boolean DEBUG = false;
- final Point.Factory<? extends PointTex> pointFactory;
+ final Vertex.Factory<? extends Vertex> pointFactory;
final OTFontCollection fontset;
final OTFont font;
final int size;
@@ -60,7 +60,7 @@ class TypecastFont implements FontInt {
// final IntIntHashMap char2Code;
IntObjectHashMap char2Glyph;
- public static TypecastFont create(Point.Factory<? extends PointTex> factory, String name, int size) {
+ public static TypecastFont create(Vertex.Factory<? extends Vertex> factory, String name, int size) {
String path = JavaFontLoader.getByName(name);
OTFontCollection fontset;
try {
@@ -72,7 +72,7 @@ class TypecastFont implements FontInt {
return null;
}
- public TypecastFont(Point.Factory<? extends PointTex> factory, OTFontCollection fontset, int size) {
+ public TypecastFont(Vertex.Factory<? extends Vertex> factory, OTFontCollection fontset, int size) {
this.pointFactory = factory;
this.fontset = fontset;
this.font = fontset.getFont(0);
diff --git a/src/jogamp/graph/font/typecast/TypecastFontFactory.java b/src/jogamp/graph/font/typecast/TypecastFontFactory.java
index f66772029..6179986fe 100644
--- a/src/jogamp/graph/font/typecast/TypecastFontFactory.java
+++ b/src/jogamp/graph/font/typecast/TypecastFontFactory.java
@@ -32,15 +32,15 @@ import java.util.Map;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.font.FontFactory;
-import com.jogamp.graph.geom.Point.Factory;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex.Factory;
+import com.jogamp.graph.geom.Vertex;
public class TypecastFontFactory implements FontFactory {
Map<String, Font> fonts = new HashMap<String, Font>();
- public Font createFont(Factory<? extends PointTex> factory, String name, int size) {
+ public Font createFont(Factory<? extends Vertex> factory, String name, int size) {
Font result = fonts.get(name + ":"+size);
if (result == null) {
result = TypecastFont.create(factory, name, size);
@@ -52,7 +52,7 @@ public class TypecastFontFactory implements FontFactory {
}
- public Font createFont(Factory<? extends PointTex> factory,
+ public Font createFont(Factory<? extends Vertex> factory,
String[] families,
String style,
String variant,
diff --git a/src/jogamp/graph/font/typecast/TypecastRenderer.java b/src/jogamp/graph/font/typecast/TypecastRenderer.java
index 3813eb474..74e5cd604 100644
--- a/src/jogamp/graph/font/typecast/TypecastRenderer.java
+++ b/src/jogamp/graph/font/typecast/TypecastRenderer.java
@@ -31,8 +31,8 @@ import jogamp.graph.geom.plane.AffineTransform;
import jogamp.graph.geom.plane.Path2D;
import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.PointTex;
-import com.jogamp.graph.geom.Point.Factory;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.Vertex.Factory;
import net.java.dev.typecast.ot.Point;
import net.java.dev.typecast.ot.OTGlyph;
@@ -43,7 +43,7 @@ import net.java.dev.typecast.ot.OTGlyph;
*/
public class TypecastRenderer {
- public static void getOutline(Factory<? extends PointTex> factory, TypecastFont font,
+ public static void getOutline(Factory<? extends Vertex> factory, TypecastFont font,
String string, AffineTransform transform, Path2D[] p)
{
if (string == null) {