eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 02:45:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

texture wrap can be set multiple times in a sketch, fixes #5322

Browse Source
This commit is contained in:
codeanticode
2017-12-08 15:28:18 +09:00
parent 159b5434cb
commit fb47853b1b
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -617,7 +617,7 @@ public class PGraphicsOpenGL extends PGraphics {
format = ARGB;
if (primary) {
fbStack = new FrameBuffer[FB_STACK_DEPTH];
fontMap = new WeakHashMap<PFont, FontTexture>();
fontMap = new WeakHashMap<>();
tessellator = new Tessellator();
} else {
tessellator = getPrimaryPG().tessellator;
@@ -1993,6 +1993,9 @@ public class PGraphicsOpenGL extends PGraphics {
@Override
public void textureWrap(int wrap) {
if (this.textureWrap != wrap) {
flush();
}
this.textureWrap = wrap;
}
@@ -7142,7 +7145,7 @@ public class PGraphicsOpenGL extends PGraphics {
static protected class AttributeMap extends HashMap<String, VertexAttribute> {
public ArrayList<String> names = new ArrayList<String>();
public ArrayList<String> names = new ArrayList<>();
public int numComp = 0; // number of components for a single vertex
@Override
@@ -7668,9 +7671,9 @@ public class PGraphicsOpenGL extends PGraphics {
shininess = new float[PGL.DEFAULT_IN_VERTICES];
edges = new int[PGL.DEFAULT_IN_EDGES][3];
fattribs = new HashMap<String, float[]>();
iattribs = new HashMap<String, int[]>();
battribs = new HashMap<String, byte[]>();
fattribs = new HashMap<>();
iattribs = new HashMap<>();
battribs = new HashMap<>();
clear();
}
@@ -9105,7 +9108,7 @@ public class PGraphicsOpenGL extends PGraphics {
FloatBuffer polyShininessBuffer;
// Generic attributes
HashMap<String, Buffer> polyAttribBuffers = new HashMap<String, Buffer>();
HashMap<String, Buffer> polyAttribBuffers = new HashMap<>();
int polyIndexCount;
int firstPolyIndex;
@@ -9160,9 +9163,9 @@ public class PGraphicsOpenGL extends PGraphics {
float[] pointOffsets;
short[] pointIndices;
HashMap<String, float[]> fpolyAttribs = new HashMap<String, float[]>();
HashMap<String, int[]> ipolyAttribs = new HashMap<String, int[]>();
HashMap<String, byte[]> bpolyAttribs = new HashMap<String, byte[]>();
HashMap<String, float[]> fpolyAttribs = new HashMap<>();
HashMap<String, int[]> ipolyAttribs = new HashMap<>();
HashMap<String, byte[]> bpolyAttribs = new HashMap<>();
TessGeometry(PGraphicsOpenGL pg, AttributeMap attr, int mode) {
this.pg = pg;