added calculate() function to PApplet

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -1144,6 +1144,10 @@ public void setup() {
   }
 
 
+  public void calculate() {
+  }
+
+
   public void draw() {
     // if no draw method, then shut things down
     //System.out.println("no draw method, goodbye");

libraries/vr/examples/drawAim/drawAim.pde

@@ -1,29 +1,21 @@
 import processing.vr.*;
 
-PGraphicsVR pg;
-
 void setup() {
   fullScreen(PVR.STEREO);  
-  pg = PVR.getRenderer(this);
-  pg.registerUpdate();
 }
 
-void update() {
-  println("in update function");
+void calculate() {
+  println("in calculate function");
 }
 
 void draw() {
-  background(150);
-  
-  println("in draw function for eye " + pg.eyeType);
-  
-  // Some lights
-  pointLight(255, 255, 255, pg.cameraX, pg.cameraY, pg.cameraZ);
-  
+  background(150);  
   translate(width/2, height/2);
-
   noStroke();
 
+  // Some lights
+  pointLight(255, 255, 255, 0, 0, 500);
+
   // Floor
   beginShape(QUADS); 
   fill(255, 0, 0);
@@ -36,6 +28,7 @@ void draw() {
   vertex(+width/2, +500, -width/2);
   endShape();
 
+  // Large box at the center
   pushMatrix();
   rotateY(millis()/1000.0);
   fill(220);
@@ -63,12 +56,10 @@ void draw() {
   box(100);
   popMatrix();
 
-  // Place the aim at 100 units from the camera eye
-  float d = 100;
-  float x = d * pg.forwardX;
-  float y = d * pg.forwardY;
-  float z = pg.cameraZ + d * pg.forwardZ;
+  // Use eye coordinates at 100 units from the camera position:
+  PGraphicsVR gvr = (PGraphicsVR)g;
+  gvr.eye();
   stroke(255, 200);
   strokeWeight(50);
-  point(x, y, z);  
+  point(0, 0, 100);  
 }

libraries/vr/src/processing/vr/PGraphicsVR.java

@@ -67,17 +67,6 @@ public void vrCoordinates(boolean v) {
   }
 
 
-  public void registerUpdate() {
-    registerUpdate("update");
-  }
-
-
-  public void registerUpdate(String methodName) {
-    PSurfaceVR surface = (PSurfaceVR)parent.getSurface();
-    surface.registerUpdateMethod(methodName);
-  }
-
-
   public PMatrix3D getEyeMatrix() {
     PMatrix3D mat = new PMatrix3D();
     mat.set(rightX, upX, forwardX, cameraX,

libraries/vr/src/processing/vr/PSurfaceVR.java

@@ -24,7 +24,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 
 import javax.microedition.khronos.egl.EGLConfig;
 
@@ -58,9 +57,6 @@ public class PSurfaceVR extends PSurfaceGLES {
   protected GvrActivity vrActivity;
   protected AndroidVRStereoRenderer renderer;
 
-  protected Method updateMethod;
-  protected Object[] noArgs = new Object[] {};
-
   public PSurfaceVR(PGraphics graphics, AppComponent component, SurfaceHolder holder, boolean vr) {
     this.sketch = graphics.parent;
     this.graphics = graphics;
@@ -171,19 +167,6 @@ public void dispose() {
 //    surface.onDestroy();
   }
 
-  public void registerUpdateMethod(String name) {
-    Class<?> c = sketch.getClass();
-    try {
-      updateMethod = c.getMethod(name, new Class[] {});
-
-    } catch (NoSuchMethodException nsme) {
-      sketch.die("There is no public " + name + "() method in sketch class " +
-                 sketch.getClass().getName());
-
-    } catch (Exception e) {
-      sketch.die("Could not register " + name + " + () for " + sketch, e);
-    }
-  }
 
   ///////////////////////////////////////////////////////////
 
@@ -294,12 +277,7 @@ public void onNewFrame(HeadTransform transform) {
       hadnleGVREnumError();
       pgl.getGL(null);
       pvr.headTransform(transform);
-      if (updateMethod != null) {
-        try {
-          updateMethod.invoke(sketch, noArgs);
-        } catch (Exception e) {
-        }
-      }
+      sketch.calculate();
     }
 
     @Override