Fixes axis-orientation inconsistency in ortho() and fustrum() (issue #1240)

codeanticode · codeanticode · commit ba730231982c · 2012-11-30T01:34:26.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(-width/2, +width/2, +height/2, -height/2, -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(-width/2, +width/2, +height/2, -height/2, -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(-width/2, +width/2, +height/2, -height/2, cameraNear, cameraFar);
   }
 
 
@@ -4079,15 +4079,15 @@ public void ortho(float left, float right,
    * dimensions as the screen size, then we would pass:
    * left   = -width/2
    * right  = +width/2
-   * bottom = -height/2
-   * top    = +height/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 - y1
-   * top    = height/2 - y0
+   * 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.
@@ -4109,10 +4109,10 @@ public void ortho(float left, float right,
     float tz = -(far + near)   / (far - near);
 
     // The minus sign is needed to invert the Y axis.
-    projection.set(x,  0, 0, tx,
-                   0, -y, 0, ty,
-                   0,  0, z, tz,
-                   0,  0, 0,  1);
+    projection.set(x, 0, 0, tx,
+                   0, y, 0, ty,
+                   0, 0, z, tz,
+                   0, 0, 0,  1);
 
     calcProjmodelview();
 
@@ -4155,7 +4155,7 @@ public void perspective(float fov, float aspect, float zNear, float zFar) {
     float ymin = -ymax;
     float xmin = ymin * aspect;
     float xmax = ymax * aspect;
-    frustum(xmin, xmax, ymin, ymax, zNear, zFar);
+    frustum(xmin, xmax, ymax, ymin, zNear, zFar);
   }
 
 
@@ -4176,10 +4176,10 @@ public void frustum(float left, float right, float bottom, float top,
     float h = top - bottom;
     float d = zfar - znear;
 
-    projection.set(n2 / w,       0,  (right + left) / w,                0,
-                        0, -n2 / h,  (top + bottom) / h,                0,
-                        0,       0, -(zfar + znear) / d, -(n2 * zfar) / d,
-                        0,       0,                  -1,                0);
+    projection.set(n2 / w,      0,  (right + left) / w,                0,
+                        0, n2 / h,  (top + bottom) / h,                0,
+                        0,      0, -(zfar + znear) / d, -(n2 * zfar) / d,
+                        0,      0,                  -1,                0);
 
     calcProjmodelview();
 

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(-width/2, +width/2, +height/2, -height/2, -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(-width/2, +width/2, +height/2, -height/2, -1, +1);`
`89`	`89`	`pushMatrix();`
`90`	`90`	`camera(width/2, height/2);`
`91`	`91`	`}`