summaryrefslogtreecommitdiffstats
path: root/libs/rs/java/Film
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2009-10-02 18:18:35 -0700
committerJason Sams <rjsams@android.com>2009-10-02 18:18:35 -0700
commit7f047786d9e2027a15001a653675dae5a80f9390 (patch)
treeb05e3b88c0b2b134402d6bb51487c3eec8dbc283 /libs/rs/java/Film
parent7b16834adc1003f492cd2be4b1bcc3fb73a78c23 (diff)
downloadframeworks_base-7f047786d9e2027a15001a653675dae5a80f9390.zip
frameworks_base-7f047786d9e2027a15001a653675dae5a80f9390.tar.gz
frameworks_base-7f047786d9e2027a15001a653675dae5a80f9390.tar.bz2
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Diffstat (limited to 'libs/rs/java/Film')
-rw-r--r--libs/rs/java/Film/src/com/android/film/FilmStripMesh.java11
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) {