From 1bdb9d346779ff5fa7cb6b9bff512f3caa06a896 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Thu, 1 Jul 2010 16:08:19 -0700 Subject: [PATCH] Switching allapps to use Mesh instead of SimpleMesh. Change-Id: I678525439341d54e6841df3df2d7ab0c67c0b266 --- res/raw/allapps.rs | 6 +++--- res/raw/allapps_bc.bc | Bin 11612 -> 11608 bytes src/com/android/launcher2/AllApps3D.java | 10 +++++----- .../android/launcher2/ScriptC_Allapps.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index 1465308115..aaf7c10d7d 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -305,7 +305,7 @@ static void drawFrontGrid(float rowOffset, float p) vpConstants->ImgSize.y = rsAllocationGetDimY(gSelectedIconTexture); vpConstants->Position.y = y - (rsAllocationGetDimY(gSelectedIconTexture) - rsAllocationGetDimY(gIconIDs[iconNum])) * 0.5f; - rsgDrawSimpleMesh(gSMCell); + rsgDrawMesh(gSMCell); } rsgBindProgramFragment(gPFTexMip); @@ -313,14 +313,14 @@ static void drawFrontGrid(float rowOffset, float p) vpConstants->ImgSize.y = rsAllocationGetDimY(gIconIDs[iconNum]); vpConstants->Position.y = y - 0.2f; rsgBindTexture(gPFTexMip, 0, gIconIDs[iconNum]); - rsgDrawSimpleMesh(gSMCell); + rsgDrawMesh(gSMCell); rsgBindProgramFragment(gPFTexMipAlpha); vpConstants->ImgSize.x = rsAllocationGetDimX(gLabelIDs[iconNum]); vpConstants->ImgSize.y = rsAllocationGetDimY(gLabelIDs[iconNum]); vpConstants->Position.y = y - 64.f - 0.2f; rsgBindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]); - rsgDrawSimpleMesh(gSMCell); + rsgDrawMesh(gSMCell); } iconNum++; } diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc index 59b0afbb20ada10d883b8eccc0a4b849eb9c7923..e2341bd613b0bf337745f16c89edc0fbdcce50d5 100644 GIT binary patch delta 858 zcmcZ;bt8(?$@#!NMIHu*;EkLMSs5!PuVyu6oG|$ztGhis%lo>BiX4ML+{~Gf@=K92x62XL-EhTRz zelcz-nQ=zQlg-1&z{sav*7l#H4!_`EA;YtMhi5P*|5+9+xc0IVPojqFMupx)vkL-@ z*Xk{JKC)jivFuG%aQjsh5+dj}L8AVZhh~C+o0EZ`>x`~X=c`m|1rW{zeNXqr|Xe*ZN5t70*s^>l0)=BhJX?Y%*C> z;+VZPU$W|H`{#$44EzH{z5yNd*CH(N#_{Ao@hu#}k4$t0bXr0K*t~UG3Z_+m#>e8*N;^h;v_(5EGEB=ky4E9dPKP zW!Pi(X~wRTw(0aS0DaSN^Z z(@h@NHc0HhrodyM=$9-v@niO75ynF;7QWmp+==xL6C8b#j0G<~);Z8((W|R*ES~Ao z6<`GOHBa26Hc7&M7tiL$2Hz$FBSj%RP$caM#979mh&<{uF(t>tc*(?M7ly-rel8JQ zpUzh>vIHd>_^L?WabggBuH%=Y(DQNe=?PXrToNsuvj1zi`$8o8gguY7nK*-ktzL{t z5@^Rt<-JE9ahzzGc{Hho&p8K_nrt&Q~N{J)OBS-I?zz&jFV; zECwtM3nV5Ad+J=|S$kNQB4H7_y>Iz66NfDH6pSG@YQ~j&8^{X21&0mzgJ1Z%h Zwd3RRz7(eE9|I7M{w#En-6e(r1OU!3UxEMt delta 862 zcmV-k1EKubTHIO*LPNmbAq)TjRIv%61p#-Hs|7Uyh?C(3M<{YIfk?W$N{rZ2DBpq)RP4&Qh&)Tkz|0x1S7+A*wN!3 z#PSf)FA>x1IE)!E#&0?m(K;={5Qb6|3(^>70}T;i{fEO4e?U!>(^v*#q%TKB6=4L4 z@u!ZI0tR6u1mjeMsVM)fN75GoLSZHb<5WcJm`_4I127S(BN+?w&o_fKMPW3}5CPT~ zIn4w{$Y3kTKY!m0a2173D26CF4d+nJWEhT-el2mC$fGUK0oY9;IExe64i-s97XcRg zM94(2LPQXa^Z){3Ekxuvlg%)ZWPrpJ5{Pk37L@#R9ywGq6ejQ(e+fua>PX0hI8AH= zjq#_B^b(6BAQNUaRwNl4(hOMdsb@%ye-O(4Z;8u;xy(F8NW775g<&6(|@!;un-0W8N?(u6A?Ym0!)b0*n(pG zB_K^L!Vu;#7%6KaiSeV$Fgp%oKgmDe4007kVMdOB5X(bEKjTzH>sZVbNydgWLmD|o z1TgI6M1-Xv|BM$vAQcAFM3TWR1Q2n~;zS0*7(coUsUxL;L733-&$r-6h2c1nWNb(? zw131kQ4wJwkny9-kUG*!ERKLom{}}F=rF`aO_S5ugT|qyYo6?%dh4HRp!b*B*|D6K zdN$-x&j3usN&rIu2#OIok;D?s&^p|L5Y1!>i!nP6(*lt}Ocs%GXz7|K`={ReryA(} oDY~|+Cbm|97=P+WCU6-K6-ma1G(#FWMhgTmFA+_|1poj50OH|ci~s-t diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java index 9ef98fd327..c17ad3850c 100644 --- a/src/com/android/launcher2/AllApps3D.java +++ b/src/com/android/launcher2/AllApps3D.java @@ -36,7 +36,7 @@ import android.renderscript.RSSurfaceView; import android.renderscript.RenderScript; import android.renderscript.RenderScriptGL; import android.renderscript.Sampler; -import android.renderscript.SimpleMesh; +import android.renderscript.Mesh; import android.renderscript.Type; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -945,7 +945,7 @@ public class AllApps3D extends RSSurfaceView private Resources mRes; ScriptC_Allapps mScript; - private SimpleMesh mMesh; + private Mesh mMesh; private ProgramVertex.MatrixAllocation mPVA; private ScriptField_VpConsts mUniformAlloc; @@ -1018,7 +1018,7 @@ public class AllApps3D extends RSSurfaceView } public void initMesh() { - SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder(sRS, 2, 0); + Mesh.TriangleMeshBuilder tm = new Mesh.TriangleMeshBuilder(sRS, 2, 0); for (int ct=0; ct < 16; ct++) { float pos = (1.f / (16.f - 1)) * ct; @@ -1029,7 +1029,7 @@ public class AllApps3D extends RSSurfaceView tm.addTriangle(ct, ct+1, ct+2); tm.addTriangle(ct+1, ct+3, ct+2); } - mMesh = tm.create(); + mMesh = tm.create(true); mScript.set_gSMCell(mMesh); } @@ -1112,7 +1112,7 @@ public class AllApps3D extends RSSurfaceView "}\n"; sb.setShader(t); sb.addConstant(mUniformAlloc.getType()); - sb.addInput(mMesh.getVertexType(0).getElement()); + sb.addInput(mMesh.getVertexAllocation(0).getType().getElement()); ProgramVertex pvc = sb.create(); pvc.bindAllocation(mPVA); pvc.bindConstants(mUniformAlloc.getAllocation(), 1); diff --git a/src/com/android/launcher2/ScriptC_Allapps.java b/src/com/android/launcher2/ScriptC_Allapps.java index aeb1c26503..cc1bb49fd7 100644 --- a/src/com/android/launcher2/ScriptC_Allapps.java +++ b/src/com/android/launcher2/ScriptC_Allapps.java @@ -170,13 +170,13 @@ public class ScriptC_Allapps extends ScriptC { } private final static int mExportVarIdx_gSMCell = 13; - private SimpleMesh mExportVar_gSMCell; - public void set_gSMCell(SimpleMesh v) { + private Mesh mExportVar_gSMCell; + public void set_gSMCell(Mesh v) { mExportVar_gSMCell = v; setVar(mExportVarIdx_gSMCell, (v == null) ? 0 : v.getID()); } - public SimpleMesh get_gSMCell() { + public Mesh get_gSMCell() { return mExportVar_gSMCell; }