processing-r · gaocegege · Jul 12, 2017 · Jul 12, 2017 · Jul 12, 2017 · Jul 12, 2017
diff --git a/build.xml.template b/build.xml.template
@@ -32,25 +32,6 @@
     <property name="result.exec.file" location="${test.build.dir}/jacoco.exec"/>
 
     <property name="renjin-version" value="0.8.2411" />
-
-    <!-- Maven deps -->
-    <path id="maven-ant-tasks.classpath" path="${build-lib}/maven-ant-tasks-2.1.3.jar" />
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-        uri="antlib:org.apache.maven.artifact.ant"
-        classpathref="maven-ant-tasks.classpath" />
-    <artifact:remoteRepository id="remote.repository" url="https://nexus.bedatadriven.com/content/groups/public/" />
-    <artifact:dependencies filesetId="dependency.fileset"
-        versionsId="dependency.versions">
-        <remoteRepository refid="remote.repository" />
-        <dependency groupId="org.renjin" artifactId="renjin-script-engine" version="${renjin-version}" />
-        <dependency groupId="org.renjin" artifactId="renjin-cli" version="${renjin-version}" />
-    </artifact:dependencies>
-    <copy todir="${mode-lib}">
-        <fileset refid="dependency.fileset" />
-        <mapper classpathref="maven-ant-tasks.classpath"
-            classname="org.apache.maven.artifact.ant.VersionMapper"
-            from="${dependency.versions}" to="flatten" />
-    </copy>
 
     <path id="mode-library-classpath">
         <pathelement location="${processing.classes.pde}"/>
@@ -78,7 +59,39 @@
         <echo>This is the R mode for Processing, powered by github.com/gaocegege</echo>
     </target>
 
-    <target name="build">
+    <target name="checkos">
+        <condition property="isWindows" value="true">
+            <os family="windows" />
+        </condition>
+
+        <condition property="isLinux" value="true">
+            <os family="unix" />
+        </condition>
+    </target>
+
+    <target name="dep" depends="checkos" if="isLinux">
+        <echo>The OS platform is Linux X86_64, download corresponding jars from remote.</echo>
+        <!-- Maven deps -->
+        <path id="maven-ant-tasks.classpath" path="${build-lib}/maven-ant-tasks-2.1.3.jar" />
+        <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+            uri="antlib:org.apache.maven.artifact.ant"
+            classpathref="maven-ant-tasks.classpath" />
+        <artifact:remoteRepository id="remote.repository" url="https://nexus.bedatadriven.com/content/groups/public/" />
+        <artifact:dependencies filesetId="dependency.fileset"
+            versionsId="dependency.versions">
+            <remoteRepository refid="remote.repository" />
+            <dependency groupId="org.renjin" artifactId="renjin-script-engine" version="${renjin-version}" />
+            <dependency groupId="org.renjin" artifactId="renjin-cli" version="${renjin-version}" />
+        </artifact:dependencies>
+        <copy todir="${mode-lib}">
+            <fileset refid="dependency.fileset" />
+            <mapper classpathref="maven-ant-tasks.classpath"
+                classname="org.apache.maven.artifact.ant.VersionMapper"
+                from="${dependency.versions}" to="flatten" />
+        </copy>
+    </target>
+
+    <target name="build" depends="dep">
         <mkdir dir="build" />
         <javac destdir="build" includeantruntime="false">
             <src path="src/rprocessing" />

diff --git a/examples/Basics/ThreeDimensionalCube/ThreeDimensionalCube.rpde b/examples/Basics/ThreeDimensionalCube/ThreeDimensionalCube.rpde
@@ -1,5 +1,3 @@
-PI <- 3.1415
-
 settings <- function() {
     size(500, 500, "processing.opengl.PGraphics3D")
 }

diff --git a/examples/reference/ambientLight/ambientLight1/ambientLight1.rpde b/examples/reference/ambientLight/ambientLight1/ambientLight1.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/applyMatrix/applyMatrix0/applyMatrix0.rpde b/examples/reference/applyMatrix/applyMatrix0/applyMatrix0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/arc/arc1/arc1.rpde b/examples/reference/arc/arc1/arc1.rpde
@@ -1,11 +1,5 @@
 # arc 1 https://processing.org/reference/arc_.html
 
