Update to match predefined element API change.
diff --git a/src/com/android/wallpaper/fall/FallRS.java b/src/com/android/wallpaper/fall/FallRS.java
index 1109d0d..93da00a 100644
--- a/src/com/android/wallpaper/fall/FallRS.java
+++ b/src/com/android/wallpaper/fall/FallRS.java
@@ -256,7 +256,7 @@
private void createLeaves() {
final float[] leaves = new float[LEAVES_COUNT * LEAF_STRUCT_FIELDS_COUNT];
- mLeaves = Allocation.createSized(mRS, USER_FLOAT, leaves.length);
+ mLeaves = Allocation.createSized(mRS, USER_F32(mRS), leaves.length);
for (int i = 0; i < leaves.length; i += LEAF_STRUCT_FIELDS_COUNT) {
createLeaf(leaves, i);
}
@@ -270,13 +270,13 @@
float d = (float) Math.tan(Math.asin(Math.sin(Math.atan(i * (1.0f / 256.0f))) * ir));
refractionMap[i] = (int) Math.floor(d * (1 << 16) + 0.5f);
}
- mRefractionMap = Allocation.createSized(mRS, USER_I32, refractionMap.length);
+ mRefractionMap = Allocation.createSized(mRS, USER_I32(mRS), refractionMap.length);
mRefractionMap.data(refractionMap);
}
private void createRippleMap(int rippleMapSize) {
final int[] rippleMap = new int[rippleMapSize * 2];
- mRippleMap = Allocation.createSized(mRS, USER_I32, rippleMap.length);
+ mRippleMap = Allocation.createSized(mRS, USER_I32(mRS), rippleMap.length);
mRippleMap.data(rippleMap);
}
@@ -358,14 +358,14 @@
private Allocation loadTexture(int id, String name) {
final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources,
- id, RGB_565, false);
+ id, RGB_565(mRS), false);
allocation.setName(name);
return allocation;
}
private Allocation loadTextureARGB(int id, String name) {
Bitmap b = BitmapFactory.decodeResource(mResources, id, mOptionsARGB);
- final Allocation allocation = Allocation.createFromBitmap(mRS, b, RGBA_8888, false);
+ final Allocation allocation = Allocation.createFromBitmap(mRS, b, RGBA_8888(mRS), false);
allocation.setName(name);
return allocation;
}
diff --git a/src/com/android/wallpaper/galaxy/GalaxyRS.java b/src/com/android/wallpaper/galaxy/GalaxyRS.java
index 842d3de..801ad87 100644
--- a/src/com/android/wallpaper/galaxy/GalaxyRS.java
+++ b/src/com/android/wallpaper/galaxy/GalaxyRS.java
@@ -227,7 +227,7 @@
private Allocation loadTexture(int id, String name) {
final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources,
- id, RGB_565, false);
+ id, RGB_565(mRS), false);
allocation.setName(name);
return allocation;
}
@@ -235,7 +235,7 @@
// TODO: Fix Allocation.createFromBitmapResource() to do this when RGBA_8888 is specified
private Allocation loadTextureARGB(int id, String name) {
Bitmap b = BitmapFactory.decodeResource(mResources, id, mOptionsARGB);
- final Allocation allocation = Allocation.createFromBitmap(mRS, b, RGBA_8888, false);
+ final Allocation allocation = Allocation.createFromBitmap(mRS, b, RGBA_8888(mRS), false);
allocation.setName(name);
return allocation;
}
diff --git a/src/com/android/wallpaper/grass/GrassRS.java b/src/com/android/wallpaper/grass/GrassRS.java
index e249b03..8078e9e 100644
--- a/src/com/android/wallpaper/grass/GrassRS.java
+++ b/src/com/android/wallpaper/grass/GrassRS.java
@@ -41,7 +41,7 @@
class GrassRS extends RenderScriptScene {
private static final float TESSELATION = 0.5f;
-
+
private static final int RSID_STATE = 0;
private static final int TEXTURES_COUNT = 5;
@@ -98,14 +98,14 @@
@Override
public void resize(int width, int height) {
super.resize(width, height);
-
+
mWorldState.width = width;
mWorldState.height = height;
mState.data(mWorldState);
mPvOrthoAlloc.setupOrthoWindow(mWidth, mHeight);
- // TODO: REPOSITION BLADES
+ // TODO: REPOSITION BLADES
}
@Override
@@ -128,7 +128,7 @@
script.bindAllocation(mState, RSID_STATE);
script.bindAllocation(mBlades, RSID_BLADES);
script.bindAllocation(mBladesBuffer, RSID_BLADES_BUFFER);
-
+
return script;
}
@@ -171,7 +171,7 @@
triangles += createBlade(blades, i);
}
- mBlades = Allocation.createSized(mRS, USER_FLOAT, blades.length);
+ mBlades = Allocation.createSized(mRS, USER_F32(mRS), blades.length);
mBlades.data(blades);
mTriangles = triangles;
@@ -275,10 +275,10 @@
}
private Allocation generateTextureAlpha(int width, int height, int[] data, String name) {
- final Type.Builder builder = new Type.Builder(mRS, A_8);
+ final Type.Builder builder = new Type.Builder(mRS, A_8(mRS));
builder.add(Dimension.X, width);
builder.add(Dimension.Y, height);
-
+
final Allocation allocation = Allocation.createTyped(mRS, builder.create());
allocation.data(data);
allocation.setName(name);
@@ -287,7 +287,7 @@
private Allocation loadTexture(int id, String name) {
final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources,
- id, RGB_565, false);
+ id, RGB_565(mRS), false);
allocation.setName(name);
return allocation;
}