Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8f7a0e3: Merge change I7299c83b into eclair

Browse Source 
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-mr2

* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
This commit is contained in:
Jason Sams
2009-10-16 15:17:25 -07:00
committed by Android Git Automerger
parent 93942a5bbc d8f7a0e3de
commit 12751251cf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/java/android/renderscript/SimpleMesh.java
View File

@@ -228,17 +228,17 @@ public class SimpleMesh extends BaseObj {
mVtxData[mVtxCount++] = mB; mVtxData[mVtxCount++] = mB;
mVtxData[mVtxCount++] = mA; mVtxData[mVtxCount++] = mA;
} }
if ((mFlags & TEXTURE_0) != 0) {
makeSpace(2);
mVtxData[mVtxCount++] = mS0;
mVtxData[mVtxCount++] = mT0;
}
if ((mFlags & NORMAL) != 0) { if ((mFlags & NORMAL) != 0) {
makeSpace(3); makeSpace(3);
mVtxData[mVtxCount++] = mNX; mVtxData[mVtxCount++] = mNX;
mVtxData[mVtxCount++] = mNY; mVtxData[mVtxCount++] = mNY;
mVtxData[mVtxCount++] = mNZ; mVtxData[mVtxCount++] = mNZ;
} }
if ((mFlags & TEXTURE_0) != 0) {
makeSpace(2);
mVtxData[mVtxCount++] = mS0;
mVtxData[mVtxCount++] = mT0;
}
} }
public void addVertex(float x, float y) { public void addVertex(float x, float y) {