-# TODO: replace with built-in constants
-PI <- 3.1415
-HALF_PI <- PI/2
-QUARTER_PI <- PI/4
-TWO_PI <- PI * 2
-
 arc(50, 55, 50, 50, 0, HALF_PI)
 noFill()
 arc(50, 55, 60, 60, HALF_PI, PI)

diff --git a/examples/reference/arc/arc2/arc2.rpde b/examples/reference/arc/arc2/arc2.rpde
@@ -1,12 +1,3 @@
 # arc 2 https://processing.org/reference/arc_.html
 
-# TODO: replace with built-in constants
-PI <- 3.1415
-QUARTER_PI <- PI/4
-
-# TODO: Fix double to int casts
-OPEN <- as.integer(1)
-CHORD <- as.integer(2)
-PIE <- as.integer(3)
-
 arc(50, 50, 80, 80, 0, PI + QUARTER_PI, OPEN)
diff --git a/examples/reference/arc/arc3/arc3.rpde b/examples/reference/arc/arc3/arc3.rpde
@@ -1,12 +1,3 @@
 # arc 3 https://processing.org/reference/arc_.html
 
-# TODO: replace with built-in constants
-PI <- 3.1415
-QUARTER_PI <- PI/4
-
-# TODO: Fix double to int casts
-OPEN <- as.integer(1)
-CHORD <- as.integer(2)
-PIE <- as.integer(3)
-
 arc(50, 50, 80, 80, 0, PI + QUARTER_PI, CHORD)
diff --git a/examples/reference/arc/arc4/arc4.rpde b/examples/reference/arc/arc4/arc4.rpde
@@ -1,14 +1,3 @@
 # arc 4 https://processing.org/reference/arc_.html
 
-# TODO: replace with built-in constants
-PI <- 3.1415
-HALF_PI <- PI/2
-QUARTER_PI <- PI/4
-TWO_PI <- PI * 2
-
-# TODO: Fix double to int casts
-OPEN <- as.integer(1)
-CHORD <- as.integer(2)
-PIE <- as.integer(3)
-
 arc(50, 50, 80, 80, 0, PI + QUARTER_PI, PIE)
diff --git a/examples/reference/beginCamera/beginCamera0/beginCamera0.rpde b/examples/reference/beginCamera/beginCamera0/beginCamera0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/beginContour/beginContour1/beginContour1.rpde b/examples/reference/beginContour/beginContour1/beginContour1.rpde
@@ -1,7 +1,5 @@
 # beginContour 1 https://processing.org/reference/beginContour_.html
 
-CLOSE <- as.integer(2)
-
 size(100, 100)
 translate(50, 50)
 stroke(255, 0, 0)

diff --git a/examples/reference/beginShape/beginShape1/beginShape1.rpde b/examples/reference/beginShape/beginShape1/beginShape1.rpde
@@ -1,10 +1,5 @@
 # beginShape 1 https://processing.org/reference/beginShape_.html
 
-OPEN <- as.integer(1)
-CLOSE <- as.integer(2)
-POINTS <- as.integer(3)
-LINES <- as.integer(5)
-
 beginShape()
 vertex(30, 20)
 vertex(85, 20)

diff --git a/examples/reference/beginShape/beginShape2/beginShape2.rpde b/examples/reference/beginShape/beginShape2/beginShape2.rpde
@@ -1,10 +1,5 @@
 # beginShape 2 https://processing.org/reference/beginShape_.html
 
-OPEN <- as.integer(1)
-CLOSE <- as.integer(2)
-POINTS <- as.integer(3)
-LINES <- as.integer(5)
-
 beginShape(POINTS)
 vertex(30, 20)
 vertex(85, 20)

diff --git a/examples/reference/beginShape/beginShape3/beginShape3.rpde b/examples/reference/beginShape/beginShape3/beginShape3.rpde
@@ -1,10 +1,5 @@
 # beginShape 3 https://processing.org/reference/beginShape_.html
 
-OPEN <- as.integer(1)
-CLOSE <- as.integer(2)
-POINTS <- as.integer(3)
-LINES <- as.integer(5)
-
 beginShape(LINES)
 vertex(30, 20)
 vertex(85, 20)

