properly update stroke weights for lines and points in PShape objects

codeanticode · codeanticode · commit a20de58be3e6 · 2016-01-14T16:54:02.000-05:00
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -3797,6 +3797,30 @@ static protected void invTranslate(PMatrix3D matrix,
   }
 
 
+  static protected float matrixScale(PMatrix matrix) {
+    // Volumetric scaling factor that is associated to the given
+    // transformation matrix, which is given by the absolute value of its
+    // determinant:
+    float factor = 1;
+
+    if (matrix != null) {
+      if (matrix instanceof PMatrix2D) {
+        PMatrix2D tr = (PMatrix2D)matrix;
+        float areaScaleFactor = Math.abs(tr.m00 * tr.m11 - tr.m01 * tr.m10);
+        factor = (float) Math.sqrt(areaScaleFactor);
+      } else if (matrix instanceof PMatrix3D) {
+        PMatrix3D tr = (PMatrix3D)matrix;
+        float volumeScaleFactor =
+          Math.abs(tr.m00 * (tr.m11 * tr.m22 - tr.m12 * tr.m21) +
+                   tr.m01 * (tr.m12 * tr.m20 - tr.m10 * tr.m22) +
+                   tr.m02 * (tr.m10 * tr.m21 - tr.m11 * tr.m20));
+        factor = (float) Math.pow(volumeScaleFactor, 1.0f / 3.0f);
+      }
+    }
+    return factor;
+  }
+
+
   /**
    * Two dimensional rotation. Same as rotateZ (this is identical to a 3D
    * rotation along the z-axis) but included for clarity -- it'd be weird for
@@ -10683,6 +10707,7 @@ void applyMatrixOnLineGeometry(PMatrix2D tr, int first, int last) {
       if (first < last) {
         int index;
 
+        float scaleFactor = matrixScale(tr);
         for (int i = first; i <= last; i++) {
           index = 4 * i;
           float x = lineVertices[index++];
@@ -10699,6 +10724,7 @@ void applyMatrixOnLineGeometry(PMatrix2D tr, int first, int last) {
           index = 4 * i;
           lineDirections[index++] = dx*tr.m00 + dy*tr.m01;
           lineDirections[index  ] = dx*tr.m10 + dy*tr.m11;
+          lineDirections[index + 2] *= scaleFactor;
         }
       }
     }
@@ -10707,6 +10733,7 @@ void applyMatrixOnPointGeometry(PMatrix2D tr, int first, int last) {
       if (first < last) {
         int index;
 
+        float matrixScale = matrixScale(tr);
         for (int i = first; i <= last; i++) {
           index = 4 * i;
           float x = pointVertices[index++];
@@ -10715,6 +10742,10 @@ void applyMatrixOnPointGeometry(PMatrix2D tr, int first, int last) {
           index = 4 * i;
           pointVertices[index++] = x*tr.m00 + y*tr.m01 + tr.m02;
           pointVertices[index  ] = x*tr.m10 + y*tr.m11 + tr.m12;
+
+          index = 2 * i;
+          pointOffsets[index++] *= matrixScale;
+          pointOffsets[index] *= matrixScale;
         }
       }
     }
@@ -10780,6 +10811,7 @@ void applyMatrixOnLineGeometry(PMatrix3D tr, int first, int last) {
       if (first < last) {
         int index;
 
+        float scaleFactor = matrixScale(tr);
         for (int i = first; i <= last; i++) {
           index = 4 * i;
           float x = lineVertices[index++];
@@ -10801,7 +10833,8 @@ void applyMatrixOnLineGeometry(PMatrix3D tr, int first, int last) {
           index = 4 * i;
           lineDirections[index++] = dx*tr.m00 + dy*tr.m01 + dz*tr.m02;
           lineDirections[index++] = dx*tr.m10 + dy*tr.m11 + dz*tr.m12;
-          lineDirections[index  ] = dx*tr.m20 + dy*tr.m21 + dz*tr.m22;
+          lineDirections[index++] = dx*tr.m20 + dy*tr.m21 + dz*tr.m22;
+          lineDirections[index] *= scaleFactor;
         }
       }
     }
@@ -10810,6 +10843,7 @@ void applyMatrixOnPointGeometry(PMatrix3D tr, int first, int last) {
       if (first < last) {
         int index;
 
+        float matrixScale = matrixScale(tr);
         for (int i = first; i <= last; i++) {
           index = 4 * i;
           float x = pointVertices[index++];
@@ -10822,6 +10856,10 @@ void applyMatrixOnPointGeometry(PMatrix3D tr, int first, int last) {
           pointVertices[index++] = x*tr.m10 + y*tr.m11 + z*tr.m12 + w*tr.m13;
           pointVertices[index++] = x*tr.m20 + y*tr.m21 + z*tr.m22 + w*tr.m23;
           pointVertices[index  ] = x*tr.m30 + y*tr.m31 + z*tr.m32 + w*tr.m33;
+
+          index = 2 * i;
+          pointOffsets[index++] *= matrixScale;
+          pointOffsets[index] *= matrixScale;
         }
       }
     }
@@ -11963,28 +12001,7 @@ boolean noCapsJoins() {
 
     float transformScale() {
       if (-1 < transformScale) return transformScale;
-
-      // Volumetric scaling factor that is associated to the current
-      // transformation matrix, which is given by the absolute value of its
-      // determinant:
-      float factor = 1;
-
-      if (transform != null) {
-        if (transform instanceof PMatrix2D) {
-          PMatrix2D tr = (PMatrix2D)transform;
-          float areaScaleFactor = Math.abs(tr.m00 * tr.m11 - tr.m01 * tr.m10);
-          factor = (float) Math.sqrt(areaScaleFactor);
-        } else if (transform instanceof PMatrix3D) {
-          PMatrix3D tr = (PMatrix3D)transform;
-          float volumeScaleFactor =
-            Math.abs(tr.m00 * (tr.m11 * tr.m22 - tr.m12 * tr.m21) +
-                     tr.m01 * (tr.m12 * tr.m20 - tr.m10 * tr.m22) +
-                     tr.m02 * (tr.m10 * tr.m21 - tr.m11 * tr.m20));
-          factor = (float) Math.pow(volumeScaleFactor, 1.0f / 3.0f);
-        }
-      }
-
-      return transformScale = factor;
+      return transformScale = matrixScale(transform);
     }
 
     boolean segmentIsAxisAligned(int i0, int i1) {
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -1459,6 +1459,7 @@ protected void applyMatrixImpl(PMatrix matrix) {
         tessGeo.applyMatrixOnPointGeometry(matrix,
                                            firstPointVertex, lastPointVertex);
         root.setModifiedPointVertices(firstPointVertex, lastPointVertex);
+        root.setModifiedPointAttributes(firstPointVertex, lastPointVertex);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1459,6 +1459,7 @@ protected void applyMatrixImpl(PMatrix matrix) {`
`1459`	`1459`	`tessGeo.applyMatrixOnPointGeometry(matrix,`
`1460`	`1460`	`firstPointVertex, lastPointVertex);`
`1461`	`1461`	`root.setModifiedPointVertices(firstPointVertex, lastPointVertex);`
	`1462`	`+ root.setModifiedPointAttributes(firstPointVertex, lastPointVertex);`
`1462`	`1463`	`}`
`1463`	`1464`	`}`
`1464`	`1465`	`}`