Skip to content

Commit 23c2fc2

Browse files
committed
src: Add frameCount support
Signed-off-by: Ce Gao <[email protected]>
1 parent fe95dc1 commit 23c2fc2

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/rprocessing/RLangPApplet.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,13 @@ private boolean isMixMode() {
328328
*/
329329
protected void wrapProcessingVariables() {
330330
log("Wrap Processing built-in variables into R top context.");
331-
this.renjinEngine.put("width", width);
332-
this.renjinEngine.put("height", height);
333-
this.renjinEngine.put("displayWidth", displayWidth);
334-
this.renjinEngine.put("displayHeight", displayHeight);
335-
this.renjinEngine.put("focused", focused);
336-
this.renjinEngine.put("keyPressed", keyPressed);
337-
this.renjinEngine.put("frameRate", frameRate);
338331
// TODO: Find some ways to push constants into R.
332+
// this.renjinEngine.put("width", width);
333+
// this.renjinEngine.put("height", height);
334+
// this.renjinEngine.put("displayWidth", displayWidth);
335+
// this.renjinEngine.put("displayHeight", displayHeight);
336+
// this.renjinEngine.put("focused", focused);
337+
// this.renjinEngine.put("keyPressed", keyPressed);
339338
}
340339

341340
/**

src/rprocessing/r/core.R

+6-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ curveVertex = processing$curveVertex
4343
delay = processing$delay
4444
directionalLight = processing$directionalLight
4545
displayDensity = processing$displayDensity
46-
draw = processing$draw
46+
# draw = processing$draw
4747
ellipse = processing$ellipse
4848
ellipseMode = processing$ellipseMode
4949
emissive = processing$emissive
@@ -154,8 +154,8 @@ selectFolder = processing$selectFolder
154154
selectInput = processing$selectInput
155155
selectOutput = processing$selectOutput
156156
set = processing$set
157-
settings = processing$settings
158-
setup = processing$setup
157+
# settings = processing$settings
158+
# setup = processing$setup
159159
shader = processing$shader
160160
shape = processing$shape
161161
shapeMode = processing$shapeMode
@@ -190,3 +190,6 @@ translate = processing$translate
190190
triangle = processing$triangle
191191
updatePixels = processing$updatePixels
192192
vertex = processing$vertex
193+
194+
# Hack
195+
frameCount = processing$frameCount

0 commit comments

Comments
 (0)