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

handling attributes in tessellator

Browse Source
This commit is contained in:
codeanticode
2015-03-18 16:05:58 -04:00
parent 42f018e02a
commit 0ae7be5f6f
1 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGraphicsOpenGL.java
+105
View File
@@ -9497,6 +9497,7 @@ public class PGraphicsOpenGL extends PGraphics {
trimPolySpecular();
trimPolyEmissive();
trimPolyShininess();
trimAttributes();
}
if (0 < polyIndexCount && polyIndexCount < polyIndices.length) {
@@ -9580,6 +9581,49 @@ public class PGraphicsOpenGL extends PGraphics {
polyShininessBuffer = PGL.allocateFloatBuffer(polyShininess);
}
void trimAttributes() {
}
/*
void expandAttributes(int n) {
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.type == PGL.FLOAT) {
expandFloatAttribute(attrib, n);
} else if (attrib.type == PGL.INT) {
expandIntAttribute(attrib, n);
} else if (attrib.type == PGL.BOOL) {
expandBoolAttribute(attrib, n);
}
}
}
void expandFloatAttribute(VertexAttribute attrib, int n) {
float[] array = fattribs.get(attrib.name);
float temp[] = new float[attrib.size * n];
PApplet.arrayCopy(array, 0, temp, 0, attrib.size * polyVertexCount);
fattribs.put(attrib.name, temp);
polyAttribBuffers.put(attrib.name, PGL.allocateFloatBuffer(temp));
}
void expandIntAttribute(VertexAttribute attrib, int n) {
int[] array = iattribs.get(attrib.name);
int temp[] = new int[attrib.size * n];
PApplet.arrayCopy(array, 0, temp, 0, attrib.size * polyVertexCount);
iattribs.put(attrib.name, temp);
polyAttribBuffers.put(attrib.name, PGL.allocateIntBuffer(temp));
}
void expandBoolAttribute(VertexAttribute attrib, int n) {
byte[] array = battribs.get(attrib.name);
byte temp[] = new byte[attrib.size * n];
PApplet.arrayCopy(array, 0, temp, 0, attrib.size * polyVertexCount);
battribs.put(attrib.name, temp);
polyAttribBuffers.put(attrib.name, PGL.allocateByteBuffer(temp));
}
*/
void trimPolyIndices() {
short temp[] = new short[polyIndexCount];
PApplet.arrayCopy(polyIndices, 0, temp, 0, polyIndexCount);
@@ -9973,6 +10017,13 @@ public class PGraphicsOpenGL extends PGraphics {
polyNormals[index++] = nx*nm.m01 + ny*nm.m11 + nz*nm.m21;
polyNormals[index ] = nx*nm.m02 + ny*nm.m12 + nz*nm.m22;
}
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isColor() || attrib.isOther()) continue;
// TODO...
}
} else {
if (nvert <= PGL.MIN_ARRAYCOPY_SIZE) {
// Copying elements one by one instead of using arrayCopy is more
@@ -10002,6 +10053,12 @@ public class PGraphicsOpenGL extends PGraphics {
polyNormals[index++] = ny;
polyNormals[index ] = nz;
}
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isColor() || attrib.isOther()) continue;
// TODO...
}
} else {
for (int i = 0; i < nvert; i++) {
int inIdx = i0 + i;
@@ -10012,6 +10069,12 @@ public class PGraphicsOpenGL extends PGraphics {
}
PApplet.arrayCopy(in.normals, 3 * i0,
polyNormals, 3 * firstPolyVertex, 3 * nvert);
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isColor() || attrib.isOther()) continue;
// TODO...
}
}
}
@@ -10035,6 +10098,12 @@ public class PGraphicsOpenGL extends PGraphics {
polyEmissive[tessIdx] = in.emissive[inIdx];
polyShininess[tessIdx] = in.shininess[inIdx];
}
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isPosition() || attrib.isNormal()) continue;
// TODO...
}
} else {
PApplet.arrayCopy(in.colors, i0,
polyColors, firstPolyVertex, nvert);
@@ -10048,6 +10117,12 @@ public class PGraphicsOpenGL extends PGraphics {
polyEmissive, firstPolyVertex, nvert);
PApplet.arrayCopy(in.shininess, i0,
polyShininess, firstPolyVertex, nvert);
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isPosition() || attrib.isNormal()) continue;
// TODO...
}
}
}
@@ -10101,6 +10176,12 @@ public class PGraphicsOpenGL extends PGraphics {
polyNormals[index ] = nx*tr.m10 + ny*tr.m11;
}
}
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isColor() || attrib.isOther()) continue;
// TODO...
}
}
void applyMatrixOnLineGeometry(PMatrix2D tr, int first, int last) {
@@ -10174,6 +10255,12 @@ public class PGraphicsOpenGL extends PGraphics {
polyNormals[index ] = nx*tr.m20 + ny*tr.m21 + nz*tr.m22;
}
}
for (String name: attribs.keySet()) {
VertexAttribute attrib = attribs.get(name);
if (attrib.isColor() || attrib.isOther()) continue;
// TODO...
}
}
void applyMatrixOnLineGeometry(PMatrix3D tr, int first, int last) {
@@ -10297,6 +10384,7 @@ public class PGraphicsOpenGL extends PGraphics {
callback = new TessellatorCallback();
gluTess = pg.pgl.createTessellator(callback);
}
callback.setAttribs(tess.attribs);
}
void setInGeometry(InGeometry in) {
@@ -12463,6 +12551,23 @@ public class PGraphicsOpenGL extends PGraphics {
}
}
AttributeMap attribs;
HashMap<Integer, String> nameMap;
void setAttribs(AttributeMap attribs) {
this.attribs = attribs;
nameMap = new HashMap<Integer, String>();
int i = 0;
for (String name: attribs.keySet()) {
nameMap.put(i, name);
i++;
}
}
VertexAttribute posToAttrib(int i) {
return attribs.get(nameMap.get(i));
}
public void begin(int type) {
cacheIndex = cache.getLast();
if (firstPolyIndexCache == -1) {