GoToLoop
diff --git a/‎candy/.settings/org.eclipse.jdt.core.prefs‎
Lines changed: 257 additions & 1 deletion b/‎candy/.settings/org.eclipse.jdt.core.prefs‎
Lines changed: 257 additions & 1 deletion
diff --git a/‎candy/.settings/org.eclipse.jdt.ui.prefs‎
Lines changed: 6 additions & 0 deletions b/‎candy/.settings/org.eclipse.jdt.ui.prefs‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎core/src/processing/core/PApplet.java‎
Lines changed: 6 additions & 0 deletions b/‎core/src/processing/core/PApplet.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎core/src/processing/core/PGraphics.java‎
Lines changed: 14 additions & 10 deletions b/‎core/src/processing/core/PGraphics.java‎
Lines changed: 14 additions & 10 deletions
@@ -0,0 +1,6 @@
+#Wed Oct 08 15:50:01 EDT 2008
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_two spaces no tabs
+formatter_settings_version=11
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
@@ -7227,6 +7227,12 @@ public void resetMatrix() {
   }
 
 
+  public void applyMatrix(PMatrix source) {
+    if (recorder != null) recorder.applyMatrix(source);
+    g.applyMatrix(source);
+  }
+
+
   public void applyMatrix(PMatrix2D source) {
     if (recorder != null) recorder.applyMatrix(source);
     g.applyMatrix(source);
 
@@ -566,7 +566,7 @@ public class PGraphics extends PImage implements PConstants {
   protected int normalMode;
 
   /// Keep track of how many calls to normal, to determine the mode. 
-  protected int normalCount;
+  //protected int normalCount;
 
   /** Current normal vector. */
   public float normalX, normalY, normalZ;
@@ -999,6 +999,7 @@ protected void vertexCheck() {
 
 
   public void vertex(float x, float y) {
+    vertexCheck();
     float[] vertex = vertices[vertexCount];
 
     curveVertexCount = 0;
@@ -1033,6 +1034,7 @@ public void vertex(float x, float y) {
 
 
   public void vertex(float x, float y, float z) {
+    vertexCheck();
     float[] vertex = vertices[vertexCount];
 
     // only do this if we're using an irregular (POLYGON) shape that
@@ -1063,8 +1065,13 @@ public void vertex(float x, float y, float z) {
 
     vertex[EDGE] = edge ? 1 : 0;
 
-    if (fill) {
-      if (textureImage != null) {
+    if (fill || textureImage != null) {
+      if (textureImage == null) {
+        vertex[R] = fillR;
+        vertex[G] = fillG;
+        vertex[B] = fillB;
+        vertex[A] = fillA;
+      } else {
         if (tint) {
           vertex[R] = tintR;
           vertex[G] = tintG;
@@ -1076,11 +1083,6 @@ public void vertex(float x, float y, float z) {
           vertex[B] = 1;
           vertex[A] = 1;
         }
-      } else {
-        vertex[R] = fillR;
-        vertex[G] = fillG;
-        vertex[B] = fillB;
-        vertex[A] = fillA;
       }
 
       vertex[AR] = ambientR;
@@ -1903,7 +1905,8 @@ public void sphere(float r) {
 
     pushMatrix();
     scale(r);
-
+    edge(false);
+    
     // 1st ring from south pole
     beginShape(TRIANGLE_STRIP);
     for (int i = 0; i < sphereDetailU; i++) {
@@ -1957,7 +1960,8 @@ public void sphere(float r) {
     normal(0, 1, 0);
     vertex(0, 1, 0);
     endShape();
-    
+
+    edge(true);
     popMatrix();
   }