diff options
author | Leon Hong <leonhong@google.com> | 2011-09-23 15:20:58 -0700 |
---|---|---|
committer | Leon Hong <leonhong@google.com> | 2011-09-26 19:32:57 -0700 |
commit | 46f29fce15d2b2011318de1394690bbb804c91ed (patch) | |
tree | de532b674bbedc28bfb746e365413a3da2a57c18 /res | |
parent | 1d1672900d5f7625022d4fcc89b36dc3137dcb62 (diff) | |
download | android_packages_wallpapers_PhaseBeam-46f29fce15d2b2011318de1394690bbb804c91ed.tar.gz android_packages_wallpapers_PhaseBeam-46f29fce15d2b2011318de1394690bbb804c91ed.tar.bz2 android_packages_wallpapers_PhaseBeam-46f29fce15d2b2011318de1394690bbb804c91ed.zip |
Optimizations and animation update
- changed global vars used only in .rs to static
- New background, new colors, more chroma shifts
- Added description
- Updated thumbnail
Change-Id: I17be3b785bac07258b606a70fdc7fd39a78e5b26
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-nodpi/beam.png | bin | 4614 -> 2764 bytes | |||
-rw-r--r-- | res/drawable-nodpi/bg.png | bin | 111744 -> 0 bytes | |||
-rw-r--r-- | res/drawable-nodpi/dot.png | bin | 7547 -> 5847 bytes | |||
-rw-r--r-- | res/drawable-nodpi/wallpaper_thumb.png | bin | 18706 -> 55334 bytes | |||
-rw-r--r-- | res/raw/bg_fs.glsl | 5 | ||||
-rw-r--r-- | res/raw/bg_vs.glsl | 6 | ||||
-rw-r--r-- | res/raw/dot_vs.glsl | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 2 |
8 files changed, 14 insertions, 3 deletions
diff --git a/res/drawable-nodpi/beam.png b/res/drawable-nodpi/beam.png Binary files differindex e687f12..5e6a563 100644 --- a/res/drawable-nodpi/beam.png +++ b/res/drawable-nodpi/beam.png diff --git a/res/drawable-nodpi/bg.png b/res/drawable-nodpi/bg.png Binary files differdeleted file mode 100644 index 987555d..0000000 --- a/res/drawable-nodpi/bg.png +++ /dev/null diff --git a/res/drawable-nodpi/dot.png b/res/drawable-nodpi/dot.png Binary files differindex 0a541da..a452f86 100644 --- a/res/drawable-nodpi/dot.png +++ b/res/drawable-nodpi/dot.png diff --git a/res/drawable-nodpi/wallpaper_thumb.png b/res/drawable-nodpi/wallpaper_thumb.png Binary files differindex 29d7a70..28cefdf 100644 --- a/res/drawable-nodpi/wallpaper_thumb.png +++ b/res/drawable-nodpi/wallpaper_thumb.png diff --git a/res/raw/bg_fs.glsl b/res/raw/bg_fs.glsl new file mode 100644 index 0000000..d20885d --- /dev/null +++ b/res/raw/bg_fs.glsl @@ -0,0 +1,5 @@ +varying lowp vec4 color; + +void main() { + gl_FragColor = color; +}
\ No newline at end of file diff --git a/res/raw/bg_vs.glsl b/res/raw/bg_vs.glsl new file mode 100644 index 0000000..8eb23b3 --- /dev/null +++ b/res/raw/bg_vs.glsl @@ -0,0 +1,6 @@ +varying lowp vec4 color; + +void main() { + color = ATTRIB_color; + gl_Position = vec4(ATTRIB_position.x + ATTRIB_offsetX/3.5, ATTRIB_position.y, 0.0, 1.0); +}
\ No newline at end of file diff --git a/res/raw/dot_vs.glsl b/res/raw/dot_vs.glsl index 3a82eba..e4ebeed 100644 --- a/res/raw/dot_vs.glsl +++ b/res/raw/dot_vs.glsl @@ -2,8 +2,8 @@ varying float pointSize; void main() { vec4 objPos = vec4(ATTRIB_position, 1.0); - float tmpPointSize = objPos.z*10.0; - pointSize = 0.5-tmpPointSize/800.0; + float tmpPointSize = objPos.z*7.0; + pointSize = 0.5-tmpPointSize/1000.0; objPos.z = 0.0; objPos.x = objPos.x - ATTRIB_offsetX * tmpPointSize/100.0; gl_Position = objPos; diff --git a/res/values/strings.xml b/res/values/strings.xml index 67f209d..9fb302b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,5 +2,5 @@ <resources> <string name="wallpaper_label">Phase Beam</string> <string name="wallpaper_author">Google</string> - <string name="wallpaper_description">DESC</string> + <string name="wallpaper_description">Phase beam themed wallpaper</string> </resources> |