FX: Prevent matrix stack overflow

JakubValtar · JakubValtar · commit 122afdfe0b2a · 2016-12-29T19:00:24.000+01:00
Matrix stack could overflow in a very special case when beginShape() was called while strokeWeight=1 and then strokeWeight was changed before endShape(). This PR makes sure matrix is popped correctly even when user changes strokeWeight in the beginShape()/endShape() block. Decided to bug user only when necessary and not show warining when user changes strokeWeight in the beginShape()/endShape() block, same as in JAVA2D. Otherwise we could add checks for all the other things which are mentioned in the docs, but it would be hell to maintain and use. Fixes #4206
diff --git a/core/src/processing/javafx/PGraphicsFX2D.java b/core/src/processing/javafx/PGraphicsFX2D.java
@@ -64,6 +64,7 @@ public class PGraphicsFX2D extends PGraphics {
   Path2D workPath = new Path2D();
   Path2D auxPath = new Path2D();
   boolean openContour;
+  boolean adjustedForThinLines;
   /// break the shape at the next vertex (next vertex() call is a moveto())
   boolean breakShape;
 
@@ -214,7 +215,7 @@ public void beginShape(int kind) {
     flushPixels();
 
     if (drawingThinLines()) {
-      pushMatrix();
+      adjustedForThinLines = true;
       translate(0.5f, 0.5f);
     }
   }
@@ -420,8 +421,9 @@ public void endShape(int mode) {
       }
     }
     shape = 0;
-    if (drawingThinLines()) {
-      popMatrix();
+    if (adjustedForThinLines) {
+      adjustedForThinLines = false;
+      translate(-0.5f, -0.5f);
     }
     loaded = false;
   }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public class PGraphicsFX2D extends PGraphics {`
`64`	`64`	`Path2D workPath = new Path2D();`
`65`	`65`	`Path2D auxPath = new Path2D();`
`66`	`66`	`boolean openContour;`
	`67`	`+ boolean adjustedForThinLines;`
`67`	`68`	`/// break the shape at the next vertex (next vertex() call is a moveto())`
`68`	`69`	`boolean breakShape;`
`69`	`70`
`@@ -214,7 +215,7 @@ public void beginShape(int kind) {`
`214`	`215`	`flushPixels();`
`215`	`216`
`216`	`217`	`if (drawingThinLines()) {`
`217`		`- pushMatrix();`
	`218`	`+ adjustedForThinLines = true;`
`218`	`219`	`translate(0.5f, 0.5f);`
`219`	`220`	`}`
`220`	`221`	`}`
`@@ -420,8 +421,9 @@ public void endShape(int mode) {`
`420`	`421`	`}`
`421`	`422`	`}`
`422`	`423`	`shape = 0;`
`423`		`- if (drawingThinLines()) {`
`424`		`- popMatrix();`
	`424`	`+ if (adjustedForThinLines) {`
	`425`	`+ adjustedForThinLines = false;`
	`426`	`+ translate(-0.5f, -0.5f);`
`425`	`427`	`}`
`426`	`428`	`loaded = false;`
`427`	`429`	`}`