load prepend.py from wrapper jar instead of prepending

Author: kazimuth

build.xml

@@ -65,6 +65,9 @@
 				<path refid="library-classpath"/>
 			</classpath>
 		</javac>
+		
+		<copy file="${src}/${wrap.path}/prepend.py" tofile="${build}/${wrap.path}/prepend.py" />
+		
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - - - - - -
@@ -79,7 +82,7 @@
 		<!-- make mode jar -->
 		<jar jarfile="${bundle}/mode/${lib.name}.jar" basedir="build" includes="${lib.path}/*.class"/>
 		<!-- make wrapper jar -->
-		<jar jarfile="${bundle}/mode/${wrap.name}.jar" basedir="build" includes="${wrap.path}/*.class"/>
+		<jar jarfile="${bundle}/mode/${wrap.name}.jar" basedir="build" includes="${wrap.path}/*"/> <!-- include prepend.py -->
 
 
 		<copy todir="${bundle}">

resources/prepend-commented.py renamed to prepend-commented.py

@@ -76,25 +76,15 @@ public void build() throws Exception{
 
 
 	//Things we don't need to reload every build
-	//Some small files we add to the beginning & end of sketches
-	private static String prepend;
-	static {
-		try{
-			prepend = Base.loadFile(new File(PythonMode.getModeFolder()+"prepend.py"));	
-		}catch(Exception e){
-			System.err.println("Error instantiating Python Mode");
-			e.printStackTrace();
-		}
-	}
-	
 	//Some regexes
 	//A hack, but much less work than a full parser, and we don't need to do very much
-	private static Pattern getPressed;		//replace mousePressed / keyPressed with 
+	private static Pattern getSpecial;		//replace mousePressed / keyPressed with 
 	private static Pattern instanceVars;	//replace 'mouseX' with __applet__.mouseX, etc.
 
 	static{
-		getPressed = Pattern.compile("(?<!def\\s{1,100})(mousePressed|keyPressed)");
-		instanceVars = Pattern.compile("(mouseX|mouseY|pmouseX|pmouseY|mouseButton|keyCode|key)");
+		getSpecial = Pattern.compile("(?<!def\\s{1,1000})(mousePressed|keyPressed|frameRate)(?!\\s{0,1000}\\()");
+		instanceVars = Pattern.compile("(mouseX|mouseY|pmouseX|pmouseY|mouseButton|"
+				+"keyCode|key|pixels|width|height|displayWidth|displayHeight|focused|frameCount)");
 	}
 
 
@@ -103,29 +93,24 @@ public void build() throws Exception{
 	 * Turn .pde into valid python
 	 */
 	private String preprocess(StringBuilder program){
-		System.out.println("Preprocessing");
 		try{
 			String temp;
 
-			Matcher regex = getPressed.matcher(program);
+			Matcher regex = getSpecial.matcher(program);
 
 			temp = regex.replaceAll("get$1()");
 
 			regex = instanceVars.matcher(temp);
 
 			temp = regex.replaceAll("__applet__.$1");
 
-			program = new StringBuilder(temp);
-						
-			program.insert(0, prepend);
+			return temp;
 
 		}catch(Exception e){
-			
 			System.err.println("Preprocessing failed.");
 			e.printStackTrace();
-			
+			return null;
 		}
-		return program.toString();
 	}
 
 

release/PythonMode.zip

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Scanner;
 
 import org.python.core.*;
 import org.python.util.InteractiveConsole;
@@ -28,7 +29,10 @@
 public class ProcessingJythonWrapper {
 
 	//EVERYTHING IS STATIC
-
+	
+	//Read in prepend.py from jar (this is the only one-liner to read in a stream, don't you love java)
+	static final String prepend = new Scanner(ProcessingJythonWrapper.class.getResourceAsStream("prepend.py")).useDelimiter("\\A").next();
+	
 	static final String[] sketchFunctions = { "setup", "draw", "mousePressed",
 			"mouseReleased", "mouseClicked", "mouseWheel", "mouseMoved",
 			"mouseDragged", "keyPressed", "keyReleased", "keyTyped" };
@@ -44,7 +48,7 @@ public class ProcessingJythonWrapper {
 	 * First argument is the path to the script; the rest are things to pass to PApplet.
 	 * 
 	 */
-	public static void main(String[] args) {
+	public static void main(String[] args) {		
 		String scriptPath = args[0];
 		String[] params = Arrays.copyOfRange(args, 1, args.length);
 		run(scriptPath, params);
@@ -65,6 +69,9 @@ public static void run(String scriptPath, String[] params){
 		sys.add_package("processing.opengl");
 
 		try {
+			//run prepend.py
+			interp.exec(prepend);
+			
 			//run the script we were given
 			interp.execfile(scriptPath);
 

resources/prepend.py

@@ -20,7 +20,7 @@
 public class PythonPApplet extends PApplet {
 
 	//Accessed from prepend.py
-	public static String[] staticMethods = { "abs", "acos", "append",
+	public static final String[] staticMethods = { "abs", "acos", "append",
 			"arrayCopy", "asin", "atan", "atan2", "binary", "blendColor",
 			"ceil", "concat", "constrain", "cos", "createInput",
 			"createOutput", "createReader", "createWriter", "day", "debug",
@@ -32,43 +32,44 @@ public class PythonPApplet extends PApplet {
 			"saveBytes", "saveStream", "saveStrings", "second", "shorten",
 			"sin", "sort", "splice", "split", "splitTokens", "sq", "sqrt",
 			"subset", "tan", "trim", "unbinary", "unhex", "year" };
-	public static String[] instanceMethods = { "alpha", "ambient",
-			"ambientLight", "applyMatrix", "arc", "background", "beginCamera",
-			"beginContour", "beginRaw", "beginRecord", "beginShape", "bezier",
-			"bezierDetail", "bezierPoint", "bezierTangent", "bezierVertex",
-			"blend", "blendMode", "blue", "box", "brightness", "camera",
-			"clear", "color", "colorMode", "copy", "createFont",
-			"createGraphics", "createImage", "createInput", "createOutput",
-			"createReader", "createShape", "createWriter", "cursor", "curve",
-			"curveDetail", "curvePoint", "curveTangent", "curveTightness",
-			"curveVertex", "directionalLight", "ellipse",
-			"ellipseMode", "emissive", "endCamera", "endContour", "endRaw",
-			"endRecord", "endShape", "exit", "fill", "filter", "frameRate",
-			"frustum", "get", "hint", "hue", "image", "imageMode", "lerpColor",
-			"lightFalloff", "lightSpecular", "lights", "line", "loadBytes",
-			"loadFont", "loadImage", "loadJSONArray", "loadJSONObject",
-			"loadPixels", "loadShader", "loadShape", "loadStrings",
-			"loadTable", "loadXML", "loop", "millis", "modelX", "modelY",
-			"modelZ", "noCursor",
-			"noFill", "noLights", "noLoop", "noSmooth", "noStroke", "noTint",
-			"noise", "noiseDetail", "noiseSeed", "normal", "ortho", "parseXML",
-			"perspective", "point", "pointLight", "popMatrix", "popStyle",
-			"printCamera", "printMatrix", "printProjection", "pushMatrix",
-			"pushStyle", "quad", "quadraticVertex", "random", "randomGaussian",
-			"randomSeed", "rect", "rectMode", "red", "redraw", "requestImage",
-			"resetMatrix", "resetShader", "rotate", "rotateX", "rotateY",
-			"saturation", "save", "saveBytes", "saveFrame", "saveJSONArray",
-			"saveJSONObject", "saveStream", "saveStrings", "saveTable",
-			"saveXML", "scale", "screenX", "screenY", "screenZ",
-			"selectFolder", "selectInput", "selectOutput", "shader", "shape",
-			"shapeMode", "shearX", "shearY", "shininess", "size", "smooth",
-			"specular", "sphere", "sphereDetail", "spotLight", "stroke",
-			"strokeCap", "strokeJoin", "strokeWeight", "text", "textAlign",
-			"textAscent", "textDescent", "textFont", "textLeading", "textMode",
-			"textSize", "textWidth", "texture", "textureMode", "tint",
-			"translate", "triangle", "updatePixels", "vertex" };	
-	
 
+	public static final String[] constants = { "ADD", "ALPHA", "ALT",
+			"AMBIENT", "ARC", "ARGB", "ARROW", "BACKSPACE", "BASELINE",
+			"BEVEL", "BEZIER_VERTEX", "BLEND", "BLUR", "BOTTOM", "BOX",
+			"BREAK", "BURN", "CENTER", "CHATTER", "CHORD", "CLAMP", "CLOSE",
+			"CODED", "COMPLAINT", "CONTROL", "CORNER", "CORNERS", "CROSS",
+			"CURVE_VERTEX", "CUSTOM", "DARKEST", "DEG_TO_RAD", "DELETE",
+			"DIAMETER", "DIFFERENCE", "DILATE", "DIRECTIONAL",
+			"DISABLE_DEPTH_MASK", "DISABLE_DEPTH_SORT", "DISABLE_DEPTH_TEST",
+			"DISABLE_NATIVE_FONTS", "DISABLE_OPENGL_ERRORS",
+			"DISABLE_OPTIMIZED_STROKE", "DISABLE_RETINA_PIXELS",
+			"DISABLE_STROKE_PERSPECTIVE", "DISABLE_STROKE_PURE",
+			"DISABLE_TEXTURE_MIPMAPS", "DODGE", "DOWN", "DXF", "ELLIPSE",
+			"ENABLE_DEPTH_MASK", "ENABLE_DEPTH_SORT", "ENABLE_DEPTH_TEST",
+			"ENABLE_NATIVE_FONTS", "ENABLE_OPENGL_ERRORS",
+			"ENABLE_OPTIMIZED_STROKE", "ENABLE_RETINA_PIXELS",
+			"ENABLE_STROKE_PERSPECTIVE", "ENABLE_STROKE_PURE",
+			"ENABLE_TEXTURE_MIPMAPS", "ENTER", "EPSILON", "ERODE",
+			"ERROR_BACKGROUND_IMAGE_FORMAT", "ERROR_BACKGROUND_IMAGE_SIZE",
+			"ERROR_PUSHMATRIX_OVERFLOW", "ERROR_PUSHMATRIX_UNDERFLOW",
+			"ERROR_TEXTFONT_NULL_PFONT", "ESC", "EXCLUSION", "GIF", "GRAY",
+			"GROUP", "HALF_PI", "HAND", "HARD_LIGHT", "HINT_COUNT", "HSB",
+			"IMAGE", "INVERT", "JAVA2D", "JPEG", "LANDSCAPE", "LEFT",
+			"LIGHTEST", "LINE", "LINE_LOOP", "LINE_STRIP", "LINES", "LINUX",
+			"MACOSX", "MAX_FLOAT", "MAX_INT", "MIN_FLOAT", "MIN_INT", "MITER",
+			"MODEL", "MODELVIEW", "MOVE", "MULTIPLY", "NORMAL", "OPAQUE",
+			"OPEN", "OPENGL", "ORTHOGRAPHIC", "OTHER", "OVERLAY", "P2D", "P3D",
+			"PATH", "PDF", "PERSPECTIVE", "PI", "PIE", "platformNames",
+			"POINT", "POINTS", "POLYGON", "PORTRAIT", "POSTERIZE", "PROBLEM",
+			"PROJECT", "PROJECTION", "QUAD", "QUAD_BEZIER_VERTEX",
+			"QUAD_STRIP", "QUADS", "QUARTER_PI", "RAD_TO_DEG", "RADIUS",
+			"RECT", "REPEAT", "REPLACE", "RETURN", "RGB", "RIGHT", "ROUND",
+			"SCREEN", "SHAPE", "SHIFT", "SOFT_LIGHT", "SPHERE", "SPOT",
+			"SQUARE", "SUBTRACT", "TAB", "TARGA", "TAU", "TEXT", "THIRD_PI",
+			"THRESHOLD", "TIFF", "TOP", "TRIANGLE", "TRIANGLE_FAN",
+			"TRIANGLE_STRIP", "TRIANGLES", "TWO_PI", "UP", "VERTEX", "WAIT",
+			"WHITESPACE", "WINDOWS", "X", "Y", "Z" };
+
 
 	private HashMap<String, PyFunction> sketchFunctions;
 
@@ -139,4 +140,8 @@ public boolean getmousePressed(){
 	public boolean getkeyPressed(){
 		return keyPressed;
 	}
+	
+	public float getframeRate(){
+		return frameRate;
+	}
 }