diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-02 21:40:07 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-02 21:40:07 -0400 |
| commit | 8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc (patch) | |
| tree | 57f59ef3558a2731b85f5457db4b4a1eb0864098 /libs | |
| parent | 82e863d8ab5166fec3dce96ae865d1e2d3bbc021 (diff) | |
| parent | 7f047786d9e2027a15001a653675dae5a80f9390 (diff) | |
| download | frameworks_base-8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc.zip frameworks_base-8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc.tar.gz frameworks_base-8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc.tar.bz2 | |
Merge change I7f047786 into eclair
* changes:
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/java/Film/src/com/android/film/FilmStripMesh.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java b/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java index 64aac26..448cce0 100644 --- a/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java +++ b/libs/rs/java/Film/src/com/android/film/FilmStripMesh.java @@ -212,7 +212,9 @@ class FilmStripMesh { t.nxyz(1, 0, 0); int count = vtx.length / 2; - SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder(rs, 3, true, true); + SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder( + rs, 3, + SimpleMesh.TriangleMeshBuilder.NORMAL | SimpleMesh.TriangleMeshBuilder.TEXTURE_0); float runningS = 0; for (int ct=0; ct < (count-1); ct++) { @@ -227,11 +229,14 @@ class FilmStripMesh { t.ny /= len; t.y = -0.5f; t.t = 0; - tm.add_XYZ_ST_NORM(t.x, t.y, t.z, t.s, t.t, t.nx, t.ny, t.nz); + tm.setNormal(t.nx, t.ny, t.nz); + tm.setTexture(t.s, t.t); + tm.addVertex(t.x, t.y, t.z); //android.util.Log.e("rs", "vtx x="+t.x+" y="+t.y+" z="+t.z+" s="+t.s+" t="+t.t); t.y = .5f; t.t = 1; - tm.add_XYZ_ST_NORM(t.x, t.y, t.z, t.s, t.t, t.nx, t.ny, t.nz); + tm.setTexture(t.s, t.t); + tm.addVertex(t.x, t.y, t.z); //android.util.Log.e("rs", "vtx x="+t.x+" y="+t.y+" z="+t.z+" s="+t.s+" t="+t.t); if((runningS*2) > mTriangleOffsetsCount) { |