aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/jogamp/graph/curve/text
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/com/jogamp/graph/curve/text
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/com/jogamp/graph/curve/text')
-rw-r--r--src/com/jogamp/graph/curve/text/HwTextRenderer.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/com/jogamp/graph/curve/text/HwTextRenderer.java b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
index 61d8309c7..bbe62f158 100644
--- a/src/com/jogamp/graph/curve/text/HwTextRenderer.java
+++ b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
@@ -48,9 +48,8 @@ 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.Point;
-import com.jogamp.graph.geom.PointTex;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
import jogamp.opengl.Debug;
import com.jogamp.opengl.util.PMVMatrix;
import com.jogamp.opengl.util.glsl.ShaderCode;
@@ -100,28 +99,28 @@ public class HwTextRenderer {
private GLContext context;
private FloatBuffer color = FloatBuffer.allocate(3);
private HashMap<String, GlyphString> strings = new HashMap<String, GlyphString>();
- private final Point.Factory<? extends PointTex> pointFactory;
+ private final Vertex.Factory<? extends Vertex> pointFactory;
int win_width = 0;
int win_height = 0;
/** Create a Hardware accelerated Text Renderer
* @param context OpenGL rendering context
- * @param factory optional Point.Factory for PointTex construction. Default is Vertex.Factory.
+ * @param factory optional Point.Factory for Vertex construction. Default is Vertex.Factory.
*/
- public HwTextRenderer(GLContext context, Point.Factory<? extends PointTex> factory, int type) {
- this.pointFactory = (null != factory) ? factory : Vertex.factory();
+ public HwTextRenderer(GLContext context, Vertex.Factory<? extends Vertex> factory, int type) {
+ this.pointFactory = (null != factory) ? factory : SVertex.factory();
this.context = context;
this.regionType = type;
init(context, 0.5f);
}
- public Font createFont(Point.Factory<? extends PointTex> factory, String name, int size) {
+ public Font createFont(Vertex.Factory<? extends Vertex> factory, String name, int size) {
return fontFactory.createFont(factory, name, size);
}
- public Font createFont(Point.Factory<? extends PointTex> factory,
+ public Font createFont(Vertex.Factory<? extends Vertex> factory,
String[] families,
String style,
String variant,