tweaks and fixes

benfry · benfry · commit d2c19f0d736f · 2010-02-28T19:24:49.000Z
diff --git a/content/examples/Basics/Color/Reading/Reading.pde b/content/examples/Basics/Color/Reading/Reading.pde
@@ -5,38 +5,42 @@
  * The many colors of the image are created through modulating the 
  * red, green, and blue values. This is an exageration of an LCD display. 
  */
- 
+
 size(200, 200);
 noStroke();
 background(0);
 
 // Load an image from the data directory
-PImage c;
-c = loadImage("cait.jpg");
+PImage img = loadImage("cait.jpg");
+img.loadPixels();
 
-int xoff = 0;
-int yoff = 0;
-int p = 2;
-int pix = p*3;
+// figure out how big to make each block based on 
+// the sketch area and the size of the input image
+int eachW = width / img.width;
+int eachH = height / img.height;
+int each = min(eachW, eachH);
+// vertical stripes will be a third as wide
+int stripeW = each / 3;
+// make sure the block size is a multiple of 3
+each = 3 * stripeW;
 
+int left = (width - (img.width * each)) / 2;
+int top = (height - (img.height * each)) / 2;
 
-for(int i = 0; i < c.width*c.height; i += 1) 
-{  
-  int here = c.pixels[i];
-  
-  fill(red(here), 0, 0);
-  rect(xoff, yoff, p, pix);
-  
-  fill(0, green(here), 0);
-  rect(xoff+p, yoff, p, pix);
+for (int y = 0; y < img.height; y++) {
+  int y1 = top + y*each;
   
-  fill(0, 0, blue(here));
-  rect(xoff+p*2, yoff, p, pix);
-  
-  xoff+=pix;
-  if(xoff >= width-pix) {
-    xoff = 0;
-    yoff += pix;
+  for (int x = 0; x < img.width; x++) {
+    int pixel = img.get(x, y);
+    int x1 = left + x*each;
+    
+    fill(red(pixel), 0, 0);
+    rect(x1 + stripeW*0, y1, stripeW, each);
+    
+    fill(0, green(pixel), 0);
+    rect(x1 + stripeW*1, y1, stripeW, each);
+
+    fill(0, 0, blue(pixel));
+    rect(x1 + stripeW*2, y1, stripeW, each);
   }
 }
-
diff --git a/content/examples/Basics/Input/Clock/Clock.pde b/content/examples/Basics/Input/Clock/Clock.pde
@@ -4,36 +4,61 @@
  * The current time can be read with the second(), minute(), 
  * and hour() functions. In this example, sin() and cos() values
  * are used to set the position of the hands.
+ *
+ * Updated 27 February 2010 to handle size() changes.
  */
 
+int cx, cy;
+float secondsRadius;
+float minutesRadius;
+float hoursRadius;
+float clockDiameter;
+
 void setup() {
   size(200, 200);
   stroke(255);
   smooth();
+  
+  int radius = min(width, height) / 2;
+  secondsRadius = radius * 0.72;
+  minutesRadius = radius * 0.60;
+  hoursRadius = radius * 0.50;
+  clockDiameter = radius * 1.8;
+  
+  cx = width / 2;
+  cy = height / 2;
 }
-void draw() {
+
+void draw2() {
   background(0);
+  
+  // Draw the clock background
   fill(80);
   noStroke();
+  ellipse(cx, cy, clockDiameter, clockDiameter);
+  
   // Angles for sin() and cos() start at 3 o'clock;
   // subtract HALF_PI to make them start at the top
-  ellipse(100, 100, 160, 160);
   float s = map(second(), 0, 60, 0, TWO_PI) - HALF_PI;
   float m = map(minute() + norm(second(), 0, 60), 0, 60, 0, TWO_PI) - HALF_PI; 
   float h = map(hour() + norm(minute(), 0, 60), 0, 24, 0, TWO_PI * 2) - HALF_PI;
+  
+  // Draw the hands of the clock
   stroke(255);
   strokeWeight(1);
-  line(100, 100, cos(s) * 72 + 100, sin(s) * 72 + 100);
+  line(cx, cy, cx + cos(s) * secondsRadius, cy + sin(s) * secondsRadius);
   strokeWeight(2);
-  line(100, 100, cos(m) * 60 + 100, sin(m) * 60 + 100);
+  line(cx, cy, cx + cos(m) * minutesRadius, cy + sin(m) * minutesRadius);
   strokeWeight(4);
-  line(100, 100, cos(h) * 50 + 100, sin(h) * 50 + 100);
+  line(cx, cy, cx + cos(h) * hoursRadius, cy + sin(h) * hoursRadius);
   
   // Draw the minute ticks
   strokeWeight(2);
+  beginShape(POINTS);
   for (int a = 0; a < 360; a+=6) {
-    float x = 100 + ( cos(radians(a)) * 72 );
-    float y = 100 + ( sin(radians(a)) * 72 );
-    point(x, y);
+    float x = cx + cos(radians(a)) * secondsRadius;
+    float y = cy + sin(radians(a)) * secondsRadius;
+    vertex(x, y);
   }
+  endShape();
 }
