diff options
| author | Leon Hong <leonhong@google.com> | 2011-09-23 17:30:50 -0700 |
|---|---|---|
| committer | Leon Hong <leonhong@google.com> | 2011-09-28 10:13:24 -0700 |
| commit | 33113fcccefc422f984b6fbb89293c23d7d33a27 (patch) | |
| tree | 75b1232eff17287cd2b0e94b136adb3208d9fadb /res | |
| parent | 76d6ea97b0d3e64787398a179e015443dde9c024 (diff) | |
| download | android_packages_wallpapers_NoiseField-33113fcccefc422f984b6fbb89293c23d7d33a27.tar.gz android_packages_wallpapers_NoiseField-33113fcccefc422f984b6fbb89293c23d7d33a27.tar.bz2 android_packages_wallpapers_NoiseField-33113fcccefc422f984b6fbb89293c23d7d33a27.zip | |
Optimizations and animation update
- Changed background to mesh
- Code formatting fixes
Change-Id: I6520c5e506fd0166230e0b9c3748051cc2954201
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-nodpi/dot.png | bin | 6287 -> 7813 bytes | |||
| -rw-r--r-- | res/drawable-nodpi/wallpaper_thumb.png | bin | 32610 -> 30907 bytes | |||
| -rw-r--r-- | res/raw/bg_fs.glsl | 5 | ||||
| -rw-r--r-- | res/raw/bg_vs.glsl | 6 | ||||
| -rw-r--r-- | res/raw/noisefield_vs.glsl | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
6 files changed, 16 insertions, 12 deletions
diff --git a/res/drawable-nodpi/dot.png b/res/drawable-nodpi/dot.png Binary files differindex fd8729f..586c3e2 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 b0f604d..33ab307 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..d604369 --- /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, ATTRIB_position.y, 0.0, 1.0); +}
\ No newline at end of file diff --git a/res/raw/noisefield_vs.glsl b/res/raw/noisefield_vs.glsl index ea38887..94f41f2 100644 --- a/res/raw/noisefield_vs.glsl +++ b/res/raw/noisefield_vs.glsl @@ -1,17 +1,10 @@ varying float pointSize; varying float alpha; - void main() { - vec4 pos; - pos.xyz = ATTRIB_position.xyz; - pos.w = 1.0; - pos.x = pos.x - ATTRIB_offsetX; + vec4 pos = vec4(ATTRIB_position.xyz, 1.0); gl_Position = UNI_MVP * pos; - float pointSize = 1.0 + ATTRIB_speed * ATTRIB_scaleSize * 3000.0; + float pointSize = 1.0 + ATTRIB_speed * UNI_scaleSize * 2500.0; alpha = ATTRIB_alpha; gl_PointSize = pointSize; -} - - - +}
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 300b45a..e48c411 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="wallpaper_label">Bubble</string> + <string name="wallpaper_label">Bubbles</string> <string name="wallpaper_author">Google</string> - <string name="wallpaper_description">DESC</string> + <string name="wallpaper_description">Watch some bubbles</string> </resources> |
