Sync .pde examples with the latest on examples repo

Fixes #320

Author: SableRaf

content/examples/Basics/Objects/CompositeObjects/CompositeObjects.pde

@@ -11,13 +11,13 @@ EggRing er1, er2;
 
 void setup() {
   size(640, 360);
-  er1 = new EggRing(width*0.45, height*0.5, 0.1, 120);
-  er2 = new EggRing(width*0.65, height*0.8, 0.05, 180);
+  er1 = new EggRing(width*0.45, height*0.5, 2, 120);
+  er2 = new EggRing(width*0.65, height*0.8, 10, 180);
 }
 
 
 void draw() {
   background(0);
   er1.transmit();
   er2.transmit();
-}
+}

content/examples/Basics/Objects/CompositeObjects/Egg.pde

@@ -3,18 +3,21 @@ class Egg {
   float tilt; // Left and right angle offset
   float angle; // Used to define the tilt
   float scalar; // Height of the egg
+  float range;
 
   // Constructor
-  Egg(float xpos, float ypos, float t, float s) {
+  Egg(float xpos, float ypos, float r, float s) {
     x = xpos;
     y = ypos;
-    tilt = t;
+    tilt = 0;
     scalar = s / 100.0;
+    range = r;
   }
 
   void wobble() {
-    tilt = cos(angle) / 8;
+    tilt = cos(angle) / range;
     angle += 0.1;
+    //print (angle + "-");
   }
 
   void display() {
@@ -33,4 +36,4 @@ class Egg {
     endShape();
     popMatrix();
   }
-}
+}

content/examples/Topics/File IO/LoadFile1/LoadFile1.pde

@@ -20,8 +20,9 @@ void draw() {
   if (index < lines.length) {
     String[] pieces = split(lines[index], '\t');
     if (pieces.length == 2) {
-      int x = int(pieces[0]) * 6.4;
-      int y = int(pieces[1]) * 3.6;
+      // Scale the coordinates to match the size of the sketch window
+      float x = map(float(pieces[0]),0,100,0,width);
+      float y = map(float(pieces[1]),0,100,0,height);
       point(x, y);
     }
     // Go to the next line for the next run through draw()

content/examples/Topics/File IO/LoadFile2/LoadFile2.pde

@@ -18,11 +18,11 @@ void setup() {
   size(640, 360);
   fill(255);
   noLoop();
-  
+
   body = loadFont("TheSans-Plain-12.vlw");
   textFont(body);
   textSize(20);
-  
+
   lines = loadStrings("cars2.tsv");
   records = new Record[lines.length];
   for (int i = 0; i < lines.length; i++) {
@@ -48,9 +48,9 @@ void draw() {
 }
 
 void mousePressed() {
-  startingEntry += num; 
+  startingEntry += num;
   if (startingEntry > records.length) {
     startingEntry = 0;  // go back to the beginning
-  } 
+  }
   redraw();
-}
+}

content/examples/Topics/GUI/Handles/Handles.pde

@@ -1,11 +1,14 @@
 /**
- * Handles. 
- * 
- * Click and drag the white boxes to change their position. 
+ * Handles.
+ *
+ * Click and drag the white boxes to change their position.
  */
- 
+
 Handle[] handles;
 
+//True if a mouse button has just been pressed while no other button was.
+boolean firstMousePress = false;
+
 void setup() {
   size(640, 360);
   int num = height/15;
@@ -18,24 +21,36 @@ void setup() {
 
 void draw() {
   background(153);
-  
+
   for (int i = 0; i < handles.length; i++) {
     handles[i].update();
     handles[i].display();
   }
-  
+
   fill(0);
   rect(0, 0, width/2, height);
+
+  //After it has been used in the sketch, set it back to false
+  if (firstMousePress) {
+    firstMousePress = false;
+  }
 }
 
-void mouseReleased()  {
+
+void mousePressed() {
+  if (!firstMousePress) {
+    firstMousePress = true;
+  }
+}
+
+void mouseReleased() {
   for (int i = 0; i < handles.length; i++) {
     handles[i].releaseEvent();
   }
 }
 
 class Handle {
-  
+
   int x, y;
   int boxx, boxy;
   int stretch;
@@ -45,7 +60,7 @@ class Handle {
   boolean locked = false;
   boolean otherslocked = false;
   Handle[] others;
-  
+
   Handle(int ix, int iy, int il, int is, Handle[] o) {
     x = ix;
     y = iy;
@@ -55,51 +70,51 @@ class Handle {
     boxy = y - size/2;
     others = o;
   }
-  
+
   void update() {
     boxx = x+stretch;
     boxy = y - size/2;
-    
+
     for (int i=0; i<others.length; i++) {
       if (others[i].locked == true) {
         otherslocked = true;
         break;
       } else {
         otherslocked = false;
-      }  
+      }
     }
-    
+
     if (otherslocked == false) {
       overEvent();
       pressEvent();
     }
-    
+
     if (press) {
       stretch = lock(mouseX-width/2-size/2, 0, width/2-size-1);
     }
   }
-  
+
   void overEvent() {
     if (overRect(boxx, boxy, size, size)) {
       over = true;
     } else {
       over = false;
     }
   }
-  
+
   void pressEvent() {
-    if (over && mousePressed || locked) {
+    if (over && firstMousePress || locked) {
       press = true;
       locked = true;
     } else {
       press = false;
     }
   }
-  
+
   void releaseEvent() {
     locked = false;
   }
-  
+
   void display() {
     line(x, y, x+stretch, y);
     fill(255);
@@ -109,19 +124,18 @@ class Handle {
       line(boxx, boxy, boxx+size, boxy+size);
       line(boxx, boxy+size, boxx+size, boxy);
     }
-
   }
 }
 
 boolean overRect(int x, int y, int width, int height) {
-  if (mouseX >= x && mouseX <= x+width && 
-      mouseY >= y && mouseY <= y+height) {
+  if (mouseX >= x && mouseX <= x+width &&
+    mouseY >= y && mouseY <= y+height) {
     return true;
   } else {
     return false;
   }
 }
 
-int lock(int val, int minv, int maxv) { 
-  return  min(max(val, minv), maxv); 
-} 
+int lock(int val, int minv, int maxv) {
+  return  min(max(val, minv), maxv);
+}

content/examples/Topics/GUI/Scrollbar/Scrollbar.pde

@@ -1,48 +1,60 @@
 /**
- * Scrollbar. 
- * 
- * Move the scrollbars left and right to change the positions of the images. 
+ * Scrollbar.
+ *
+ * Move the scrollbars left and right to change the positions of the images.
  */
 
+//True if a mouse button was pressed while no other button was.
+boolean firstMousePress = false;
 HScrollbar hs1, hs2;  // Two scrollbars
 PImage img1, img2;  // Two images to load
 
 void setup() {
   size(640, 360);
   noStroke();
-  
+
   hs1 = new HScrollbar(0, height/2-8, width, 16, 16);
   hs2 = new HScrollbar(0, height/2+8, width, 16, 16);
-  
+
   // Load images
   img1 = loadImage("seedTop.jpg");
   img2 = loadImage("seedBottom.jpg");
 }
 
 void draw() {
   background(255);
-  
+
   // Get the position of the img1 scrollbar
-  // and convert to a value to display the img1 image 
+  // and convert to a value to display the img1 image
   float img1Pos = hs1.getPos()-width/2;
   fill(255);
   image(img1, width/2-img1.width/2 + img1Pos*1.5, 0);
-  
+
   // Get the position of the img2 scrollbar
   // and convert to a value to display the img2 image
   float img2Pos = hs2.getPos()-width/2;
   fill(255);
   image(img2, width/2-img2.width/2 + img2Pos*1.5, height/2);
- 
+
   hs1.update();
   hs2.update();
   hs1.display();
   hs2.display();
-  
+
   stroke(0);
   line(0, height/2, width, height/2);
+
+  //After it has been used in the sketch, set it back to false
+  if (firstMousePress) {
+    firstMousePress = false;
+  }
 }
 
+void mousePressed() {
+  if (!firstMousePress) {
+    firstMousePress = true;
+  }
+}
 
 class HScrollbar {
   int swidth, sheight;    // width and height of bar
@@ -74,7 +86,7 @@ class HScrollbar {
     } else {
       over = false;
     }
-    if (mousePressed && over) {
+    if (firstMousePress && over) {
       locked = true;
     }
     if (!mousePressed) {
@@ -94,7 +106,7 @@ class HScrollbar {
 
   boolean overEvent() {
     if (mouseX > xpos && mouseX < xpos+swidth &&
-       mouseY > ypos && mouseY < ypos+sheight) {
+      mouseY > ypos && mouseY < ypos+sheight) {
       return true;
     } else {
       return false;