some additions to the PLG.Tessellator interface

codeanticode · codeanticode · commit 4aa30ed85792 · 2018-01-13T14:16:02.000-05:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -2674,12 +2674,17 @@ protected static void fillFloatBuffer(FloatBuffer buf, int i0, int i1,
 
 
   protected interface Tessellator {
+    public void setCallback(int flag);
+    public void setWindingRule(int rule);
+    public void setProperty(int property, int value);
+
     public void beginPolygon();
+    public void beginPolygon(Object data);
     public void endPolygon();
-    public void setWindingRule(int rule);
     public void beginContour();
     public void endContour();
     public void addVertex(double[] v);
+    public void addVertex(double[] v, int n, Object data);
   }
 
 
@@ -2791,6 +2796,7 @@ protected interface FontOutline {
 
   public static int TESS_WINDING_NONZERO;
   public static int TESS_WINDING_ODD;
+  public static int TESS_EDGE_FLAG;
 
   public static int GENERATE_MIPMAP_HINT;
   public static int FASTEST;
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -600,19 +600,33 @@ public Tessellator(TessellatorCallback callback) {
       GLU.gluTessCallback(tess, GLU.GLU_TESS_ERROR, gluCallback);
     }
 
+    @Override
+    public void setCallback(int flag) {
+      GLU.gluTessCallback(tess, flag, gluCallback);
+    }
+
+    @Override
+    public void setWindingRule(int rule) {
+      setProperty(GLU.GLU_TESS_WINDING_RULE, rule);
+    }
+
+    public void setProperty(int property, int value) {
+      GLU.gluTessProperty(tess, property, value);
+    }
+
     @Override
     public void beginPolygon() {
-      GLU.gluTessBeginPolygon(tess, null);
+      beginPolygon(null);
     }
 
     @Override
-    public void endPolygon() {
-      GLU.gluTessEndPolygon(tess);
+    public void beginPolygon(Object data) {
+      GLU.gluTessBeginPolygon(tess, data);
     }
 
     @Override
-    public void setWindingRule(int rule) {
-      GLU.gluTessProperty(tess, GLU.GLU_TESS_WINDING_RULE, rule);
+    public void endPolygon() {
+      GLU.gluTessEndPolygon(tess);
     }
 
     @Override
@@ -627,7 +641,12 @@ public void endContour() {
 
     @Override
     public void addVertex(double[] v) {
-      GLU.gluTessVertex(tess, v, 0, v);
+      addVertex(v, 0, v);
+    }
+
+    @Override
+    public void addVertex(double[] v, int n, Object data) {
+      GLU.gluTessVertex(tess, v, n, data);
     }
 
     protected class GLUCallback extends GLUtessellatorCallbackAdapter {
@@ -752,6 +771,7 @@ public void next() {
 
     TESS_WINDING_NONZERO = GLU.GLU_TESS_WINDING_NONZERO;
     TESS_WINDING_ODD     = GLU.GLU_TESS_WINDING_ODD;
+    TESS_EDGE_FLAG       = GLU.GLU_TESS_EDGE_FLAG;
 
     GENERATE_MIPMAP_HINT = GL.GL_GENERATE_MIPMAP_HINT;
     FASTEST              = GL.GL_FASTEST;
