Merge pull request processing#2649 from JakubValtar/shape-fix

codeanticode · codeanticode · commit c7b60b85f315 · 2014-08-04T15:45:14.000-04:00
Corrected a typo in Tessellator#addQuadraticVertex()
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -1867,7 +1867,7 @@ protected void bezierVertexCheck(int shape, int vertexCount) {
                                  "must be used before bezierVertex() or quadraticVertex()");
     }
     if (vertexCount == 0) {
-      throw new RuntimeException("vertex() must be used at least once" +
+      throw new RuntimeException("vertex() must be used at least once " +
                                  "before bezierVertex() or quadraticVertex()");
     }
   }
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -3056,6 +3056,7 @@ public void bezierVertex(float x2, float y2, float z2,
   protected void bezierVertexImpl(float x2, float y2, float z2,
                                   float x3, float y3, float z3,
                                   float x4, float y4, float z4) {
+    bezierVertexCheck(shape, inGeo.vertexCount);
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                       ambientColor, specularColor, emissiveColor, shininess);
     inGeo.setNormal(normalX, normalY, normalZ);
@@ -3083,6 +3084,7 @@ public void quadraticVertex(float cx, float cy, float cz,
 
   protected void quadraticVertexImpl(float cx, float cy, float cz,
                                      float x3, float y3, float z3) {
+    bezierVertexCheck(shape, inGeo.vertexCount);
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                       ambientColor, specularColor, emissiveColor, shininess);
     inGeo.setNormal(normalX, normalY, normalZ);
@@ -3109,6 +3111,7 @@ public void curveVertex(float x, float y, float z) {
 
 
   protected void curveVertexImpl(float x, float y, float z) {
+    curveVertexCheck(shape);
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                       ambientColor, specularColor, emissiveColor, shininess);
     inGeo.setNormal(normalX, normalY, normalZ);
@@ -11582,7 +11585,7 @@ void addBezierVertex(int i) {
     void addQuadraticVertex(int i) {
       pg.curveVertexCount = 0;
       pg.bezierInitCheck();
-      pg.bezierVertexCheck(pg.shape, i);
+      pg.bezierVertexCheck(POLYGON, i);
 
       PMatrix3D draw = pg.bezierDrawMatrix;
 

Original file line number	Diff line number	Diff line change
`@@ -1867,7 +1867,7 @@ protected void bezierVertexCheck(int shape, int vertexCount) {`
`1867`	`1867`	`"must be used before bezierVertex() or quadraticVertex()");`
`1868`	`1868`	`}`
`1869`	`1869`	`if (vertexCount == 0) {`
`1870`		`- throw new RuntimeException("vertex() must be used at least once" +`
	`1870`	`+ throw new RuntimeException("vertex() must be used at least once " +`
`1871`	`1871`	`"before bezierVertex() or quadraticVertex()");`
`1872`	`1872`	`}`
`1873`	`1873`	`}`