fixed constants

Author: kazimuth

build.xml

@@ -67,6 +67,7 @@
 		</javac>
 
 		<copy file="${src}/${wrap.path}/prepend.py" tofile="${build}/${wrap.path}/prepend.py" />
+		<copy file="${src}/${wrap.path}/scrub.py" tofile="${build}/${wrap.path}/scrub.py" />
 
 	</target>
 

src/info/sansgills/mode/python/wrapper/ProcessingJythonWrapper.java

@@ -27,12 +27,13 @@
 
 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)
+	//Read in some scripts from the jar (this is the only one-liner to read in a stream, don't you love java)
 	static final String prepend;
+	static final String scrub;
 	static{
 		prepend = new Scanner(ProcessingJythonWrapper.class.getResourceAsStream("prepend.py")).useDelimiter("\\A").next();
+		scrub = new Scanner(ProcessingJythonWrapper.class.getResourceAsStream("scrub.py")).useDelimiter("\\A").next();
 	}
 
 	static final String[] sketchFunctions = { "setup", "draw", "mousePressed",
@@ -67,6 +68,8 @@ public static void prepare() {
 		PySystemState.add_package("processing.core");
 		PySystemState.add_package("processing.opengl");
 	}
+	
+	
 
 	/*
 	 * Run.

src/info/sansgills/mode/python/wrapper/prepend.py

@@ -56,15 +56,15 @@ def __mul__(a, b):
         raise TypeError("The * operator can only be used to multiply a PVector by a scalar")
     return PVector(a.x * b, a.y * b, a.z * b)
 
-	
+
 __applet__ = PythonPApplet()
 g = globals()
 
 for method in PythonPApplet.staticMethods:
 	g[method] = PApplet.__dict__[method]
 
 for constant in PythonPApplet.constants:
-	g[constant] = PConstants.__dict__[constant]
+	g[constant] = PConstants.__dict__[constant]._doget(__applet__)
 
 getframeRate = __applet__.getframeRate
 getkeyPressed = __applet__.getkeyPressed

src/info/sansgills/mode/python/wrapper/scrub.py

@@ -0,0 +1,4 @@
+#script to clean up last run
+for key,val in g.iteritems():
+	if key not in {'__name__', '__doc__', '__package__', '__builtins__'}:
+		del g[key]