ported last fixes from desktop

Author: codeanticode

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -677,7 +677,7 @@ public void requestDraw() {
   }
 
 
-/*
+  /*
   @Override
   // Java only
   public PSurface createSurface() {  // ignore
@@ -11032,9 +11032,9 @@ void tessellateRoundPoints3D(int nvertTot, int nindTot, int nPtVert) {
         float inc = (float) SINCOS_LENGTH / perim;
         for (int k = 0; k < perim; k++) {
           tess.pointOffsets[2 * attribIdx + 0] =
-            0.5f * cosLUT[(int) val] * strokeWeight;
+            0.5f * cosLUT[(int) val] * transformScale() * strokeWeight;
           tess.pointOffsets[2 * attribIdx + 1] =
-            0.5f * sinLUT[(int) val] * strokeWeight;
+            0.5f * sinLUT[(int) val] * transformScale() * strokeWeight;
           val = (val + inc) % SINCOS_LENGTH;
           attribIdx++;
         }
@@ -11162,9 +11162,9 @@ void tessellateSquarePoints3D(int nvertTot, int nindTot) {
         attribIdx++;
         for (int k = 0; k < 4; k++) {
           tess.pointOffsets[2 * attribIdx + 0] =
-            0.5f * QUAD_POINT_SIGNS[k][0] * strokeWeight;
+            0.5f * QUAD_POINT_SIGNS[k][0] * transformScale() * strokeWeight;
           tess.pointOffsets[2 * attribIdx + 1] =
-            0.5f * QUAD_POINT_SIGNS[k][1] * strokeWeight;
+            0.5f * QUAD_POINT_SIGNS[k][1] * transformScale() * strokeWeight;
           attribIdx++;
         }
 

core/src/processing/opengl/PShapeOpenGL.java

@@ -97,6 +97,7 @@ public class PShapeOpenGL extends PShape {
 
   protected HashSet<PImage> textures;
   protected boolean strokedTexture;
+  protected boolean untexChild;
 
   // ........................................................
 
@@ -425,6 +426,8 @@ public void addChild(PShape who) {
             for (PImage tex: c3d.textures) {
               addTexture(tex);
             }
+          } else {
+            untexChild(true);
           }
           if (c3d.strokedTexture) {
             strokedTexture(true);
@@ -435,6 +438,8 @@ public void addChild(PShape who) {
             if (c3d.stroke) {
               strokedTexture(true);
             }
+          } else {
+            untexChild(true);
           }
         }
 
@@ -462,6 +467,8 @@ public void addChild(PShape who, int idx) {
             for (PImage tex: c3d.textures) {
               addTexture(tex);
             }
+          } else {
+            untexChild(true);
           }
           if (c3d.strokedTexture) {
             strokedTexture(true);
@@ -472,6 +479,8 @@ public void addChild(PShape who, int idx) {
             if (c3d.stroke) {
               strokedTexture(true);
             }
+          } else {
+            untexChild(true);
           }
         }
 
@@ -487,6 +496,8 @@ public void addChild(PShape who, int idx) {
   @Override
   public void removeChild(int idx) {
     super.removeChild(idx);
+    strokedTexture(false);
+    untexChild(false);
     markForTessellation();
   }
 
@@ -792,7 +803,7 @@ protected void setTextureImpl(PImage tex) {
     }
 
     if (image0 != tex && parent != null) {
-      ((PShapeOpenGL)parent).removeTexture(tex);
+      ((PShapeOpenGL)parent).removeTexture(image0, this);
     }
     if (parent != null) {
       ((PShapeOpenGL)parent).addTexture(image);
@@ -845,14 +856,14 @@ protected void addTexture(PImage tex) {
   }
 
 
-  protected void removeTexture(PImage tex) {
+  protected void removeTexture(PImage tex, PShapeOpenGL caller) {
     if (textures == null || !textures.contains(tex)) return; // Nothing to remove.
 
-    // First check that none of the child shapes
-    // have texture tex...
+    // First check that none of the child shapes have texture tex...
     boolean childHasTex = false;
     for (int i = 0; i < childCount; i++) {
       PShapeOpenGL child = (PShapeOpenGL) children[i];
+      if (child == caller) continue;
       if (child.hasTexture(tex)) {
         childHasTex = true;
         break;
@@ -870,38 +881,76 @@ protected void removeTexture(PImage tex) {
     // Since this shape and all its child shapes don't contain
     // tex anymore, we now can remove it from the parent.
     if (parent != null) {
-      ((PShapeOpenGL)parent).removeTexture(tex);
+      ((PShapeOpenGL)parent).removeTexture(tex, this);
     }
   }
 
 
   protected void strokedTexture(boolean newValue) {
+    strokedTexture(newValue, null);
+  }
+
+
+  protected void strokedTexture(boolean newValue, PShapeOpenGL caller) {
     if (strokedTexture == newValue) return; // Nothing to change.
 
     if (newValue) {
       strokedTexture = true;
     } else {
-      // First check that none of the child shapes
-      // have have a stroked texture...
-      boolean childHasStrokedTex = false;
+      // Check that none of the child shapes have a stroked texture...
+      strokedTexture = false;
       for (int i = 0; i < childCount; i++) {
         PShapeOpenGL child = (PShapeOpenGL) children[i];
+        if (child == caller) continue;
         if (child.hasStrokedTexture()) {
-          childHasStrokedTex = true;
+          strokedTexture = true;
           break;
         }
       }
+    }
+
+    // Now we can update the parent shape.
+    if (parent != null) {
+      ((PShapeOpenGL)parent).strokedTexture(newValue, this);
+    }
+  }
+
+
+  protected void untexChild(boolean newValue) {
+    untexChild(newValue, null);
+  }
+
+
+  protected void untexChild(boolean newValue, PShapeOpenGL caller) {
+    if (untexChild == newValue) return; // Nothing to change.
 
-      if (!childHasStrokedTex) {
-        // ...if not, it is safe to mark this shape as without
-        // stroked texture.
-        strokedTexture = false;
+    if (newValue) {
+      untexChild = true;
+    } else {
+      // Check if any of the child shapes is not textured...
+      untexChild = false;
+      for (int i = 0; i < childCount; i++) {
+        PShapeOpenGL child = (PShapeOpenGL) children[i];
+        if (child == caller) continue;
+        if (!child.hasTexture()) {
+          untexChild = true;
+          break;
+        }
       }
     }
 
     // Now we can update the parent shape.
     if (parent != null) {
-      ((PShapeOpenGL)parent).strokedTexture(newValue);
+      ((PShapeOpenGL)parent).untexChild(newValue, this);
+    }
+  }
+
+
+  protected boolean hasTexture() {
+    if (family == GROUP) {
+      return textures != null && 0 < textures.size();
+    } else {
+      return image != null;
     }
   }
 
@@ -2797,6 +2846,11 @@ protected void tessellateImpl() {
     lastPointIndexCache = -1;
 
     if (family == GROUP) {
+      if (polyAttribs == null) {
+        polyAttribs = PGraphicsOpenGL.newAttributeMap();
+        collectPolyAttribs();
+      }
+
       for (int i = 0; i < childCount; i++) {
         PShapeOpenGL child = (PShapeOpenGL) children[i];
         child.tessellateImpl();
@@ -3255,7 +3309,8 @@ protected void tessellateSphere() {
     int[] indices = inGeo.addSphere(r, nu, nv, fill, stroke);
     tessellator.tessellateTriangles(indices);
 
-    if (savedDetailU != nu || savedDetailV != nv) {
+    if ((0 < savedDetailU && savedDetailU != nu) ||
+        (0 < savedDetailV && savedDetailV != nv)) {
       pg.sphereDetail(savedDetailU, savedDetailV);
     }
   }
@@ -4599,13 +4654,14 @@ public void draw(PGraphics g) {
 
 
   // Returns true if some child shapes below this one either
-  // use different texture maps or have stroked textures,
+  // use different texture maps (or only one texture is used by some while
+  // others are untextured), or have stroked textures,
   // so they cannot rendered in a single call.
   // Or accurate 2D mode is enabled, which forces each
   // shape to be rendered separately.
   protected boolean fragmentedGroup(PGraphicsOpenGL g) {
     return g.getHint(DISABLE_OPTIMIZED_STROKE) ||
-           (textures != null && 1 < textures.size()) ||
+           (textures != null && (1 < textures.size() || untexChild)) ||
            strokedTexture;
   }
 

core/src/processing/opengl/shaders/PointVert.glsl

@@ -47,8 +47,8 @@ void main() {
     gl_Position = clip + projectionMatrix * vec4(offset.xy, 0, 0);
   } else {
     // No perspective correction.	
-    vec4 offset = windowToClipVector(offset.xy, viewport, clip.w);
-    gl_Position = clip + offset;
+    vec4 cloff = windowToClipVector(offset.xy, viewport, clip.w);
+    gl_Position = clip + cloff;
   }
 
   vertColor = color;