added cameraUp()

Author: codeanticode

core/src/processing/core/PGraphics.java

@@ -4087,6 +4087,11 @@ public void printMatrix() {
   // CAMERA
 
 
+  public void cameraUp() {
+    showMethodWarning("cameraUp");
+  }
+
+
   public void beginCamera() {
     showMethodWarning("beginCamera");
   }

core/src/processing/opengl/PGL.java

@@ -544,7 +544,7 @@ protected Texture wrapBackTexture(Texture texture) {
                    glColorTex.get(backTex), TEXTURE_2D, RGBA,
                    fboWidth, fboHeight, NEAREST, NEAREST,
                    CLAMP_TO_EDGE, CLAMP_TO_EDGE);
-      texture.invertedY(graphics.glCoordsEnabled);
+      texture.invertedY(graphics.cameraUp);
       texture.colorBuffer(true);
       graphics.setCache(graphics, texture);
     } else {
@@ -561,7 +561,7 @@ protected Texture wrapFrontTexture(Texture texture)  {
                    glColorTex.get(frontTex), TEXTURE_2D, RGBA,
                    fboWidth, fboHeight, NEAREST, NEAREST,
                    CLAMP_TO_EDGE, CLAMP_TO_EDGE);
-      texture.invertedY(graphics.glCoordsEnabled);
+      texture.invertedY(graphics.cameraUp);
       texture.colorBuffer(true);
     } else {
       texture.glName = glColorTex.get(frontTex);

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -105,10 +105,6 @@ public void dispose() {
   /** Current flush mode. */
   protected int flushMode = FLUSH_WHEN_FULL;
 
-  /**
-   * Keeps track of ENABLE_OPENGL_COORDINATES hint
-   */
-  protected boolean glCoordsEnabled = false;
 
   // ........................................................
 
@@ -278,6 +274,12 @@ public void dispose() {
   /** Flag to indicate that we are inside beginCamera/endCamera block. */
   protected boolean manipulatingCamera;
 
+  /**
+   * Sets the coordinates to "first person" setting: Y axis up, origin at
+   * screen center
+   */
+  protected boolean cameraUp = false;
+
   // ........................................................
 
   // All the matrices required for camera and geometry transformations.
@@ -1583,7 +1585,7 @@ protected void restoreGL() {
       pgl.disable(PGL.SCISSOR_TEST);
     }
 
-    pgl.frontFace(glCoordsEnabled ? PGL.CCW : PGL.CW);
+    pgl.frontFace(cameraUp ? PGL.CCW : PGL.CW);
     pgl.disable(PGL.CULL_FACE);
 
     pgl.activeTexture(PGL.TEXTURE0);
@@ -3467,7 +3469,7 @@ public void text(char c, float x, float y) {
       defaultFontOrDeath("text");
     }
 
-    int sign = glCoordsEnabled ? -1 : +1;
+    int sign = cameraUp ? -1 : +1;
 
     if (textAlignY == CENTER) {
       y += sign * textAscent() / 2;
@@ -3490,7 +3492,7 @@ public void text(String str, float x, float y) {
       defaultFontOrDeath("text");
     }
 
-    int sign = glCoordsEnabled ? -1 : +1;
+    int sign = cameraUp ? -1 : +1;
 
     int length = str.length();
     if (length > textBuffer.length) {
@@ -3542,7 +3544,7 @@ public void text(String str, float x1, float y1, float x2, float y2) {
       defaultFontOrDeath("text");
     }
 
-    int sign = glCoordsEnabled ? -1 : +1;
+    int sign = cameraUp ? -1 : +1;
 
     float hradius, vradius;
     switch (rectMode) {
@@ -3619,23 +3621,23 @@ public void text(String str, float x1, float y1, float x2, float y2) {
 
     if (textAlignY == CENTER) {
       float lineHigh = textAscent() + textLeading * (lineCount - 1);
-      float y = glCoordsEnabled ? y2 - textAscent() - (boxHeight - lineHigh) / 2 :
+      float y = cameraUp ? y2 - textAscent() - (boxHeight - lineHigh) / 2 :
                                   y1 + textAscent() + (boxHeight - lineHigh) / 2;
       for (int i = 0; i < lineCount; i++) {
         textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
         y += sign * textLeading;
       }
 
     } else if (textAlignY == BOTTOM) {
-      float y = glCoordsEnabled ? y1 + textDescent() + textLeading * (lineCount - 1) :
+      float y = cameraUp ? y1 + textDescent() + textLeading * (lineCount - 1) :
                                   y2 - textDescent() - textLeading * (lineCount - 1);
       for (int i = 0; i < lineCount; i++) {
         textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
         y += sign * textLeading;
       }
 
     } else {  // TOP or BASELINE just go to the default
-      float y = glCoordsEnabled ? y2 - textAscent() : y1 + textAscent();
+      float y = cameraUp ? y2 - textAscent() : y1 + textAscent();
       for (int i = 0; i < lineCount; i++) {
         textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
         y += sign * textLeading;
@@ -3767,7 +3769,7 @@ protected void textCharImpl(char ch, float x, float y) {
 
         // The default text setting assumes an Y axis pointing down, so
         // inverting in the the case Y points up
-        int sign = glCoordsEnabled ? -1 : +1;
+        int sign = cameraUp ? -1 : +1;
 
         float x1 = x + lextent * textSize;
         float y1 = y - sign * textent * textSize;
@@ -4627,6 +4629,12 @@ public void printCamera() {
   }
 
 
+  @Override
+  public void cameraUp() {
+    cameraUp = true;
+  }
+
+
   protected void defaultCamera() {
     camera();
   }
@@ -6067,7 +6075,7 @@ protected void loadTextureImpl(int sampling, boolean mipmap) {
       Texture.Parameters params = new Texture.Parameters(ARGB,
                                                          sampling, mipmap);
       texture = new Texture(this, pixelWidth, pixelHeight, params);
-      texture.invertedY(glCoordsEnabled);
+      texture.invertedY(cameraUp);
       texture.colorBuffer(true);
       setCache(this, texture);
     }
@@ -6078,7 +6086,7 @@ protected void createPTexture() {
     updatePixelSize();
     if (texture != null) {
       ptexture = new Texture(this, pixelWidth, pixelHeight, texture.getParameters());
-      ptexture.invertedY(glCoordsEnabled);
+      ptexture.invertedY(cameraUp);
       ptexture.colorBuffer(true);
     }
   }
@@ -6218,7 +6226,7 @@ public void filter(PShader shader) {
     if (filterTexture == null || filterTexture.contextIsOutdated()) {
       filterTexture = new Texture(this, texture.width, texture.height,
                                   texture.getParameters());
-      filterTexture.invertedY(glCoordsEnabled);
+      filterTexture.invertedY(cameraUp);
       filterImage = wrapTexture(filterTexture);
     }
     filterTexture.set(texture);
@@ -6288,7 +6296,7 @@ public void copy(int sx, int sy, int sw, int sh,
     loadTexture();
     if (filterTexture == null || filterTexture.contextIsOutdated()) {
       filterTexture = new Texture(this, texture.width, texture.height, texture.getParameters());
-      filterTexture.invertedY(glCoordsEnabled);
+      filterTexture.invertedY(cameraUp);
       filterImage = wrapTexture(filterTexture);
     }
     filterTexture.put(texture, sx, height - (sy + sh), sw, height - sy);
@@ -6608,7 +6616,7 @@ protected Texture addTexture(PImage img, Texture.Parameters params) {
       img.parent = parent;
     }
     Texture tex = new Texture(this, img.pixelWidth, img.pixelHeight, params);
-    tex.invertedY(!glCoordsEnabled); // Pixels are read upside down
+    tex.invertedY(!cameraUp); // Pixels are read upside down
     setCache(img, tex);
     return tex;
   }
@@ -6972,7 +6980,7 @@ protected void setGLSettings() {
     // polygons are CCW in window coordinates, whereas  are CW
     // in the left-handed system that is Processing's default (with
     // its Y axis pointing down)
-    pgl.frontFace(glCoordsEnabled ? PGL.CCW : PGL.CW);
+    pgl.frontFace(cameraUp ? PGL.CCW : PGL.CW);
     pgl.disable(PGL.CULL_FACE);
 
     // Processing uses only one texture unit.

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

@@ -59,14 +59,6 @@ protected PGL createPGL(PGraphicsOpenGL pg) {
   }
 
 
-  public void vrCoordinates(boolean v) {
-    if (glCoordsEnabled != v) {
-      flush();
-      glCoordsEnabled = v;
-    }
-  }
-
-
   @Override
   public PMatrix3D getEyeMatrix() {
     PMatrix3D mat = new PMatrix3D();
@@ -192,7 +184,7 @@ protected void eyeTransform(Eye e) {
     defCameraFOV = fov.getTop()* DEG_TO_RAD;
     defCameraZ = (float) (height / (2 * Math.tan(defCameraFOV)));
     cameraAspect = (float)width / height;
-    if (glCoordsEnabled) {
+    if (cameraUp) {
       defCameraX = 0;
       defCameraY = 0;
     } else {
@@ -209,7 +201,7 @@ protected void headTransform(HeadTransform ht) {
 
     // Forward, right, and up vectors are given in the original system with Y
     // pointing up. Need to invert y coords in the non-gl case:
-    float yf = glCoordsEnabled ? +1 : -1;
+    float yf = cameraUp ? +1 : -1;
 
     headTransform.getForwardVector(forwardVector, 0);
     headTransform.getRightVector(rightVector, 0);
@@ -262,14 +254,14 @@ protected void setVRCamera() {
 
     // Calculating Y vector
     float y0 = 0;
-    float y1 = glCoordsEnabled ? + 1: -1;
+    float y1 = cameraUp ? + 1: -1;
     float y2 = 0;
 
     // Computing X vector as Y cross Z
     float x0 =  y1 * z2 - y2 * z1;
     float x1 = -y0 * z2 + y2 * z0;
     float x2 =  y0 * z1 - y1 * z0;
-    if (!glCoordsEnabled) {
+    if (!cameraUp) {
       // Inverting X axis
       x0 *= -1;
       x1 *= -1;