aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java2
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java2
-rw-r--r--src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java3
-rw-r--r--src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java45
-rw-r--r--src/jogl/classes/jogamp/graph/curve/text/GlyphString.java47
-rw-r--r--src/jogl/classes/jogamp/graph/font/FontInt.java6
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java16
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java6
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java44
9 files changed, 115 insertions, 56 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
index 31ad974d0..51198fd75 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -94,7 +94,7 @@ public class RegionRendererImpl01 extends RegionRenderer {
}
@Override
- protected void drawImpl(GL2ES2 gl, Region region, float[] position, int[] texSize) {
+ protected void drawImpl(GL2ES2 gl, Region region, int[] texSize) {
((GLRegion)region).draw(gl, rs, vp_width, vp_height, texSize);
}
}
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
index 4ec4d1d98..c3c7e0cac 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
@@ -93,7 +93,7 @@ public class TextRendererImpl01 extends TextRenderer {
}
@Override
- public void drawString3D(GL2ES2 gl, Font font, String str, float[] position, int fontSize, int[/*1*/] texSize) {
+ public void drawString3D(GL2ES2 gl, Font font, String str, int fontSize, int[/*1*/] texSize) {
if(!isInitialized()){
throw new GLException("TextRendererImpl01: not initialized!");
}
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
index a60f91b87..f0910c465 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
@@ -128,8 +128,9 @@ public class CDTriangulator2D implements Triangulator{
}
}
Triangle tri = loop.cut(true);
- if(tri != null)
+ if(tri != null) {
triangles.add(tri);
+ }
}
return triangles;
}
diff --git a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
index ff46c3338..8c214dd0b 100644
--- a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
+++ b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
@@ -29,71 +29,84 @@ package jogamp.graph.curve.text;
import java.util.ArrayList;
+import com.jogamp.graph.font.Font.Glyph;
import com.jogamp.graph.geom.Vertex;
import com.jogamp.graph.geom.Triangle;
import com.jogamp.graph.geom.Vertex.Factory;
-
import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.opengl.math.Quaternion;
+// import com.jogamp.opengl.math.Quaternion;
public class GlyphShape {
- private Quaternion quat= null;
- private OutlineShape shape = null;
+ // private Quaternion quat= null;
+ private Glyph glyph;
+ private OutlineShape shape;
/** Create a new Glyph shape
* based on Parametric curve control polyline
*/
public GlyphShape(Vertex.Factory<? extends Vertex> factory){
- shape = new OutlineShape(factory);
+ this.shape = new OutlineShape(factory);
+ this.glyph = null;
}
/** Create a new GlyphShape from a {@link OutlineShape}
* @param factory vertex impl factory {@link Factory}
* @param shape {@link OutlineShape} representation of the Glyph
*/
- public GlyphShape(Vertex.Factory<? extends Vertex> factory, OutlineShape shape){
+ public GlyphShape(Vertex.Factory<? extends Vertex> factory, Glyph glyph, OutlineShape shape){
this(factory);
this.shape = shape;
this.shape.transformOutlines(OutlineShape.VerticesState.QUADRATIC_NURBS);
+ this.glyph = glyph;
+ }
+
+ public final void destroy() {
+ shape.clear();
+ shape = null;
+ glyph = null;
}
public final Vertex.Factory<? extends Vertex> vertexFactory() { return shape.vertexFactory(); }
- public OutlineShape getShape() {
+ public final Glyph getGlyph() {
+ return glyph;
+ }
+
+ public final OutlineShape getShape() {
return shape;
}
- public int getNumVertices() {
+ public final int getNumVertices() {
return shape.getVertices().size();
}
- /** Get the rotational Quaternion attached to this Shape
+ /** Get the rotational quaternion attached to this Shape.
* @return the Quaternion Object
- */
- public Quaternion getQuat() {
+ public final Quaternion getQuat() {
return quat;
}
- /** Set the Quaternion that shall defien the rotation
+ /**
+ * Set the Quaternion that shall define the rotation
* of this shape.
* @param quat
- */
- public void setQuat(Quaternion quat) {
+ public final void setQuat(Quaternion quat) {
this.quat = quat;
}
+ */
/** Triangluate the glyph shape
* @return ArrayList of triangles which define this shape
*/
- public ArrayList<Triangle> triangulate(){
+ public final ArrayList<Triangle> triangulate(){
return shape.triangulate();
}
/** Get the list of Vertices of this Object
* @return arrayList of Vertices
*/
- public ArrayList<Vertex> getVertices(){
+ public final ArrayList<Vertex> getVertices(){
return shape.getVertices();
}
}
diff --git a/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java b/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
index 2284ab669..5fb547e69 100644
--- a/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
+++ b/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
@@ -28,6 +28,7 @@
package jogamp.graph.curve.text;
import java.util.ArrayList;
+import java.util.List;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.geom.Vertex;
@@ -38,7 +39,7 @@ import com.jogamp.graph.geom.opengl.SVertex;
import javax.media.opengl.GL2ES2;
import jogamp.graph.curve.opengl.RegionFactory;
-import jogamp.graph.font.FontInt;
+import jogamp.graph.geom.plane.AffineTransform;
import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.curve.Region;
@@ -47,18 +48,23 @@ import com.jogamp.graph.curve.opengl.RenderState;
import com.jogamp.opengl.math.geom.AABBox;
import com.jogamp.opengl.util.PMVMatrix;
+/**
+ * @deprecated use {@link com.jogamp.graph.font.Font#getOutlineShapes(java.util.List, CharSequence, float, Factory)},
+ * {@link com.jogamp.graph.curve.Region#create(OutlineShape, int)}
+ * and a {@link com.jogamp.graph.curve.opengl.RegionRenderer}.
+ */
public class GlyphString {
/** Static font size for all default font OutlineShape generations via {@link #createString(OutlineShape, Factory, Font, String)}.
* <p>The actual font size shall be accomplished by the GL PMV matrix.</p>
*/
public static final int STATIC_FONT_SIZE = 10;
- private ArrayList<GlyphShape> glyphs = new ArrayList<GlyphShape>();
- private CharSequence str;
- private String fontname;
+ private final ArrayList<GlyphShape> glyphs = new ArrayList<GlyphShape>();
+ private final CharSequence str;
+ private final String fontname;
private GLRegion region;
- private SVertex origin = new SVertex();
+ private final SVertex origin = new SVertex();
/**
* <p>Uses {@link #STATIC_FONT_SIZE}.</p>
@@ -84,11 +90,11 @@ public class GlyphString {
* @param str string text
* @return the created {@link GlyphString} instance
*/
- public static GlyphString createString(OutlineShape shape, Factory<? extends Vertex> vertexFactory, Font font, int fontSize, String str) {
- ArrayList<OutlineShape> shapes = ((FontInt)font).getOutlineShapes(str, fontSize, vertexFactory);
+ public static GlyphString createString(OutlineShape shape, Factory<? extends Vertex> vertexFactory, Font font, int fontSize, CharSequence str) {
+ List<OutlineShape> shapes = font.getOutlineShapes(null, str, fontSize, vertexFactory);
GlyphString glyphString = new GlyphString(font.getName(Font.NAME_UNIQUNAME), str);
- glyphString.createfromOutlineShapes(vertexFactory, shapes);
+ glyphString.createfromOutlineShapes(vertexFactory, font, str, shapes);
if(null != shape) {
for(int i=0; i<glyphString.glyphs.size(); i++) {
shape.addOutlineShape(glyphString.glyphs.get(i).getShape());
@@ -119,13 +125,18 @@ public class GlyphString {
* @param vertexFactory vertex impl factory {@link Factory}
* @param shapes list of {@link OutlineShape}
*/
- public void createfromOutlineShapes(Factory<? extends Vertex> vertexFactory, ArrayList<OutlineShape> shapes) {
+ public void createfromOutlineShapes(Factory<? extends Vertex> vertexFactory, Font font, CharSequence str, List<OutlineShape> shapes) {
+ if(shapes.size() != str.length()) {
+ throw new InternalError("XXX");
+ }
final int numGlyps = shapes.size();
for (int index=0;index<numGlyps;index++){
if(shapes.get(index) == null){
continue;
}
- GlyphShape glyphShape = new GlyphShape(vertexFactory, shapes.get(index));
+ GlyphShape glyphShape = new GlyphShape(vertexFactory,
+ font.getGlyph(str.charAt(index)),
+ shapes.get(index));
if(glyphShape.getNumVertices() < 3) {
continue;
@@ -143,20 +154,30 @@ public class GlyphString {
public GLRegion createRegion(GL2ES2 gl, int renderModes){
region = RegionFactory.create(renderModes);
// region.setFlipped(true);
+ float y = 0;
+ float advanceTotal = 0;
+ AffineTransform t = new AffineTransform();
int numVertices = region.getNumVertices();
for(int i=0; i< glyphs.size(); i++) {
- final GlyphShape glyph = glyphs.get(i);
- ArrayList<Triangle> gtris = glyph.triangulate();
+ final GlyphShape glyphShape = glyphs.get(i);
+ Font.Metrics metrics = glyphShape.getGlyph().getFont().getMetrics();
+ final float scale = metrics.getScale(STATIC_FONT_SIZE);
+ t.translate(advanceTotal, y);
+ t.scale(scale, scale);
+
+ ArrayList<Triangle> gtris = glyphShape.triangulate();
region.addTriangles(gtris);
- final ArrayList<Vertex> gVertices = glyph.getVertices();
+ final ArrayList<Vertex> gVertices = glyphShape.getVertices();
for(int j=0; j<gVertices.size(); j++) {
final Vertex gVert = gVertices.get(j);
gVert.setId(numVertices++);
region.addVertex(gVert);
}
+
+ advanceTotal += glyphShape.getGlyph().getAdvance(STATIC_FONT_SIZE, true);
}
return region;
}
diff --git a/src/jogl/classes/jogamp/graph/font/FontInt.java b/src/jogl/classes/jogamp/graph/font/FontInt.java
index 4366724ad..1f4eaf20d 100644
--- a/src/jogl/classes/jogamp/graph/font/FontInt.java
+++ b/src/jogl/classes/jogamp/graph/font/FontInt.java
@@ -27,14 +27,9 @@
*/
package jogamp.graph.font;
-import java.util.ArrayList;
-
import jogamp.graph.geom.plane.Path2D;
-import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.font.Font;
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.geom.Vertex.Factory;
public interface FontInt extends Font {
@@ -43,5 +38,4 @@ public interface FontInt extends Font {
public Path2D getPath(float pixelSize);
}
- public ArrayList<OutlineShape> getOutlineShapes(CharSequence string, float pixelSize, Factory<? extends Vertex> vertexFactory);
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
index 67ae6c387..250778f06 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
@@ -27,7 +27,7 @@
*/
package jogamp.graph.font.typecast;
-import java.util.ArrayList;
+import java.util.List;
import jogamp.graph.font.FontInt;
import jogamp.graph.font.typecast.ot.OTFont;
@@ -44,7 +44,6 @@ import com.jogamp.common.util.IntObjectHashMap;
import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.font.FontFactory;
-import com.jogamp.graph.font.Font.Glyph;
import com.jogamp.graph.geom.Vertex;
import com.jogamp.graph.geom.Vertex.Factory;
import com.jogamp.opengl.math.geom.AABBox;
@@ -140,7 +139,7 @@ class TypecastFont implements FontInt {
for (int j = range.getStartCode(); j <= range.getEndCode(); ++j) {
final int code = cmapFormat.mapCharCode(j);
if(code < 15) {
- System.err.println(" char: " + (int)j + " ( " + (char)j +" ) -> " + code);
+ System.err.println(" char: " + j + " ( " + (char)j +" ) -> " + code);
}
}
}
@@ -205,7 +204,7 @@ class TypecastFont implements FontInt {
Path2D path = TypecastRenderer.buildPath(glyph);
result = new TypecastGlyph(this, symbol, code, glyph.getBBox(), glyph.getAdvanceWidth(), path);
if(DEBUG) {
- System.err.println("New glyph: " + (int)symbol + " ( " + (char)symbol +" ) -> " + code + ", contours " + glyph.getPointCount() + ": " + path);
+ System.err.println("New glyph: " + (int)symbol + " ( " + symbol +" ) -> " + code + ", contours " + glyph.getPointCount() + ": " + path);
}
final HdmxTable hdmx = font.getHdmxTable();
if (null!= result && null != hdmx) {
@@ -227,9 +226,14 @@ class TypecastFont implements FontInt {
}
@Override
- public ArrayList<OutlineShape> getOutlineShapes(CharSequence string, float pixelSize, Factory<? extends Vertex> vertexFactory) {
+ public OutlineShape getOutlineShape(Glyph glyph, Factory<? extends Vertex> vertexFactory) {
+ return TypecastRenderer.getOutlineShape(this, glyph, vertexFactory);
+ }
+
+ @Override
+ public List<OutlineShape> getOutlineShapes(List<OutlineShape> shapes, CharSequence string, float pixelSize, Factory<? extends Vertex> vertexFactory) {
AffineTransform transform = new AffineTransform(vertexFactory);
- return TypecastRenderer.getOutlineShapes(this, string, pixelSize, transform, vertexFactory);
+ return TypecastRenderer.getOutlineShapes(shapes, this, string, pixelSize, transform, vertexFactory);
}
@Override
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
index 574aeb86d..302366647 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
@@ -237,4 +237,10 @@ public class TypecastGlyph implements FontInt.GlyphInt {
}
return this.pathSized;
}
+
+ public int hashCode() {
+ // 31 * x == (x << 5) - x
+ int hash = 31 + font.getName(Font.NAME_UNIQUNAME).hashCode();
+ return ((hash << 5) - hash) + id;
+ }
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
index 127e260ca..d7f8497b3 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
@@ -28,6 +28,7 @@
package jogamp.graph.font.typecast;
import java.util.ArrayList;
+import java.util.List;
import jogamp.graph.font.FontInt.GlyphInt;
import jogamp.graph.font.typecast.ot.OTGlyph;
@@ -64,9 +65,10 @@ public class TypecastRenderer {
}
AffineTransform t = new AffineTransform();
+ final int len = string.length();
float advanceY = lineGap - descent + ascent;
float y = 0;
- for (int i=0; i<string.length(); i++)
+ for (int i=0; i<len; i++)
{
p[i] = new Path2D();
p[i].reset();
@@ -75,26 +77,44 @@ public class TypecastRenderer {
if (character == '\n') {
y += advanceY;
advanceTotal = 0;
- continue;
} else if (character == ' ') {
advanceTotal += font.getAdvanceWidth(Glyph.ID_SPACE, pixelSize);
- continue;
+ } else {
+ final Glyph glyph = font.getGlyph(character);
+ final Path2D gp = ((GlyphInt)glyph).getPath();
+ final float scale = metrics.getScale(pixelSize);
+ t.translate(advanceTotal, y);
+ t.scale(scale, scale);
+ p[i].append(gp.iterator(t), false);
+ advanceTotal += glyph.getAdvance(pixelSize, true);
+ }
+ }
+ }
+
+ public static OutlineShape getOutlineShape(TypecastFont font, Glyph glyph, Factory<? extends Vertex> vertexFactory) {
+ Path2D path = ((GlyphInt)glyph).getPath();
+ AffineTransform transform = new AffineTransform(vertexFactory);
+ OutlineShape shape = new OutlineShape(vertexFactory);
+
+ PathIterator iterator = path.iterator(transform);
+ if(null != iterator){
+ while(!iterator.isDone()){
+ float[] coords = new float[6];
+ int segmentType = iterator.currentSegment(coords);
+ addPathVertexToOutline(shape, vertexFactory, coords, segmentType);
+ iterator.next();
}
- Glyph glyph = font.getGlyph(character);
- Path2D gp = ((GlyphInt)glyph).getPath();
- float scale = metrics.getScale(pixelSize);
- t.translate(advanceTotal, y);
- t.scale(scale, scale);
- p[i].append(gp.iterator(t), false);
- advanceTotal += glyph.getAdvance(pixelSize, true);
}
+ return shape;
}
- public static ArrayList<OutlineShape> getOutlineShapes(TypecastFont font, CharSequence string, float pixelSize, AffineTransform transform, Factory<? extends Vertex> vertexFactory) {
+ public static List<OutlineShape> getOutlineShapes(List<OutlineShape> shapes, TypecastFont font, CharSequence string, float pixelSize, AffineTransform transform, Factory<? extends Vertex> vertexFactory) {
Path2D[] paths = new Path2D[string.length()];
getPaths(font, string, pixelSize, transform, paths);
- ArrayList<OutlineShape> shapes = new ArrayList<OutlineShape>();
+ if(null == shapes) {
+ shapes = new ArrayList<OutlineShape>();
+ }
final int numGlyps = paths.length;
for (int index=0;index<numGlyps;index++) {
if(paths[index] == null){