Fix mousePressed and add examples (#208)

* RLangPApplet: Add mousePressedVar

Signed-off-by: Ce Gao <[email protected]>

* examples: Add examples

Signed-off-by: Ce Gao <[email protected]>

* reference: Split the examples

Signed-off-by: Ce Gao <[email protected]>

Author: gaocegege

examples/Examples/ContinuousLines/ContinuousLines.rpde

@@ -0,0 +1,15 @@
+settings <- function() {
+    size(640, 360)
+}
+
+setup <- function() {
+    background(102)
+}
+
+draw <- function() {
+    stroke(255)
+    if (mousePressedVar == TRUE) {
+        line(mouseX, mouseY, pmouseX, pmouseY)
+        
+    }
+}

examples/Demo/FiguresTransformation/FiguresTransformation.rpde renamed to examples/Examples/FiguresTransformation/FiguresTransformation.rpde

@@ -0,0 +1,24 @@
+settings <- function() {
+    size(640, 360)
+}
+
+setup <- function() {
+    background(102)
+}
+
+draw <- function() {
+    # Call the variableEllipse() method and send it the parameters for the current
+    # mouse position and the previous mouse position
+    variableEllipse(mouseX, mouseY, pmouseX, pmouseY)
+}
+
+
+# The simple method variableEllipse() was created specifically for this program.
+# It calculates the speed of the mouse and draws a small ellipse if the mouse is
+# moving slowly and draws a large ellipse if the mouse is moving quickly
+
+variableEllipse <- function(x, y, px, py) {
+    speed = abs(x - px) + abs(y - py)
+    stroke(speed)
+    ellipse(x, y, speed, speed)
+}

examples/Examples/Patterns/Patterns.rpde

@@ -0,0 +1,26 @@
+angle <- 0
+
+settings <- function() {
+    size(640, 360)
+}
+
+setup <- function() {
+    background(102)
+    noStroke()
+    fill(0, 102)
+}
+
+draw <- function() {
+    if (mousePressedVar == TRUE) {
+        angle <- angle + 5
+        val = cos(radians(angle)) * 12
+        for (a in c(0, 75, 150, 225, 300)) {
+            xoff = cos(radians(a)) * val
+            yoff = sin(radians(a)) * val
+            fill(0)
+            ellipse(mouseX + xoff, mouseY + yoff, val, val)
+        }
+        fill(255)
+        ellipse(mouseX, mouseY, 2, 2)
+    }
+}

examples/Examples/Pulses/Pulses.rpde

@@ -5,9 +5,9 @@ draw <- function() {
 }
 
 mousePressed <- function() {
-    if (mouseButton == LEFT) {
+    if (mouseButtonVar == LEFT) {
         fill(0)
-    } else if (mouseButton == RIGHT) {
+    } else if (mouseButtonVar == RIGHT) {
         fill(255)
     } else {
         fill(126)

examples/reference/mouseButton/.property.yml renamed to examples/reference/mouseButtonVar/.property.yml

@@ -0,0 +1,12 @@
+# Click within the image and press the left and right mouse buttons to change the
+# value of the rectangle
+draw <- function() {
+    if (mousePressedVar && (mouseButtonVar == LEFT)) {
+        fill(0)
+    } else if (mousePressedVar && (mouseButtonVar == RIGHT)) {
+        fill(255)
+    } else {
+        fill(126)
+    }
+    rect(25, 25, 50, 50)
+}

examples/reference/mouseButton/mouseButton0/mouseButton0.rpde renamed to examples/reference/mouseButtonVar/mouseButtonVar0/mouseButtonVar0.rpde

@@ -0,0 +1,17 @@
+category: Input
+subcategory: Mouse
+description: "
+The <b>mousePressedVar</b> variable stores whether or not a mouse button is currently being pressed. The value is true when any mouse button is pressed, and false if no button is pressed. The <b>mouseButton</b> variable (see the related reference entry) can be used to determine which button has been pressed.
+"
+related:
+  - mouseX
+  - mouseY
+  - pmouseX
+  - pmouseY
+  - mousePressed
+  - mouseReleased
+  - mouseClicked
+  - mouseMoved
+  - mouseDragged
+  - mouseButtonVar
+  - mouseWheel

examples/reference/mouseButtonVar/mouseButtonVar1/mouseButtonVar1.rpde

@@ -1,7 +1,7 @@
 # Click within the image to change the value of the rectangle
 
 draw <- function() {
-    if (mousePressed == TRUE) {
+    if (mousePressedVar == TRUE) {
         fill(0)
     } else {
         fill(255)

examples/reference/mousePressedVar/.property.yml

@@ -443,7 +443,8 @@ private void wrapMouseVariables() {
     this.renjinEngine.put("mouseY", mouseY);
     this.renjinEngine.put("pmouseX", pmouseX);
     this.renjinEngine.put("pmouseY", pmouseY);
-    this.renjinEngine.put("mouseButton", mouseButton);
+    this.renjinEngine.put("mouseButtonVar", mouseButton);
+    this.renjinEngine.put("mousePressedVar", mousePressed);
   }
 
   private void applyFunction(String name) {
@@ -485,6 +486,7 @@ protected void wrapKeyVariables() {
       this.renjinEngine.put("key", pyKey);
     }
     this.renjinEngine.put("keyCode", keyCode);
+    this.renjinEngine.put("keyPressedVar", keyPressed);
   }
 
   /**

examples/reference/mousePressed/mousePressed0/mousePressed0.rpde renamed to examples/reference/mousePressedVar/mousePressedVar1/mousePressedVar1.rpde

@@ -102,7 +102,7 @@ public String[] getExtensions() {
   public File[] getExampleCategoryFolders() {
     return new File[] {new File(examplesFolder, "Basics"), new File(examplesFolder, "Libraries"),
         new File(examplesFolder, "reference"), new File(examplesFolder, "R Packages"),
-        new File(examplesFolder, "Demo")};
+        new File(examplesFolder, "Examples")};
   }
 
   /**