constant: Add height and width

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

Author: gaocegege

examples/Basics/BasicOperations/BasicOperations.rpde

@@ -14,11 +14,10 @@ bezierDetail(as.integer(12))
 
 bezier(85, 20, 10, 10, 90, 90, 15, 80)
 
-# for (i in 1:16) { t = i / float(steps); x = bezierPoint(85, 10, 90,
-# 15, t); y = bezierPoint(20, 10, 90, 80, t); tx =
-# bezierTangent(85, 10, 90, 15, t); ty = bezierTangent(20,
-# 10, 90, 80, t); a = atan2(ty, tx); a -= HALF_PI; line(x, y, cos(a)*8 + x,
-# sin(a)*8 + y); }
+# for (i in 1:16) { t = i / float(steps); x = bezierPoint(85, 10, 90, 15, t); y =
+# bezierPoint(20, 10, 90, 80, t); tx = bezierTangent(85, 10, 90, 15, t); ty =
+# bezierTangent(20, 10, 90, 80, t); a = atan2(ty, tx); a -= HALF_PI; line(x, y,
+# cos(a)*8 + x, sin(a)*8 + y); }
 
 # bezierPoint
 for (i in 1:10) {

examples/Basics/Trigonometry/trigonometry.rpde

@@ -59,7 +59,6 @@ draw <- function() {
     stroke(50)
     line(px, py, width/8 + radius + x, py)
 
-    # Output calculations to screen text('y <- sin x', 35, 185)
-    # text('px <- ' + px, 105, 185) text('py <- ' + py, 215,
-    # 185)
+    # Output calculations to screen text('y <- sin x', 35, 185) text('px <- ' + px,
+    # 105, 185) text('py <- ' + py, 215, 185)
 }

src/rprocessing/RLangPApplet.java

@@ -329,10 +329,10 @@ private boolean isMixMode() {
   protected void wrapProcessingVariables() {
     log("Wrap Processing built-in variables into R top context.");
     // TODO: Find some ways to push constants into R.
-    // this.renjinEngine.put("width", width);
-    // this.renjinEngine.put("height", height);
-    // this.renjinEngine.put("displayWidth", displayWidth);
-    // this.renjinEngine.put("displayHeight", displayHeight);
+    this.renjinEngine.put("width", width);
+    this.renjinEngine.put("height", height);
+    this.renjinEngine.put("displayWidth", displayWidth);
+    this.renjinEngine.put("displayHeight", displayHeight);
     // this.renjinEngine.put("focused", focused);
     // this.renjinEngine.put("keyPressed", keyPressed);
   }

src/rprocessing/r/core.R

@@ -193,3 +193,4 @@ vertex = processing$vertex
 
 # Hack
 frameCount = processing$frameCount
+# radians = processing$radians