diff --git a/examples/reference/beginShape/beginShape5/beginShape5.rpde b/examples/reference/beginShape/beginShape5/beginShape5.rpde
@@ -1,10 +1,5 @@
 # beginShape 5 https://processing.org/reference/beginShape_.html
 
-OPEN <- as.integer(1)
-CLOSE <- as.integer(2)
-POINTS <- as.integer(3)
-LINES <- as.integer(5)
-
 noFill()
 beginShape()
 vertex(30, 20)

diff --git a/examples/reference/bezierTangent/bezierTangent1/bezierTangent1.rpde b/examples/reference/bezierTangent/bezierTangent1/bezierTangent1.rpde
@@ -1,7 +1,5 @@
 # bezierTangent 1 https://processing.org/reference/bezierTangent_.html
 
-PI <- 3.1415
-
 noFill()
 bezier(85, 20, 10, 10, 90, 90, 15, 80)
 steps <- 6

diff --git a/examples/reference/bezierTangent/bezierTangent2/bezierTangent2.rpde b/examples/reference/bezierTangent/bezierTangent2/bezierTangent2.rpde
@@ -1,10 +1,5 @@
 # bezierTangent 2 https://processing.org/reference/bezierTangent_.html
 
-PI <- 3.1415
-HALF_PI <- PI/2
-QUARTER_PI <- PI/4
-TWO_PI <- PI * 2
-
 noFill()
 bezier(85, 20, 10, 10, 90, 90, 15, 80)
 stroke(255, 102, 0)

diff --git a/examples/reference/camera/camera0/camera0.rpde b/examples/reference/camera/camera0/camera0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/curvePoint/curvePoint1/curvePoint1.rpde b/examples/reference/curvePoint/curvePoint1/curvePoint1.rpde
@@ -1,7 +1,5 @@
 # curvePoint 1 https://processing.org/reference/curvePoint_.html
 
-CENTER <- as.integer(3)
-
 noFill()
 curve(5, 26, 5, 26, 73, 24, 73, 61)
 curve(5, 26, 73, 24, 73, 61, 15, 65)

diff --git a/examples/reference/curveTangent/curveTangent1/curveTangent1.rpde b/examples/reference/curveTangent/curveTangent1/curveTangent1.rpde
@@ -1,8 +1,5 @@
 # curveTangent 1 https://processing.org/reference/curveTangent_.html
 
-PI <- 3.1415
-HALF_PI <- PI/2
-
 noFill()
 curve(5, 26, 73, 24, 73, 61, 15, 65)
 steps <- 6

diff --git a/examples/reference/ellipseMode/ellipseMode0/ellipseMode0.rpde b/examples/reference/ellipseMode/ellipseMode0/ellipseMode0.rpde
@@ -1,6 +1,3 @@
-RADIUS <- as.integer(2)
-CENTER <- as.integer(3)
-
 ellipseMode(RADIUS)  # Set ellipseMode to RADIUS
 fill(255)  # Set fill to white
 ellipse(50, 50, 30, 30)  # Draw white ellipse using RADIUS mode

diff --git a/examples/reference/ellipseMode/ellipseMode1/ellipseMode1.rpde b/examples/reference/ellipseMode/ellipseMode1/ellipseMode1.rpde
@@ -1,6 +1,3 @@
-CORNERS <- as.integer(1)
-CORNER <- as.integer(0)
-
 ellipseMode(CORNER)  # Set ellipseMode is CORNER
 fill(255)  # Set fill to white
 ellipse(25, 25, 50, 50)  # Draw white ellipse using CORNER mode

diff --git a/examples/reference/endCamera/endCamera0/endCamera0.rpde b/examples/reference/endCamera/endCamera0/endCamera0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/endContour/endContour0/endContour0.rpde b/examples/reference/endContour/endContour0/endContour0.rpde
@@ -1,5 +1,3 @@
-CLOSE <- as.integer(2)
-
 size(100, 100)
 translate(50, 50)
 stroke(255, 0, 0)

diff --git a/examples/reference/endShape/endShape0/endShape0.rpde b/examples/reference/endShape/endShape0/endShape0.rpde
@@ -1,5 +1,3 @@
-CLOSE <- as.integer(2)
-
 noFill()
 
 beginShape()

