save the sphere detail from the renderer when creating a PShape (or pass

codeanticode · codeanticode · commit 877ab3608baa · 2013-08-25T13:54:12.000-04:00
it as a parameter to createShape)
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
@@ -166,6 +166,8 @@ public class PShape implements PConstants {
   protected int emissiveColor;
   protected float shininess;
 
+  protected int sphereDetailU, sphereDetailV;
+
   /** Temporary toggle for whether styles should be honored. */
   protected boolean style = true;
 
diff --git a/core/src/processing/opengl/PGraphics3D.java b/core/src/processing/opengl/PGraphics3D.java
@@ -277,7 +277,7 @@ static protected PShapeOpenGL createShapeImpl(PApplet parent,
       shape = new PShapeOpenGL(parent, PShape.PRIMITIVE);
       shape.setKind(BOX);
     } else if (kind == SPHERE) {
-      if (len != 1) {
+      if (len < 1 || 3 < len) {
         showWarning("Wrong number of parameters");
         return null;
       }
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -330,6 +330,9 @@ public PShapeOpenGL(PApplet parent, int family) {
     emissiveColor = pg.emissiveColor;
     shininess = pg.shininess;
 
+    sphereDetailU = pg.sphereDetailU;
+    sphereDetailV = pg.sphereDetailV;
+
     normalX = normalY = 0;
     normalZ = 1;
 
@@ -2787,12 +2790,17 @@ protected void tessellateBox() {
 
 
   protected void tessellateSphere() {
-    // Getting sphere detail from renderer. Is this correct?
-    int nu = pg.sphereDetailU;
-    int nv = pg.sphereDetailV;
     float r = 0;
-    if (params.length == 1) {
+    int nu = sphereDetailU;
+    int nv = sphereDetailV;
+    if (1 <= params.length) {
       r = params[0];
+      if (params.length == 2) {
+        nu = nv = (int)params[1];
+      } else if (params.length == 3) {
+        nu = (int)params[1];
+        nv = (int)params[2];
+      }
     }
 
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ static protected PShapeOpenGL createShapeImpl(PApplet parent,`
`277`	`277`	`shape = new PShapeOpenGL(parent, PShape.PRIMITIVE);`
`278`	`278`	`shape.setKind(BOX);`
`279`	`279`	`} else if (kind == SPHERE) {`
`280`		`- if (len != 1) {`
	`280`	`+ if (len < 1 \|\| 3 < len) {`
`281`	`281`	`showWarning("Wrong number of parameters");`
`282`	`282`	`return null;`
`283`	`283`	`}`