Commit fd7c5a0
committed
texture wrap can be set multiple times in a sketch, fixes processing#5322
1 parent 74868ee commit fd7c5a0
1 file changed
Lines changed: 12 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -617,7 +617,7 @@ public void setPrimary(boolean primary) { | |||
| 617 | 617 | format = ARGB; | |
| 618 | 618 | if (primary) { | |
| 619 | 619 | fbStack = new FrameBuffer[FB_STACK_DEPTH]; | |
| 620 | - fontMap = new WeakHashMap<PFont, FontTexture>(); | ||
| 620 | + fontMap = new WeakHashMap<>(); | ||
| 621 | 621 | tessellator = new Tessellator(); | |
| 622 | 622 | } else { | |
| 623 | 623 | tessellator = getPrimaryPG().tessellator; | |
@@ -1993,6 +1993,9 @@ protected void endShape(int[] indices) { | |||
| 1993 | 1993 | ||
| 1994 | 1994 | @Override | |
| 1995 | 1995 | public void textureWrap(int wrap) { | |
| 1996 | + if (this.textureWrap != wrap) { | ||
| 1997 | + flush(); | ||
| 1998 | + } | ||
| 1996 | 1999 | this.textureWrap = wrap; | |
| 1997 | 2000 | } | |
| 1998 | 2001 | ||
@@ -7142,7 +7145,7 @@ static protected AttributeMap newAttributeMap() { | |||
| 7142 | 7145 | ||
| 7143 | 7146 | ||
| 7144 | 7147 | static protected class AttributeMap extends HashMap<String, VertexAttribute> { | |
| 7145 | - public ArrayList<String> names = new ArrayList<String>(); | ||
| 7148 | + public ArrayList<String> names = new ArrayList<>(); | ||
| 7146 | 7149 | public int numComp = 0; // number of components for a single vertex | |
| 7147 | 7150 | ||
| 7148 | 7151 | @Override | |
@@ -7668,9 +7671,9 @@ void allocate() { | |||
| 7668 | 7671 | shininess = new float[PGL.DEFAULT_IN_VERTICES]; | |
| 7669 | 7672 | edges = new int[PGL.DEFAULT_IN_EDGES][3]; | |
| 7670 | 7673 | ||
| 7671 | - fattribs = new HashMap<String, float[]>(); | ||
| 7672 | - iattribs = new HashMap<String, int[]>(); | ||
| 7673 | - battribs = new HashMap<String, byte[]>(); | ||
| 7674 | + fattribs = new HashMap<>(); | ||
| 7675 | + iattribs = new HashMap<>(); | ||
| 7676 | + battribs = new HashMap<>(); | ||
| 7674 | 7677 | ||
| 7675 | 7678 | clear(); | |
| 7676 | 7679 | } | |
@@ -9105,7 +9108,7 @@ static protected class TessGeometry { | |||
| 9105 | 9108 | FloatBuffer polyShininessBuffer; | |
| 9106 | 9109 | ||
| 9107 | 9110 | // Generic attributes | |
| 9108 | - HashMap<String, Buffer> polyAttribBuffers = new HashMap<String, Buffer>(); | ||
| 9111 | + HashMap<String, Buffer> polyAttribBuffers = new HashMap<>(); | ||
| 9109 | 9112 | ||
| 9110 | 9113 | int polyIndexCount; | |
| 9111 | 9114 | int firstPolyIndex; | |
@@ -9160,9 +9163,9 @@ static protected class TessGeometry { | |||
| 9160 | 9163 | float[] pointOffsets; | |
| 9161 | 9164 | short[] pointIndices; | |
| 9162 | 9165 | ||
| 9163 | - HashMap<String, float[]> fpolyAttribs = new HashMap<String, float[]>(); | ||
| 9164 | - HashMap<String, int[]> ipolyAttribs = new HashMap<String, int[]>(); | ||
| 9165 | - HashMap<String, byte[]> bpolyAttribs = new HashMap<String, byte[]>(); | ||
| 9166 | + HashMap<String, float[]> fpolyAttribs = new HashMap<>(); | ||
| 9167 | + HashMap<String, int[]> ipolyAttribs = new HashMap<>(); | ||
| 9168 | + HashMap<String, byte[]> bpolyAttribs = new HashMap<>(); | ||
| 9166 | 9169 | ||
| 9167 | 9170 | TessGeometry(PGraphicsOpenGL pg, AttributeMap attr, int mode) { | |
| 9168 | 9171 | this.pg = pg; | |
0 commit comments