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

fixed some indexing bugs in glmodel

Browse Source
This commit is contained in:
codeanticode
2010-02-03 12:03:33 +00:00
parent e74bf3528f
commit bdc59f94b8
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
android/core/src/processing/android/core/GLModel.java
View File

@@ -61,6 +61,7 @@ public class GLModel implements GLConstants, PConstants {
////////////////////////////////////////////////////////////
// Constructors.
public GLModel(PApplet parent, int numVert) {
this(parent, numVert, new Parameters());
@@ -97,6 +98,7 @@ public class GLModel implements GLConstants, PConstants {
deleteTexCoordBuffer();
deleteNormalBuffer();
}
////////////////////////////////////////////////////////////
@@ -341,7 +343,13 @@ public class GLModel implements GLConstants, PConstants {
}
firstUpdateIdx = 0;
firstUpdateIdx = numVertices;
lastUpdateIdx = numVertices - 1;
if (creatingGroup) {
grIdx0 = 0;
grIdx1 = numVertices - 1;
}
PApplet.arrayCopy(data, updateVertexArray);
}
@@ -353,7 +361,12 @@ public class GLModel implements GLConstants, PConstants {
firstUpdateIdx = 0;
lastUpdateIdx = numVertices - 1;
if (creatingGroup) {
grIdx0 = 0;
grIdx1 = numVertices - 1;
}
PVector vec;
for (int i = 0; i < numVertices; i++) {
vec = (PVector)data.get(i);
@@ -469,7 +482,7 @@ public class GLModel implements GLConstants, PConstants {
}
firstUpdateIdx = 0;
firstUpdateIdx = numVertices;
firstUpdateIdx = numVertices - 1;
PApplet.arrayCopy(data, updateColorArray);
}
@@ -563,7 +576,7 @@ public class GLModel implements GLConstants, PConstants {
}
firstUpdateIdx = 0;
firstUpdateIdx = numVertices;
firstUpdateIdx = numVertices - 1;
PApplet.arrayCopy(data, updateNormalArray);
}
@@ -687,7 +700,14 @@ public class GLModel implements GLConstants, PConstants {
}
firstUpdateIdx = 0;
firstUpdateIdx = numVertices;
firstUpdateIdx = numVertices - 1;
if (updateTexture != null) {
for (int i = 0; i < numVertices; i++)
if (vertGroup[i] != null) {
vertGroup[i].texture = updateTexture;
}
}
if (a3d.imageMode == IMAGE) {
float u, v;
@@ -718,6 +738,13 @@ public class GLModel implements GLConstants, PConstants {
firstUpdateIdx = 0;
lastUpdateIdx = numVertices - 1;
if (updateTexture != null) {
for (int i = 0; i < numVertices; i++)
if (vertGroup[i] != null) {
vertGroup[i].texture = updateTexture;
}
}
PVector vec;
for (int i = 0; i < numVertices; i++) {