added shift in ortho() so the default 2D projection is ortho(0, width, height, 0,...), as with glOrtho()

codeanticode · codeanticode · commit f97a0f80ce0d · 2012-11-30T02:05:41.000Z
diff --git a/core/src/processing/opengl/PGraphics2D.java b/core/src/processing/opengl/PGraphics2D.java
@@ -120,7 +120,7 @@ public void frustum(float left, float right, float bottom, float top,
 
   @Override
   protected void defaultPerspective() {
-    super.ortho(-width/2, +width/2, +height/2, -height/2, -1, +1);
+    super.ortho(0, width, height, 0, -1, +1);
   }
 
 
diff --git a/core/src/processing/opengl/PGraphics3D.java b/core/src/processing/opengl/PGraphics3D.java
@@ -85,7 +85,7 @@ protected void defaultCamera() {
   @Override
   protected void begin2D() {
     pushProjection();
-    ortho(-width/2, +width/2, +height/2, -height/2, -1, +1);
+    ortho(0, width, height, 0, -1, +1);
     pushMatrix();
     camera(width/2, height/2);
   }
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -4054,7 +4054,7 @@ protected void defaultCamera() {
    */
   @Override
   public void ortho() {
-    ortho(-width/2, +width/2, +height/2, -height/2, cameraNear, cameraFar);
+    ortho(0, width, height, 0, cameraNear, cameraFar);
   }
 
 
@@ -4070,33 +4070,18 @@ public void ortho(float left, float right,
 
 
   /**
-   * Sets an orthographic projection. The left, right, bottom and top
-   * values refer to the center of the screen, with the y-axis inverted
-   * with respect to the default orientation in Processing, e.g: botton-to-top
-   * instead of top-to-bottom.
-   * In particular, if we need to set the the orthographic projection exactly
-   * covering the rectangle starting at the origin and having the same
-   * dimensions as the screen size, then we would pass:
-   * left   = -width/2
-   * right  = +width/2
-   * bottom = +height/2
-   * top    = -height/2
-   * In general, if we want to set an ortographic projection covering the
-   * rectangle determined by the top-left corner (x0, y0) and bottom-right
-   * corner (x1, y1), we would need to pass the following parameters:
-   * left   = x0 - width/2
-   * right  = x1 - width/2
-   * bottom = height/2 - y0
-   * top    = height/2 - y1
-   * that just correspond to the change of coordinates between the
-   * coordinate system located at the screen center with the Y-axis
-   * bottom-to-top, and Processing's system.
+   * Sets an orthographic projection.
    *
    */
   @Override
   public void ortho(float left, float right,
                     float bottom, float top,
                     float near, float far) {
+    left   -= width/2;
+    right  -= width/2;
+    bottom -= height/2;
+    top    -= height/2;
+
     // Flushing geometry with a different perspective configuration.
     flush();
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void frustum(float left, float right, float bottom, float top,`
`120`	`120`
`121`	`121`	`@Override`
`122`	`122`	`protected void defaultPerspective() {`
`123`		`- super.ortho(-width/2, +width/2, +height/2, -height/2, -1, +1);`
	`123`	`+ super.ortho(0, width, height, 0, -1, +1);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected void defaultCamera() {`
`85`	`85`	`@Override`
`86`	`86`	`protected void begin2D() {`
`87`	`87`	`pushProjection();`
`88`		`- ortho(-width/2, +width/2, +height/2, -height/2, -1, +1);`
	`88`	`+ ortho(0, width, height, 0, -1, +1);`
`89`	`89`	`pushMatrix();`
`90`	`90`	`camera(width/2, height/2);`
`91`	`91`	`}`