Fixed error with order of PMatrix2D elements

codeanticode · codeanticode · commit 4e572969de90 · 2012-05-23T02:35:04.000Z
diff --git a/java/libraries/opengl/src/processing/opengl/LinePath.java b/java/libraries/opengl/src/processing/opengl/LinePath.java
@@ -392,7 +392,6 @@ static public LinePath createStrokedPath(LinePath src, float weight,
                                            float miterlimit, PMatrix2D transform) {
     final LinePath dest = new LinePath();
 
-//    strokeTo(src, weight, caps, join, miterlimit, transform, new LineSink() {
     strokeTo(src, weight, caps, join, miterlimit, transform, new LineStroker() {
       public void moveTo(int x0, int y0) {
         dest.moveTo(S15_16ToFloat(x0), S15_16ToFloat(y0));
@@ -419,7 +418,6 @@ public void end() {
   
   private static void strokeTo(LinePath src, float width, int caps, int join,
                                float miterlimit, PMatrix2D transform,
-//                               LineSink lsink) {
                                LineStroker lsink) {
     lsink = new LineStroker(lsink, FloatToS15_16(width), caps, join,
                             FloatToS15_16(miterlimit),
@@ -430,7 +428,6 @@ private static void strokeTo(LinePath src, float width, int caps, int join,
   }
   
     
-//  private static void pathTo(PathIterator pi, LineSink lsink) {
   private static void pathTo(PathIterator pi, LineStroker lsink) {
     float coords[] = new float[2];
     while (!pi.isDone()) {
diff --git a/java/libraries/opengl/src/processing/opengl/LineStroker.java b/java/libraries/opengl/src/processing/opengl/LineStroker.java
@@ -27,8 +27,7 @@
 
 import processing.core.PMatrix2D;
 
-public class LineStroker /*extends LineSink*/ {
-//  private LineSink output;
+public class LineStroker  {
   private LineStroker output;
 //  private int lineWidth;
   private int capStyle;
@@ -88,7 +87,7 @@ public LineStroker() {
    * Constructs a <code>LineStroker</code>.
    * 
    * @param output
-   *          an output <code>LineSink</code>.
+   *          an output <code>LineStroker</code>.
    * @param lineWidth
    *          the desired line width in pixels, in S15.16 format.
    * @param capStyle
@@ -105,20 +104,18 @@ public LineStroker() {
    *          required in order to produce consistently shaped end caps and
    *          joins.
    */
-//  public LineStroker(LineSink output, int lineWidth, int capStyle, int joinStyle,
   public LineStroker(LineStroker output, int lineWidth, int capStyle, int joinStyle,
                  int miterLimit, PMatrix2D transform) {
     setOutput(output);
     setParameters(lineWidth, capStyle, joinStyle, miterLimit, transform);
   }
 
   /**
-   * Sets the output <code>LineSink</code> of this <code>LineStroker</code>.
+   * Sets the output <code>LineStroker</code> of this <code>LineStroker</code>.
    * 
    * @param output
-   *          an output <code>LineSink</code>.
+   *          an output <code>LineStroker</code>.
    */
-//  public void setOutput(LineSink output) {
   public void setOutput(LineStroker output) {
     this.output = output;
   }
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -3424,19 +3424,19 @@ public void resetMatrix() {
 
 
   public void applyMatrix(PMatrix2D source) {
-    applyMatrixImpl(source.m00, source.m01, source.m02, 0,
-                    source.m10, source.m11, source.m12, 0,
-                             0,          0,          1, 0,
-                             0,          0,          0, 1);
+    applyMatrixImpl(source.m00, source.m01, 0, source.m02,
+                    source.m10, source.m11, 0, source.m12,
+                             0,          0, 1, 0,
+                             0,          0, 0, 1);
   }
 
 
   public void applyMatrix(float n00, float n01, float n02,
                           float n10, float n11, float n12) {
-    applyMatrixImpl(n00, n01, n02, 0,
-                    n10, n11, n12, 0,
-                      0,   0,   1, 0,
-                      0,   0,   0, 1);
+    applyMatrixImpl(n00, n01, 0, n02,
+                    n10, n11, 0, n12,
+                      0,   0, 1,   0,
+                      0,   0, 0,   1);
   }
 
 
diff --git a/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java b/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java
@@ -1683,8 +1683,8 @@ public void scale(float x, float y, float z) {
   public void applyMatrix(PMatrix2D source) {
     transform(MATRIX, source.m00, source.m01, 0, source.m02,
                       source.m10, source.m11, 0, source.m12,
-                      0, 0, 1, 0,
-                      0, 0, 0, 1);
+                               0,          0, 1,          0,
+                               0,          0, 0,          1);
   }
   
 

Original file line number	Diff line number	Diff line change
`@@ -1683,8 +1683,8 @@ public void scale(float x, float y, float z) {`
`1683`	`1683`	`public void applyMatrix(PMatrix2D source) {`
`1684`	`1684`	`transform(MATRIX, source.m00, source.m01, 0, source.m02,`
`1685`	`1685`	`source.m10, source.m11, 0, source.m12,`
`1686`		`- 0, 0, 1, 0,`
`1687`		`- 0, 0, 0, 1);`
	`1686`	`+ 0, 0, 1, 0,`
	`1687`	`+ 0, 0, 0, 1);`
`1688`	`1688`	`}`
`1689`	`1689`
`1690`	`1690`