Disabling perspective and camera methods in PGraphics2D, using orthographic projection as default

java/libraries/opengl/src/processing/opengl/PFontTexture.java

@@ -269,7 +269,7 @@ class PFontTexture implements PConstants {
         rgba[t++] = 0xFFFFFF00; // Set the leftmost pixel in this row as blank
         for (int x = 0; x < glyph.width; x++) {
           rgba[t++] = 0xFFFFFF00 | glyph.image.pixels[p++];
-        }        
+        }
         rgba[t++] = 0xFFFFFF00; // Set the rightmost pixel in this row as blank
       }
       java.util.Arrays.fill(rgba, (h - 1) * w, h * w, 0xFFFFFF00); // Set the last row to blank pixels.
@@ -342,7 +342,6 @@ class PFontTexture implements PConstants {
     public float u0, u1;
     public float v0, v1;
     public int[] pixels;
-
     
     public TextureInfo(int tidx, int cropX, int cropY, int cropW, int cropH, int[] pix) {
       texIndex = tidx;      

java/libraries/opengl/src/processing/opengl/PGraphics2D.java

@@ -68,6 +68,82 @@ public class PGraphics2D extends PGraphicsOpenGL {
     }
     super.hint(which);
   }
+
+  
+  //////////////////////////////////////////////////////////////
+
+  // PROJECTION
+  
+  
+  public void ortho() {
+    showMethodWarning("ortho");
+  }
+  
+  
+  public void ortho(float left, float right,
+                    float bottom, float top) {
+    showMethodWarning("ortho");
+  }
+  
+  
+  public void ortho(float left, float right,
+                    float bottom, float top,
+                    float near, float far) {
+    showMethodWarning("ortho");
+  }
+  
+  
+  public void perspective() {
+    showMethodWarning("perspective");
+  }  
+  
+  
+  public void perspective(float fov, float aspect, float zNear, float zFar) {
+    showMethodWarning("perspective");
+  }
+  
+  
+  public void frustum(float left, float right, float bottom, float top,
+                      float znear, float zfar) {
+    showMethodWarning("frustum");
+  }
+  
+  
+  protected void defaultPerspective() {    
+    super.ortho(-width/2, +width/2, -height/2, +height/2, cameraNear, cameraFar);
+  }
+  
+  
+  //////////////////////////////////////////////////////////////
+
+  // CAMERA
+  
+  
+  public void beginCamera() {
+    showMethodWarning("beginCamera");
+  }
+  
+  
+  public void endCamera() {
+    showMethodWarning("endCamera");
+  }
+  
+  
+  public void camera() {
+    showMethodWarning("camera");
+  }
+  
+  
+  public void camera(float eyeX, float eyeY, float eyeZ,
+                     float centerX, float centerY, float centerZ,
+                     float upX, float upY, float upZ) {
+    showMethodWarning("camera");
+  }
+  
+
+  protected void defaultCamera() {    
+    super.camera(cameraX, cameraY, cameraZ, cameraX, cameraY, 0, 0, 1, 0);
+  }
   
   
   //////////////////////////////////////////////////////////////

java/libraries/opengl/src/processing/opengl/PGraphics3D.java

@@ -49,6 +49,26 @@ public class PGraphics3D extends PGraphicsOpenGL {
   }    
   
   
+  //////////////////////////////////////////////////////////////
+
+  // PROJECTION
+  
+  
+  protected void defaultPerspective() {    
+    perspective();
+  }
+  
+  
+  //////////////////////////////////////////////////////////////
+
+  // CAMERA
+  
+  
+  protected void defaultCamera() {    
+    camera();
+  }  
+  
+  
   //////////////////////////////////////////////////////////////
 
   // SHAPE I/O

java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java

@@ -1515,13 +1515,12 @@ public class PGraphicsOpenGL extends PGraphics {
     }
 
     if (sizeChanged) {
-      // defaults to perspective, if the user has setup up their
-      // own projection, they'll need to fix it after resize anyway.
-      // this helps the people who haven't set up their own projection.
-      perspective();
-
-      // set up the default camera and initializes modelview matrix.
-      camera();
+      // Sets the default projection and camera (initializes modelview). 
+      // If the user has setup up their own projection, they'll need 
+      // to fix it after resize anyway. This helps the people who haven't 
+      // set up their own projection.        
+      defaultPerspective();
+      defaultCamera();
 
       // clear the flag
       sizeChanged = false;
@@ -3268,15 +3267,15 @@ public class PGraphicsOpenGL extends PGraphics {
       }
 
       if (textMode == MODEL) {
-        float high = glyph.height / (float) textFont.getSize();
-        float bwidth = glyph.width / (float) textFont.getSize();
+        float high    = glyph.height     / (float) textFont.getSize();
+        float bwidth  = glyph.width      / (float) textFont.getSize();
         float lextent = glyph.leftExtent / (float) textFont.getSize();
-        float textent = glyph.topExtent / (float) textFont.getSize();
+        float textent = glyph.topExtent  / (float) textFont.getSize();
 
         float x1 = x + lextent * textSize;
         float y1 = y - textent * textSize;
         float x2 = x1 + bwidth * textSize;
-        float y2 = y1 + high * textSize;
+        float y2 = y1 + high * textSize;        
 
         textCharModelImpl(tinfo, x1, y1, x2, y2);
       }
@@ -3298,6 +3297,15 @@ public class PGraphicsOpenGL extends PGraphics {
     vertex(x1, y1, info.u1, info.v1);
     vertex(x0, y1, info.u0, info.v1);
     endShape();
+    
+    if (PApplet.abs(info.crop[2]) != PApplet.abs(x1 - x0)) {    
+      PApplet.println("X: " + PApplet.abs(x1 - x0) + ": " + PApplet.abs(info.crop[2]));
+    }
+    if (PApplet.abs(info.crop[3]) != PApplet.abs(y1 - y0)) {
+      PApplet.println("Y: " + PApplet.abs(y1 - y0) + ": " + PApplet.abs(info.crop[3]));  
+    }
+    
+    
   }
 
 
@@ -3920,6 +3928,11 @@ public class PGraphicsOpenGL extends PGraphics {
     camera.print();
   }
 
+  
+  protected void defaultCamera() {
+    camera();  
+  }
+  
 
   //////////////////////////////////////////////////////////////
 
@@ -3931,7 +3944,7 @@ public class PGraphicsOpenGL extends PGraphics {
    * orthographic projection.
    */
   public void ortho() {
-    ortho(0, width, 0, height, cameraNear, cameraFar);
+    ortho(-width/2, +width/2, -height/2, +height/2, cameraNear, cameraFar);
   }
 
 
@@ -4039,7 +4052,7 @@ public class PGraphicsOpenGL extends PGraphics {
     calcProjmodelview();
   }
 
-
+  
   /**
    * Print the current projection matrix.
    */
@@ -4048,6 +4061,11 @@ public class PGraphicsOpenGL extends PGraphics {
   }
 
 
+  protected void defaultPerspective() {    
+    perspective();
+  }  
+  
+  
   //////////////////////////////////////////////////////////////
 
   // SCREEN AND MODEL COORDS
@@ -5332,7 +5350,8 @@ public class PGraphicsOpenGL extends PGraphics {
     pgl.initOffscreenSurface(pgPrimary.pgl);
     pgl.updateOffscreen(pgPrimary.pgl);
     
-    loadTextureImpl(Texture.BILINEAR, false);
+    //loadTextureImpl(Texture.BILINEAR, false);
+    loadTextureImpl(Texture.POINT, false);
     
     // In case of reinitialization (for example, when the smooth level
     // is changed), we make sure that all the OpenGL resources associated

java/libraries/opengl/src/processing/opengl/Texture.java

@@ -1094,7 +1094,7 @@ public class Texture implements PConstants {
     } else {
       throw new RuntimeException("Unknown texture format");     
     }
-    
+
     if (params.sampling == POINT) {
       glMagFilter = PGL.GL_NEAREST;
       glMinFilter = PGL.GL_NEAREST;