eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrected index expansion

Browse Source
This commit is contained in:
codeanticode
2012-04-16 21:36:54 +00:00
parent 3270b1dc85
commit 43a6939fec
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+14 -8
View File
@@ -6873,7 +6873,7 @@ public class PGraphicsOpenGL extends PGraphics {
int[] indices = pointIndices[inIdx];
int pos;
if (indices.length == 0) {
pointIndices[inIdx] = indices = new int[1];
indices = new int[1];
pos = 0;
} else {
int len = indices.length;
@@ -6882,23 +6882,25 @@ public class PGraphicsOpenGL extends PGraphics {
pos = len;
}
indices[pos] = tessIdx;
pointIndices[inIdx] = indices;
}
}
public void addLineIndex(int inIdx, int tessIdx) {
if (renderMode == RETAINED) {
int[] indices = pointIndices[inIdx];
int[] indices = lineIndices[inIdx];
int pos;
if (indices.length == 0) {
pointIndices[inIdx] = indices = new int[1];
indices = new int[1];
pos = 0;
} else {
int len = indices.length;
indices = new int[len + 1];
PApplet.arrayCopy(pointIndices[inIdx], indices, len);
PApplet.arrayCopy(lineIndices[inIdx], indices, len);
pos = len;
}
indices[pos] = tessIdx;
lineIndices[inIdx] = indices;
}
}
@@ -6908,8 +6910,8 @@ public class PGraphicsOpenGL extends PGraphics {
float[] weights = fillWeights[inIdx];
int pos;
if (indices.length == 0) {
fillIndices[inIdx] = indices = new int[1];
fillWeights[inIdx] = weights = new float[1];
indices = new int[1];
weights = new float[1];
pos = 0;
} else {
int len = indices.length;
@@ -6921,6 +6923,8 @@ public class PGraphicsOpenGL extends PGraphics {
}
indices[pos] = tessIdx;
weights[pos] = weight;
fillIndices[inIdx] = indices;
fillWeights[inIdx] = weights;
}
}
@@ -9012,8 +9016,10 @@ public class PGraphicsOpenGL extends PGraphics {
// used to construct this combined vertex.
for (int j = 0; j < 4; j++) {
double[] vertData = (double[])data[j];
vertex[25 + 2 * j + 0] = vertData[25];
vertex[25 + 2 * j + 1] = weight[j];
if (vertData != null) {
vertex[25 + 2 * j + 0] = vertData[25];
vertex[25 + 2 * j + 1] = weight[j];
}
}
// Normalizing normal vector, since the weighted