more cleaning for legibility

Author: benfry

Demos/Graphics/RotatingArcs/RotatingArcs.pde

@@ -1,8 +1,8 @@
 /**
- * Geometry 
- * by Marius Watz. 
- * 
- * Using sin/cos, blends colors, and draws a series of 
+ * Geometry
+ * by Marius Watz.
+ *
+ * Using sin/cos, blends colors, and draws a series of
  * rotating arcs on the screen.
 */
 
@@ -11,33 +11,33 @@ final int COUNT = 150;
 float[] pt;
 int[] style;
 
- 
+
 void setup() {
   size(1024, 768, P3D);
   background(255);
   randomSeed(100);
-  
+
   pt = new float[6 * COUNT]; // rotx, roty, deg, rad, w, speed
   style = new int[2 * COUNT]; // color, render style
- 
+
   // Set up arc shapes
   int index = 0;
   for (int i = 0; i < COUNT; i++) {
     pt[index++] = random(TAU); // Random X axis rotation
     pt[index++] = random(TAU); // Random Y axis rotation
- 
+
     pt[index++] = random(60,80); // Short to quarter-circle arcs
     if (random(100) > 90) {
       pt[index] = floor(random(8,27)) * 10;
     }
- 
+
     pt[index++] = int(random(2,50)*5); // Radius. Space them out nicely
- 
+
     pt[index++] = random(4,32); // Width of band
     if (random(100) > 90) {
       pt[index] = random(40,60); // Width of band
     }
- 
+
     pt[index++] = radians(random(5,30)) / 5; // Speed of rotation
 
     /*
@@ -68,103 +68,101 @@ void setup() {
 }
 
 
-void draw() { 
+void draw() {
   background(0);
- 
+
   translate(width/2, height/2, 0);
-  rotateX(PI/6);
-  rotateY(PI/6);
- 
+  rotateX(PI / 6);
+  rotateY(PI / 6);
+
   int index = 0;
   for (int i = 0; i < COUNT; i++) {
     pushMatrix();
     rotateX(pt[index++]);
     rotateY(pt[index++]);
- 
+
     if (style[i*2+1] == 0) {
       stroke(style[i*2]);
       noFill();
       strokeWeight(1);
       arcLine(0, 0, pt[index++], pt[index++], pt[index++]);
-      
-    } else if(style[i*2+1]==1) {
+
+    } else if(style[i*2+1] == 1) {
       fill(style[i*2]);
       noStroke();
       arcLineBars(0, 0, pt[index++], pt[index++], pt[index++]);
-    
+
     } else {
       fill(style[i*2]);
       noStroke();
       arc(0, 0, pt[index++], pt[index++], pt[index++]);
     }
- 
+
     // increase rotation
-    pt[index-5] += pt[index]/10;
-    pt[index-4] += pt[index++]/20;
- 
+    pt[index-5] += pt[index] / 10;
+    pt[index-4] += pt[index++] / 20;
+
     popMatrix();
   }
 }
 
 
 // Get blend of two colors
-int colorBlended(float fract, 
+int colorBlended(float fract,
                  float r, float g, float b,
-                 float r2, float g2, float b2, float a) { 
-  r2 = (r2 - r);
-  g2 = (g2 - g);
-  b2 = (b2 - b);
-  
-  return color(r + r2 * fract, g + g2 * fract, b + b2 * fract, a);
+                 float r2, float g2, float b2, float a) {
+  return color(r + (r2 - r) * fract,
+               g + (g2 - g) * fract,
+               b + (b2 - b) * fract, a);
 }
 
- 
+
 // Draw arc line
 void arcLine(float x, float y, float degrees, float radius, float w) {
   int lineCount = floor(w/2);
- 
+
   for (int j = 0; j < lineCount; j++) {
     beginShape();
     for (int i = 0; i < degrees; i++) {  // one step for each degree
       float angle = radians(i);
-      vertex(x + radius*cos(angle), 
-             y + radius*sin(angle));
+      vertex(x + cos(angle) * radius,
+             y + sin(angle) * radius);
     }
     endShape();
     radius += 2;
   }
 }
 
- 
+
 // Draw arc line with bars
 void arcLineBars(float x, float y, float degrees, float radius, float w) {
   beginShape(QUADS);
   for (int i = 0; i < degrees/4; i += 4) {  // degrees, but in steps of 4
     float angle = radians(i);
-    vertex(x + radius * cos(angle), 
-           y + radius * sin(angle));
-    vertex(x + (radius+w) * cos(angle),
-           y + (radius+w) * sin(angle));
+    vertex(x + cos(angle) * radius,
+           y + sin(angle) * radius);
+    vertex(x + cos(angle) * (radius+w),
+           y + sin(angle) * (radius+w));
 
     angle = radians(i+2);
-    vertex(x + (radius+w) * cos(angle),
-           y + (radius+w) * sin(angle));
-    vertex(x + radius * cos(angle), 
-           y + radius * sin(angle));
+    vertex(x + cos(angle) * (radius+w),
+           y + sin(angle) * (radius+w));
+    vertex(x + cos(angle) * radius,
+           y + sin(angle) * radius);
   }
   endShape();
 }
 
- 
+
 // Draw solid arc
 void arc(float x, float y, float degrees, float radius, float w) {
   beginShape(QUAD_STRIP);
   for (int i = 0; i < degrees; i++) {
     float angle = radians(i);
-    vertex(x + radius * cos(angle),
-           y + radius * sin(angle));
-    vertex(x + (radius+w) * cos(angle),
-           y + (radius+w) * sin(angle));
+    vertex(x + cos(angle) * radius,
+           y + sin(angle) * radius);
+    vertex(x + cos(angle) * (radius+w),
+           y + sin(angle) * (radius+w));
   }
   endShape();
 }