summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-12-06 16:08:24 -0800
committerJason Sams <rjsams@android.com>2010-12-06 16:08:24 -0800
commitc71a2cb5b010ef13edba639bd214d9fa9922567a (patch)
treee82f5b9f1e4e27570756e751dfc168849197d8fb
parent255537786860376c55427a94d4f494227e88b278 (diff)
downloadandroid_packages_wallpapers_MagicSmoke-c71a2cb5b010ef13edba639bd214d9fa9922567a.tar.gz
android_packages_wallpapers_MagicSmoke-c71a2cb5b010ef13edba639bd214d9fa9922567a.tar.bz2
android_packages_wallpapers_MagicSmoke-c71a2cb5b010ef13edba639bd214d9fa9922567a.zip
API update
Change-Id: Idf4ea56d40f51d9964b86deb4670c618e681ba4c
-rw-r--r--src/com/android/magicsmoke/MagicSmokeRS.java8
-rw-r--r--src/com/android/magicsmoke/RenderScriptScene.java4
-rw-r--r--src/com/android/magicsmoke/RenderScriptWallpaper.java13
3 files changed, 8 insertions, 17 deletions
diff --git a/src/com/android/magicsmoke/MagicSmokeRS.java b/src/com/android/magicsmoke/MagicSmokeRS.java
index 9d3e4a3..eb06855 100644
--- a/src/com/android/magicsmoke/MagicSmokeRS.java
+++ b/src/com/android/magicsmoke/MagicSmokeRS.java
@@ -264,7 +264,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
in.getPixels(pixels, 0, 256, 0, 0, 256, 256);
mRealTextures[index] = Allocation.createTyped(mRS, mTextureType);
mSourceTextures[index] = Allocation.createTyped(mRS, mTextureType);
- mSourceTextures[index].data(pixels);
+ mSourceTextures[index].copyFrom(pixels);
in.recycle();
}
@@ -305,7 +305,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
@Override
protected ScriptC createScript() {
- mScript = new ScriptC_clouds(mRS, mResources, R.raw.clouds, true);
+ mScript = new ScriptC_clouds(mRS, mResources, R.raw.clouds);
mVSConst = new ScriptField_VertexShaderConstants_s(mRS, 1);
mScript.bind_gVSConstants(mVSConst);
@@ -330,8 +330,8 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
mRealTextures = new Allocation[5];
Type.Builder tb = new Type.Builder(mRS, Element.RGBA_8888(mRS));
- tb.add(Dimension.X, 256);
- tb.add(Dimension.Y, 256);
+ tb.setX(256);
+ tb.setY(256);
mTextureType = tb.create();
loadBitmaps();
diff --git a/src/com/android/magicsmoke/RenderScriptScene.java b/src/com/android/magicsmoke/RenderScriptScene.java
index 23b3360..23c9d87 100644
--- a/src/com/android/magicsmoke/RenderScriptScene.java
+++ b/src/com/android/magicsmoke/RenderScriptScene.java
@@ -70,11 +70,11 @@ public abstract class RenderScriptScene {
protected abstract ScriptC createScript();
public void stop() {
- mRS.contextBindRootScript(null);
+ mRS.pause();
}
public void start() {
- mRS.contextBindRootScript(mScript);
+ mRS.resume();
}
public void resize(int width, int height) {
diff --git a/src/com/android/magicsmoke/RenderScriptWallpaper.java b/src/com/android/magicsmoke/RenderScriptWallpaper.java
index 0a6136a..7bb3225 100644
--- a/src/com/android/magicsmoke/RenderScriptWallpaper.java
+++ b/src/com/android/magicsmoke/RenderScriptWallpaper.java
@@ -79,7 +79,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
super.onSurfaceChanged(holder, format, width, height);
if (mRs != null) {
- mRs.contextSetSurface(width, height, holder.getSurface());
+ mRs.setSurface(holder, width, height);
}
if (mRenderer == null) {
mRenderer = createScene(width, height);
@@ -90,11 +90,6 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
}
}
- /*@Override
- public void onTouchEvent(MotionEvent event) {
- mRenderer.onTouchEvent(event);
- }*/
-
@Override
public void onOffsetsChanged(float xOffset, float yOffset,
float xStep, float yStep, int xPixels, int yPixels) {
@@ -105,13 +100,9 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
public void onSurfaceCreated(SurfaceHolder holder) {
super.onSurfaceCreated(holder);
- Surface surface = null;
- while (surface == null) {
- surface = holder.getSurface();
- }
RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
mRs = new RenderScriptGL(sc);
- mRs.contextSetPriority(RenderScript.Priority.LOW);
+ mRs.setPriority(RenderScript.Priority.LOW);
}
@Override