summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2010-07-01 23:08:19 (GMT)
committerAlex Sakhartchouk <alexst@google.com>2010-07-01 23:12:27 (GMT)
commit1bdb9d346779ff5fa7cb6b9bff512f3caa06a896 (patch)
tree79f96a4c82de71829ebbc30177367b8e46f86509 /src
parentaafa03cbb925c74be1c13f8bb99d928be429e62f (diff)
downloadandroid_packages_apps_Trebuchet-1bdb9d346779ff5fa7cb6b9bff512f3caa06a896.zip
android_packages_apps_Trebuchet-1bdb9d346779ff5fa7cb6b9bff512f3caa06a896.tar.gz
android_packages_apps_Trebuchet-1bdb9d346779ff5fa7cb6b9bff512f3caa06a896.tar.bz2
Switching allapps to use Mesh instead of SimpleMesh.
Change-Id: I678525439341d54e6841df3df2d7ab0c67c0b266
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AllApps3D.java10
-rw-r--r--src/com/android/launcher2/ScriptC_Allapps.java6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 9ef98fd..c17ad38 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 aeb1c26..cc1bb49 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;
}