OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

packages-wallpapers-MagicSmoke: Commit

packages/wallpapers/MagicSmoke


Commit MetaInfo

Revisionae9ba5758133ba753bd4a749a81267e08a3ee811 (tree)
Zeit2010-02-13 04:26:33
AutorMarco Nelissen <marcone@goog...>
CommiterAndroid Git Automerger

Log Message

am b7cac95f: DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.

Merge commit 'b7cac95f928bf5b02f4a2a914c3a43014c2469f8' into eclair-plus-aosp

* commit 'b7cac95f928bf5b02f4a2a914c3a43014c2469f8':

DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.

Ändern Zusammenfassung

Diff

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,6 +21,8 @@
2121 xmlns:android="http://schemas.android.com/apk/res/android"
2222 package="com.android.magicsmoke">
2323
24+ <uses-feature android:name="android.software.live_wallpaper" />
25+
2426 <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
2527 <uses-permission android:name="android.permission.BIND_WALLPAPER" />
2628
--- a/res/raw/clouds.rs
+++ b/res/raw/clouds.rs
@@ -288,9 +288,10 @@ int main(int launchID) {
288288 int now = uptimeMillis();
289289 timedelta = ((float)(now - lastuptime)) / 44.f;
290290 lastuptime = now;
291- if (timedelta > 100) {
292- // If we didn't render anything for several seconds, just pretend time stopped.
293- timedelta = 1;
291+ if (timedelta > 3) {
292+ // Limit the step adjustment factor to 3, so we don't get a sudden jump
293+ // after coming back from sleep.
294+ timedelta = 3;
294295 }
295296
296297 i = State->mPreset;
--- a/src/com/android/magicsmoke/MagicSmokeRS.java
+++ b/src/com/android/magicsmoke/MagicSmokeRS.java
@@ -16,7 +16,6 @@
1616
1717 package com.android.magicsmoke;
1818
19-import static android.renderscript.ProgramFragment.EnvMode.REPLACE;
2019 import static android.renderscript.Sampler.Value.LINEAR;
2120 import static android.renderscript.Sampler.Value.WRAP;
2221
@@ -76,7 +75,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
7675 private Sampler mSampler;
7776 private Allocation[] mSourceTextures;
7877 private Allocation[] mRealTextures;
79-
78+
8079 private ProgramVertex mPVBackground;
8180 private ProgramVertex.MatrixAllocation mPVAlloc;
8281
@@ -95,7 +94,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
9594
9695 private Context mContext;
9796 private SharedPreferences mSharedPref;
98-
97+
9998 static class Preset {
10099 Preset(int processmode, int backcol, int locol, int hicol, float mul, int mask,
101100 boolean rot, int blend, boolean texswap, boolean premul) {
@@ -146,9 +145,9 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
146145 new Preset(2, 0x6060ff, 0x000070, 0xffffff, 2.5f, 0x1f, true, 0, false, false),
147146 new Preset(3, 0x0000f0, 0x000000, 0xffffff, 2.0f, 0x0f, true, 0, true, false),
148147 };
149-
148+
150149 private float mTouchY;
151-
150+
152151 MagicSmokeRS(Context context, int width, int height) {
153152 super(width, height);
154153 mWidth = width;
@@ -182,7 +181,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
182181 mWorldState.mPreMul = mPreset[p].mPreMul ? 1 : 0;
183182 mWorldState.mBlendFunc = mPreset[p].mBlendFunc;
184183 }
185-
184+
186185 @Override
187186 public void resize(int width, int height) {
188187 super.resize(width, height);
@@ -211,7 +210,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
211210 mState.data(mWorldState);
212211 }
213212 }
214-
213+
215214 @Override
216215 public void setOffset(float xOffset, float yOffset, float xStep, float yStep,
217216 int xPixels, int yPixels) {
@@ -233,10 +232,10 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
233232 makeNewState();
234233 mState.data(mWorldState);
235234 }
236-
235+
237236 float alphafactor;
238237 Type mTextureType;
239-
238+
240239 void loadBitmap(int id, int index, String name, float alphamul, int lowcol, int highcol) {
241240 BitmapFactory.Options opts = new BitmapFactory.Options();
242241 opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
@@ -259,7 +258,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
259258 int highcol = mPreset[mWorldState.mPreset].mHighColor;
260259 //Log.i("@@@@", "preset " + mWorldState.mPreset + ", mul: " + alphamul +
261260 // ", colors: " + Integer.toHexString(lowcol) + "/" + Integer.toHexString(highcol));
262-
261+
263262 // TODO: using different high and low colors for each layer offers some cool effects too
264263 loadBitmap(R.drawable.noise1, 0, "Tnoise1", alphamul, lowcol, highcol);
265264 loadBitmap(R.drawable.noise2, 1, "Tnoise2", alphamul, lowcol, highcol);
@@ -267,7 +266,7 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
267266 loadBitmap(R.drawable.noise4, 3, "Tnoise4", alphamul, lowcol, highcol);
268267 loadBitmap(R.drawable.noise5, 4, "Tnoise5", alphamul, lowcol, highcol);
269268 }
270-
269+
271270 @Override
272271 protected ScriptC createScript() {
273272
@@ -289,13 +288,13 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
289288
290289 mSourceTextures = new Allocation[5];
291290 mRealTextures = new Allocation[5];
292-
291+
293292 Type.Builder tb = new Type.Builder(mRS, Element.RGBA_8888(mRS));
294293 tb.add(Dimension.X, 256);
295294 tb.add(Dimension.Y, 256);
296295 mTextureType = tb.create();
297296 loadBitmaps();
298-
297+
299298 Sampler.Builder samplerBuilder = new Sampler.Builder(mRS);
300299 samplerBuilder.setMin(LINEAR);
301300 samplerBuilder.setMag(LINEAR);
@@ -304,9 +303,9 @@ class MagicSmokeRS extends RenderScriptScene implements OnSharedPreferenceChange
304303 mSampler = samplerBuilder.create();
305304
306305 {
307- ProgramFragment.Builder builder = new ProgramFragment.Builder(mRS, null, null);
308- builder.setTexEnable(true, 0);
309- builder.setTexEnvMode(ProgramFragment.EnvMode.MODULATE, 0);
306+ ProgramFragment.Builder builder = new ProgramFragment.Builder(mRS);
307+ builder.setTexture(ProgramFragment.Builder.EnvMode.REPLACE,
308+ ProgramFragment.Builder.Format.RGBA, 0);
310309 mPfBackground = builder.create();
311310 mPfBackground.setName("PFBackground");
312311 mPfBackground.bindSampler(mSampler, 0);
Show on old repository browser