added eye(), getObjectMatrix(), and getEyeMatrix() to PGraphics

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -8911,6 +8911,42 @@ public PMatrix3D getMatrix(PMatrix3D target) {
   }
 
 
+  /**
+   * Returns a copy of the current object matrix.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getObjectMatrix() {
+    return g.getObjectMatrix();
+  }
+
+
+  /**
+   * Copy the current object matrix into the specified target.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getObjectMatrix(PMatrix3D target) {
+    return g.getObjectMatrix(target);
+  }
+
+
+  /**
+   * Returns a copy of the current eye matrix.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getEyeMatrix() {
+    return g.getEyeMatrix();
+  }
+
+
+  /**
+   * Copy the current eye matrix into the specified target.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getEyeMatrix(PMatrix3D target) {
+    return g.getEyeMatrix(target);
+  }
+
+
   /**
    * Set the current transformation matrix to the contents of another.
    */
@@ -8970,6 +9006,11 @@ public void printCamera() {
   }
 
 
+  public void eye() {
+    g.eye();
+  }
+
+
   public void ortho() {
     g.ortho();
   }

core/src/processing/core/PGraphics.java

@@ -4006,6 +4006,46 @@ public PMatrix3D getMatrix(PMatrix3D target) {
   }
 
 
+  /**
+   * Returns a copy of the current object matrix.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getObjectMatrix() {
+    showMissingWarning("getObjectMatrix");
+    return null;
+  }
+
+
+  /**
+   * Copy the current object matrix into the specified target.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getObjectMatrix(PMatrix3D target) {
+    showMissingWarning("getObjectMatrix");
+    return null;
+  }
+
+
+  /**
+   * Returns a copy of the current eye matrix.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getEyeMatrix() {
+    showMissingWarning("getEyeMatrix");
+    return null;
+  }
+
+
+  /**
+   * Copy the current eye matrix into the specified target.
+   * Pass in null to create a new matrix.
+   */
+  public PMatrix3D getEyeMatrix(PMatrix3D target) {
+    showMissingWarning("getEyeMatrix");
+    return null;
+  }
+
+
   /**
    * Set the current transformation matrix to the contents of another.
    */
@@ -4074,6 +4114,10 @@ public void printCamera() {
   }
 
 
+  public void eye() {
+    showMethodWarning("eye");
+  }
+
 
   //////////////////////////////////////////////////////////////
 

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

@@ -67,6 +67,7 @@ public void vrCoordinates(boolean v) {
   }
 
 
+  @Override
   public PMatrix3D getEyeMatrix() {
     PMatrix3D mat = new PMatrix3D();
     mat.set(rightX, upX, forwardX, cameraX,
@@ -77,6 +78,7 @@ public PMatrix3D getEyeMatrix() {
   }
 
 
+  @Override
   public PMatrix3D getEyeMatrix(PMatrix3D target) {
     if (target == null) {
       target = new PMatrix3D();
@@ -89,6 +91,7 @@ public PMatrix3D getEyeMatrix(PMatrix3D target) {
   }
 
 
+  @Override
   public PMatrix3D getObjectMatrix() {
     PMatrix3D mat = new PMatrix3D();
     mat.set(modelviewInv);
@@ -97,6 +100,7 @@ public PMatrix3D getObjectMatrix() {
   }
 
 
+  @Override
   public PMatrix3D getObjectMatrix(PMatrix3D target) {
     if (target == null) {
       target = new PMatrix3D();
@@ -107,6 +111,7 @@ public PMatrix3D getObjectMatrix(PMatrix3D target) {
   }
 
 
+  @Override
   public void eye() {
     eyeMatrix = getEyeMatrix(eyeMatrix);