diff --git a/examples/reference/frustum/frustum0/frustum0.rpde b/examples/reference/frustum/frustum0/frustum0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/lightFalloff/lightFalloff0/lightFalloff0.rpde b/examples/reference/lightFalloff/lightFalloff0/lightFalloff0.rpde
@@ -1,5 +1,3 @@
-CLOSE <- as.integer(2)
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/normal/normal0/normal0.rpde b/examples/reference/normal/normal0/normal0.rpde
@@ -1,5 +1,3 @@
-CLOSE <- as.integer(2)
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/ortho/ortho0/ortho0.rpde b/examples/reference/ortho/ortho0/ortho0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/perspective/perspective0/perspective0.rpde b/examples/reference/perspective/perspective0/perspective0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rectMode/rectMode0/rectMode0.rpde b/examples/reference/rectMode/rectMode0/rectMode0.rpde
@@ -1,6 +1,3 @@
-CORNERS <- as.integer(1)
-CORNER <- as.integer(0)
-
 rectMode(CORNER)  # Default rectMode is CORNER
 fill(255)  # Set fill to white
 rect(25, 25, 50, 50)  # Draw white rect using CORNER mode

diff --git a/examples/reference/rectMode/rectMode1/rectMode1.rpde b/examples/reference/rectMode/rectMode1/rectMode1.rpde
@@ -1,6 +1,3 @@
-RADIUS <- as.integer(2)
-CENTER <- as.integer(3)
-
 rectMode(RADIUS)  # Set rectMode to RADIUS
 fill(255)  # Set fill to white
 rect(50, 50, 30, 30)  # Draw white rect using RADIUS mode

diff --git a/examples/reference/rotate/rotate0/rotate0.rpde b/examples/reference/rotate/rotate0/rotate0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 translate(width/2, height/2)
 rotate(PI/3)
 rect(-26, -26, 52, 52)
diff --git a/examples/reference/rotateX/rotateX0/rotateX0.rpde b/examples/reference/rotateX/rotateX0/rotateX0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rotateX/rotateX1/rotateX1.rpde b/examples/reference/rotateX/rotateX1/rotateX1.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rotateY/rotateY0/rotateY0.rpde b/examples/reference/rotateY/rotateY0/rotateY0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rotateY/rotateY1/rotateY1.rpde b/examples/reference/rotateY/rotateY1/rotateY1.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rotateZ/rotateZ0/rotateZ0.rpde b/examples/reference/rotateZ/rotateZ0/rotateZ0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/rotateZ/rotateZ1/rotateZ1.rpde b/examples/reference/rotateZ/rotateZ1/rotateZ1.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/shapeMode/shapeMode0/shapeMode0.rpde b/examples/reference/shapeMode/shapeMode0/shapeMode0.rpde
@@ -1,6 +1,3 @@
-CENTER <- as.integer(3)
-CORNER <- as.integer(0)
-
 setup <- function() {
     size(100, 100)
     bot = loadShape("https://raw.githubusercontent.com/processing/processing-docs/master/content/examples/Basics/Shape/LoadDisplaySVG/data/bot1.svg")

diff --git a/examples/reference/shearX/shearX0/shearX0.rpde b/examples/reference/shearX/shearX0/shearX0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100)
 }

diff --git a/examples/reference/shearY/shearY0/shearY0.rpde b/examples/reference/shearY/shearY0/shearY0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100)
 }

diff --git a/examples/reference/spotLight/spotLight0/spotLight0.rpde b/examples/reference/spotLight/spotLight0/spotLight0.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/spotLight/spotLight1/spotLight1.rpde b/examples/reference/spotLight/spotLight1/spotLight1.rpde
@@ -1,5 +1,3 @@
-PI <- pi
-
 settings <- function() {
     size(100, 100, P3D)
 }

diff --git a/examples/reference/vertex/vertex0/vertex0.rpde b/examples/reference/vertex/vertex0/vertex0.rpde
@@ -1,5 +1,3 @@
-POINTS <- as.integer(3)
-
 beginShape(POINTS)
 vertex(30, 20)
 vertex(85, 20)

diff --git a/examples/reference/vertex/vertex1/vertex1.rpde b/examples/reference/vertex/vertex1/vertex1.rpde
@@ -1,5 +1,3 @@
-POINTS <- as.integer(3)
-
 settings <- function() {
     size(100, 100, P3D)
 }