Add built-in constants (#146)

gaocegege · web-flow · commit aed8ba60215d · 2017-07-10T17:28:48.000+08:00
* core.R: Support renderer keywords

Signed-off-by: Ce Gao &lt;ce.gao@outlook.com&gt;

* *: Remove trick about P3D

Signed-off-by: Ce Gao &lt;ce.gao@outlook.com&gt;
diff --git a/examples/reference/ambient/ambient0/ambient0.rpde b/examples/reference/ambient/ambient0/ambient0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/ambientLight/ambientLight0/ambientLight0.rpde b/examples/reference/ambientLight/ambientLight0/ambientLight0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/ambientLight/ambientLight1/ambientLight1.rpde b/examples/reference/ambientLight/ambientLight1/ambientLight1.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/applyMatrix/applyMatrix0/applyMatrix0.rpde b/examples/reference/applyMatrix/applyMatrix0/applyMatrix0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/beginCamera/beginCamera0/beginCamera0.rpde b/examples/reference/beginCamera/beginCamera0/beginCamera0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/box/box1/box1.rpde b/examples/reference/box/box1/box1.rpde
@@ -1,7 +1,5 @@
 # box 1 https://processing.org/reference/box_.html
 
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/box/box2/box2.rpde b/examples/reference/box/box2/box2.rpde
@@ -1,7 +1,5 @@
 # box 2 https://processing.org/reference/box_.html
 
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/camera/camera0/camera0.rpde b/examples/reference/camera/camera0/camera0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/curveTightness/curveTightness1/curveTightness1.rpde b/examples/reference/curveTightness/curveTightness1/curveTightness1.rpde
@@ -1,8 +1,6 @@
 # curveTightness 1x -- original fails on map, mouseX
 # https://processing.org/reference/curveTightness_.html
 
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/directionalLight/directionalLight0/directionalLight0.rpde b/examples/reference/directionalLight/directionalLight0/directionalLight0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/directionalLight/directionalLight1/directionalLight1.rpde b/examples/reference/directionalLight/directionalLight1/directionalLight1.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/emissive/emissive0/emissive0.rpde b/examples/reference/emissive/emissive0/emissive0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/endCamera/endCamera0/endCamera0.rpde b/examples/reference/endCamera/endCamera0/endCamera0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/frustum/frustum0/frustum0.rpde b/examples/reference/frustum/frustum0/frustum0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/lightFalloff/lightFalloff0/lightFalloff0.rpde b/examples/reference/lightFalloff/lightFalloff0/lightFalloff0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 CLOSE <- as.integer(2)
 
 settings <- function() {
diff --git a/examples/reference/lightSpecular/lightSpecular0/lightSpecular0.rpde b/examples/reference/lightSpecular/lightSpecular0/lightSpecular0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/lights/lights0/lights0.rpde b/examples/reference/lights/lights0/lights0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/lights/lights1/lights1.rpde b/examples/reference/lights/lights1/lights1.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/line/line3/line3.rpde b/examples/reference/line/line3/line3.rpde
@@ -2,8 +2,6 @@
 
 # Drawing lines in 3D requires P3D as a parameter to size()
 
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/modelX/modelX0/modelX0.rpde b/examples/reference/modelX/modelX0/modelX0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/modelY/modelY0/modelY0.rpde b/examples/reference/modelY/modelY0/modelY0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/modelZ/modelZ0/modelZ0.rpde b/examples/reference/modelZ/modelZ0/modelZ0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/normal/normal0/normal0.rpde b/examples/reference/normal/normal0/normal0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 CLOSE <- as.integer(2)
 
 settings <- function() {
diff --git a/examples/reference/ortho/ortho0/ortho0.rpde b/examples/reference/ortho/ortho0/ortho0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/perspective/perspective0/perspective0.rpde b/examples/reference/perspective/perspective0/perspective0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/point/point2/point2.rpde b/examples/reference/point/point2/point2.rpde
@@ -1,6 +1,5 @@
 # point 2 https://processing.org/reference/point_.html
 
-P3D <- "processing.opengl.PGraphics3D"
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/pointLight/pointLight0/pointLight0.rpde b/examples/reference/pointLight/pointLight0/pointLight0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/rotateX/rotateX0/rotateX0.rpde b/examples/reference/rotateX/rotateX0/rotateX0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/rotateX/rotateX1/rotateX1.rpde b/examples/reference/rotateX/rotateX1/rotateX1.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/rotateY/rotateY0/rotateY0.rpde b/examples/reference/rotateY/rotateY0/rotateY0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/rotateY/rotateY1/rotateY1.rpde b/examples/reference/rotateY/rotateY1/rotateY1.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/rotateZ/rotateZ0/rotateZ0.rpde b/examples/reference/rotateZ/rotateZ0/rotateZ0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/rotateZ/rotateZ1/rotateZ1.rpde b/examples/reference/rotateZ/rotateZ1/rotateZ1.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/scale/scale2/scale2.rpde b/examples/reference/scale/scale2/scale2.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/shininess/shininess0/shininess0.rpde b/examples/reference/shininess/shininess0/shininess0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/specular/specular0/specular0.rpde b/examples/reference/specular/specular0/specular0.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/sphere/sphere1/sphere1.rpde b/examples/reference/sphere/sphere1/sphere1.rpde
@@ -1,7 +1,5 @@
 # sphere 1 https://processing.org/reference/sphere_.html
 
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/spotLight/spotLight0/spotLight0.rpde b/examples/reference/spotLight/spotLight0/spotLight0.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/spotLight/spotLight1/spotLight1.rpde b/examples/reference/spotLight/spotLight1/spotLight1.rpde
@@ -1,4 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
 PI <- pi
 
 settings <- function() {
diff --git a/examples/reference/translate/translate1/translate1.rpde b/examples/reference/translate/translate1/translate1.rpde
@@ -1,5 +1,3 @@
-P3D <- "processing.opengl.PGraphics3D"
-
 settings <- function() {
     size(100, 100, P3D)
 }
diff --git a/examples/reference/vertex/vertex1/vertex1.rpde b/examples/reference/vertex/vertex1/vertex1.rpde
@@ -1,5 +1,4 @@
 POINTS <- as.integer(3)
-P3D <- "processing.opengl.PGraphics3D"
 
 settings <- function() {
     size(100, 100, P3D)
diff --git a/src/rprocessing/applet/BuiltinApplet.java b/src/rprocessing/applet/BuiltinApplet.java
@@ -8,13 +8,14 @@
 import org.renjin.sexp.StringVector;
 
 import processing.core.PApplet;
+import processing.core.PConstants;
 
 /**
  * BuiltinApplet is the type to refactor the function calls.
  * 
  * @author github.com/gaocegege
  */
-public class BuiltinApplet extends PApplet {
+public class BuiltinApplet extends PApplet implements PConstants {
 
   /*
    * TODO: Check for the cast.
diff --git a/src/rprocessing/r/core.R b/src/rprocessing/r/core.R
@@ -219,3 +219,13 @@ unbinary = RLangPApplet$unbinary
 unhex = RLangPApplet$unhex
 year = RLangPApplet$year
 map = RLangPApplet$map
+
+# For built-in constants
+JAVA2D = RLangPApplet$JAVA2D
+P2D = RLangPApplet$P2D
+P3D = RLangPApplet$P3D
+OPENGL = RLangPApplet$P3D
+FX2D = RLangPApplet$FX2D
+PDF = RLangPApplet$PDF
+SVG = RLangPApplet$SVG
+DXF = RLangPApplet$DXF
diff --git a/src/test/e2e/core/function/Ambient0Test.java b/src/test/e2e/core/function/Ambient0Test.java
@@ -9,7 +9,7 @@
 public class Ambient0Test extends E2eTestBase {
 
   public Ambient0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    background(0)\n    directionalLight(204, 204, 204, 0.5, 0, -1)\n    emissive(0, 26, 51)\n    translate(70, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "settings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    background(0)\n    directionalLight(204, 204, 204, 0.5, 0, -1)\n    emissive(0, 26, 51)\n    translate(70, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "http://py.processing.org/reference/imgs/ambient0.png";
   }
 
diff --git a/src/test/e2e/core/function/AmbientLight0Test.java b/src/test/e2e/core/function/AmbientLight0Test.java
@@ -9,7 +9,7 @@
 public class AmbientLight0Test extends E2eTestBase {
 
   public AmbientLight0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    # The spheres are white by default so the ambient light changes their color\n    ambientLight(51, 102, 126)\n    translate(20, 50, 0)\n    sphere(30)\n    translate(60, 0, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "settings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    # The spheres are white by default so the ambient light changes their color\n    ambientLight(51, 102, 126)\n    translate(20, 50, 0)\n    sphere(30)\n    translate(60, 0, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/ambientLight_0.png";
   }
 
diff --git a/src/test/e2e/core/function/AmbientLight1Test.java b/src/test/e2e/core/function/AmbientLight1Test.java
@@ -9,7 +9,7 @@
 public class AmbientLight1Test extends E2eTestBase {
 
   public AmbientLight1Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(126, 126, 126, 0, 0, -1)\n    ambientLight(102, 102, 102)\n    translate(32, 50, 0)\n    rotateY(PI/5)\n    box(40)\n    translate(60, 0, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(126, 126, 126, 0, 0, -1)\n    ambientLight(102, 102, 102)\n    translate(32, 50, 0)\n    rotateY(PI/5)\n    box(40)\n    translate(60, 0, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/ambientLight_1.png";
   }
 
diff --git a/src/test/e2e/core/function/ApplyMatrix0Test.java b/src/test/e2e/core/function/ApplyMatrix0Test.java
@@ -9,7 +9,7 @@
 public class ApplyMatrix0Test extends E2eTestBase {
 
   public ApplyMatrix0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    translate(50, 50, 0)\n    rotateY(PI/6)\n    stroke(153)\n    box(35)\n    # Set rotation angles\n    ct = cos(PI/9)\n    st = sin(PI/9)\n    # Matrix for rotation around the Y axis\n    applyMatrix(ct, 0, st, 0, 0, 1, 0, 0, -st, 0, ct, 0, 0, 0, 0, 1)\n    stroke(255)\n    box(50)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    translate(50, 50, 0)\n    rotateY(PI/6)\n    stroke(153)\n    box(35)\n    # Set rotation angles\n    ct = cos(PI/9)\n    st = sin(PI/9)\n    # Matrix for rotation around the Y axis\n    applyMatrix(ct, 0, st, 0, 0, 1, 0, 0, -st, 0, ct, 0, 0, 0, 0, 1)\n    stroke(255)\n    box(50)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/applyMatrix_.png";
   }
 
diff --git a/src/test/e2e/core/function/BeginCamera0Test.java b/src/test/e2e/core/function/BeginCamera0Test.java
@@ -9,7 +9,7 @@
 public class BeginCamera0Test extends E2eTestBase {
 
   public BeginCamera0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    \n    beginCamera()\n    camera()\n    rotateX(-PI/6)\n    endCamera()\n    \n    translate(50, 50, 0)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    \n    beginCamera()\n    camera()\n    rotateX(-PI/6)\n    endCamera()\n    \n    translate(50, 50, 0)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/beginCamera_.png";
   }
 
diff --git a/src/test/e2e/core/function/Box1Test.java b/src/test/e2e/core/function/Box1Test.java
@@ -9,7 +9,7 @@
 public class Box1Test extends E2eTestBase {
 
   public Box1Test() {
-    coreCodeTemplate = "# box 1 https://processing.org/reference/box_.html\n\nP3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\nsetup <- function() {\n    noLoop()\n}\n\ndraw <- function() {\n    translate(58, 48, 0)\n    rotateY(0.5)\n    noFill()\n    box(40)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "# box 1 https://processing.org/reference/box_.html\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\nsetup <- function() {\n    noLoop()\n}\n\ndraw <- function() {\n    translate(58, 48, 0)\n    rotateY(0.5)\n    noFill()\n    box(40)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/box_0.png";
   }
 
diff --git a/src/test/e2e/core/function/Box2Test.java b/src/test/e2e/core/function/Box2Test.java
@@ -9,7 +9,7 @@
 public class Box2Test extends E2eTestBase {
 
   public Box2Test() {
-    coreCodeTemplate = "# box 2 https://processing.org/reference/box_.html\n\nP3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\nsetup <- function() {\n    noLoop()\n}\n\ndraw <- function() {\n    translate(58, 48, 0)\n    rotateY(0.5)\n    noFill()\n    box(40, 20, 50)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "# box 2 https://processing.org/reference/box_.html\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\nsetup <- function() {\n    noLoop()\n}\n\ndraw <- function() {\n    translate(58, 48, 0)\n    rotateY(0.5)\n    noFill()\n    box(40, 20, 50)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/box_1.png";
   }
 
diff --git a/src/test/e2e/core/function/Camera0Test.java b/src/test/e2e/core/function/Camera0Test.java
@@ -9,7 +9,7 @@
 public class Camera0Test extends E2eTestBase {
 
   public Camera0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    size(100, 100, P3D)\n    noFill()\n    background(204)\n    camera(70, 35, 120, 50, 50, 0, 0, 1, 0)\n    translate(50, 50, 0)\n    rotateX(-PI/6)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    size(100, 100, P3D)\n    noFill()\n    background(204)\n    camera(70, 35, 120, 50, 50, 0, 0, 1, 0)\n    translate(50, 50, 0)\n    rotateX(-PI/6)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/camera_.png";
   }
 
diff --git a/src/test/e2e/core/function/DirectionalLight0Test.java b/src/test/e2e/core/function/DirectionalLight0Test.java
@@ -9,7 +9,7 @@
 public class DirectionalLight0Test extends E2eTestBase {
 
   public DirectionalLight0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(51, 102, 126, -1, 0, 0)\n    translate(20, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "settings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(51, 102, 126, -1, 0, 0)\n    translate(20, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/directionalLight_0.png";
   }
 
diff --git a/src/test/e2e/core/function/DirectionalLight1Test.java b/src/test/e2e/core/function/DirectionalLight1Test.java
@@ -9,7 +9,7 @@
 public class DirectionalLight1Test extends E2eTestBase {
 
   public DirectionalLight1Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(51, 102, 126, 0, -1, 0)\n    translate(80, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "settings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    directionalLight(51, 102, 126, 0, -1, 0)\n    translate(80, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/directionalLight_1.png";
   }
 
diff --git a/src/test/e2e/core/function/Emissive0Test.java b/src/test/e2e/core/function/Emissive0Test.java
@@ -9,7 +9,7 @@
 public class Emissive0Test extends E2eTestBase {
 
   public Emissive0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    background(0)\n    directionalLight(204, 204, 204, 0.5, 0, -1)\n    emissive(0, 26, 51)\n    translate(70, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "settings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    background(0)\n    noStroke()\n    background(0)\n    directionalLight(204, 204, 204, 0.5, 0, -1)\n    emissive(0, 26, 51)\n    translate(70, 50, 0)\n    sphere(30)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/emissive_.png";
   }
 
diff --git a/src/test/e2e/core/function/EndCamera0Test.java b/src/test/e2e/core/function/EndCamera0Test.java
@@ -9,7 +9,7 @@
 public class EndCamera0Test extends E2eTestBase {
 
   public EndCamera0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    \n    beginCamera()\n    camera()\n    rotateX(-PI/6)\n    endCamera()\n    \n    translate(50, 50, 0)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    \n    beginCamera()\n    camera()\n    rotateX(-PI/6)\n    endCamera()\n    \n    translate(50, 50, 0)\n    rotateY(PI/3)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/endCamera_.png";
   }
 
diff --git a/src/test/e2e/core/function/Frustum0Test.java b/src/test/e2e/core/function/Frustum0Test.java
@@ -9,7 +9,7 @@
 public class Frustum0Test extends E2eTestBase {
 
   public Frustum0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nPI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    background(204)\n    frustum(-10, 0, 0, 10, 10, 200)\n    rotateY(PI/6)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "PI <- pi\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noFill()\n    background(204)\n    frustum(-10, 0, 0, 10, 10, 200)\n    rotateY(PI/6)\n    box(45)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/frustum_.png";
   }
 
diff --git a/src/test/e2e/core/function/LightFalloff0Test.java b/src/test/e2e/core/function/LightFalloff0Test.java
@@ -9,7 +9,7 @@
 public class LightFalloff0Test extends E2eTestBase {
 
   public LightFalloff0Test() {
-    coreCodeTemplate = "P3D <- \"processing.opengl.PGraphics3D\"\nCLOSE <- as.integer(2)\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noStroke()\n    background(0)\n    lightFalloff(1, 0.001, 0)\n    pointLight(150, 250, 150, 50, 50, 50)\n    beginShape()\n    vertex(0, 0, 0)\n    vertex(100, 0, -100)\n    vertex(100, 100, -100)\n    vertex(0, 100, 0)\n    endShape(CLOSE)\n    saveFrame(\"%s\")\n    exit()\n}\n";
+    coreCodeTemplate = "CLOSE <- as.integer(2)\n\nsettings <- function() {\n    size(100, 100, P3D)\n}\n\ndraw <- function() {\n    noStroke()\n    background(0)\n    lightFalloff(1, 0.001, 0)\n    pointLight(150, 250, 150, 50, 50, 50)\n    beginShape()\n    vertex(0, 0, 0)\n    vertex(100, 0, -100)\n    vertex(100, 100, -100)\n    vertex(0, 100, 0)\n    endShape(CLOSE)\n    saveFrame(\"%s\")\n    exit()\n}\n";
     referenceURI = "https://processing.org/reference/images/lightFalloff_.png";
   }
 
diff --git a/src/test/e2e/core/function/LightSpecular0Test.java b/src/test/e2e/core/function/LightSpecular0Test.java
diff --git a/src/test/e2e/core/function/Lights0Test.java b/src/test/e2e/core/function/Lights0Test.java
diff --git a/src/test/e2e/core/function/Lights1Test.java b/src/test/e2e/core/function/Lights1Test.java
diff --git a/src/test/e2e/core/function/Line3Test.java b/src/test/e2e/core/function/Line3Test.java
diff --git a/src/test/e2e/core/function/ModelX0Test.java b/src/test/e2e/core/function/ModelX0Test.java
diff --git a/src/test/e2e/core/function/ModelY0Test.java b/src/test/e2e/core/function/ModelY0Test.java
diff --git a/src/test/e2e/core/function/ModelZ0Test.java b/src/test/e2e/core/function/ModelZ0Test.java
diff --git a/src/test/e2e/core/function/Normal0Test.java b/src/test/e2e/core/function/Normal0Test.java
diff --git a/src/test/e2e/core/function/Ortho0Test.java b/src/test/e2e/core/function/Ortho0Test.java
diff --git a/src/test/e2e/core/function/Perspective0Test.java b/src/test/e2e/core/function/Perspective0Test.java
diff --git a/src/test/e2e/core/function/Point2Test.java b/src/test/e2e/core/function/Point2Test.java
diff --git a/src/test/e2e/core/function/PointLight0Test.java b/src/test/e2e/core/function/PointLight0Test.java
diff --git a/src/test/e2e/core/function/RotateX0Test.java b/src/test/e2e/core/function/RotateX0Test.java
diff --git a/src/test/e2e/core/function/RotateY0Test.java b/src/test/e2e/core/function/RotateY0Test.java
diff --git a/src/test/e2e/core/function/RotateZ0Test.java b/src/test/e2e/core/function/RotateZ0Test.java
diff --git a/src/test/e2e/core/function/Scale2Test.java b/src/test/e2e/core/function/Scale2Test.java
diff --git a/src/test/e2e/core/function/Shininess0Test.java b/src/test/e2e/core/function/Shininess0Test.java
diff --git a/src/test/e2e/core/function/Specular0Test.java b/src/test/e2e/core/function/Specular0Test.java
diff --git a/src/test/e2e/core/function/SpotLight0Test.java b/src/test/e2e/core/function/SpotLight0Test.java
diff --git a/src/test/e2e/core/function/SpotLight1Test.java b/src/test/e2e/core/function/SpotLight1Test.java
diff --git a/src/test/e2e/core/function/Translate1Test.java b/src/test/e2e/core/function/Translate1Test.java
diff --git a/src/test/e2e/core/function/Vertex1Test.java b/src/test/e2e/core/function/Vertex1Test.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-P3D <- "processing.opengl.PGraphics3D"`
`2`		`-`
`3`	`1`	`settings <- function() {`
`4`	`2`	`size(100, 100, P3D)`
`5`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-P3D <- "processing.opengl.PGraphics3D"`
`2`	`1`	`PI <- pi`
`3`	`2`
`4`	`3`	`settings <- function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`# box 1 https://processing.org/reference/box_.html`
`2`	`2`
`3`		`-P3D <- "processing.opengl.PGraphics3D"`
`4`		`-`
`5`	`3`	`settings <- function() {`
`6`	`4`	`size(100, 100, P3D)`
`7`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`# box 2 https://processing.org/reference/box_.html`
`2`	`2`
`3`		`-P3D <- "processing.opengl.PGraphics3D"`
`4`		`-`
`5`	`3`	`settings <- function() {`
`6`	`4`	`size(100, 100, P3D)`
`7`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`# curveTightness 1x -- original fails on map, mouseX`
`2`	`2`	`# https://processing.org/reference/curveTightness_.html`
`3`	`3`
`4`		`-P3D <- "processing.opengl.PGraphics3D"`
`5`		`-`
`6`	`4`	`settings <- function() {`
`7`	`5`	`size(100, 100, P3D)`
`8`	`6`	`}`