diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:56:29 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:56:29 -0400 |
| commit | d8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac (patch) | |
| tree | 363f249a91b2562f1c8541fa68cd76a3ed2c9d00 | |
| parent | 69fba87ac16d1c10da81fc3213ae169c755797f4 (diff) | |
| parent | 7299c83bd8f7053dec84d62a4914392bd91661ac (diff) | |
| download | frameworks_base-d8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac.zip frameworks_base-d8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac.tar.gz frameworks_base-d8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac.tar.bz2 | |
Merge change I7299c83b into eclair
* changes:
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
| -rw-r--r-- | graphics/java/android/renderscript/SimpleMesh.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/renderscript/SimpleMesh.java b/graphics/java/android/renderscript/SimpleMesh.java index 0ad093e..3d10e3b 100644 --- a/graphics/java/android/renderscript/SimpleMesh.java +++ b/graphics/java/android/renderscript/SimpleMesh.java @@ -228,17 +228,17 @@ public class SimpleMesh extends BaseObj { mVtxData[mVtxCount++] = mB; mVtxData[mVtxCount++] = mA; } + if ((mFlags & TEXTURE_0) != 0) { + makeSpace(2); + mVtxData[mVtxCount++] = mS0; + mVtxData[mVtxCount++] = mT0; + } if ((mFlags & NORMAL) != 0) { makeSpace(3); mVtxData[mVtxCount++] = mNX; mVtxData[mVtxCount++] = mNY; mVtxData[mVtxCount++] = mNZ; } - if ((mFlags & TEXTURE_0) != 0) { - makeSpace(2); - mVtxData[mVtxCount++] = mS0; - mVtxData[mVtxCount++] = mT0; - } } public void addVertex(float x, float y) { |