diff options
| author | Marco Nelissen <marcone@google.com> | 2011-01-19 09:19:39 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-01-19 09:19:39 -0800 |
| commit | 8d57c78704797dff5df2df2b10a08dec885fe489 (patch) | |
| tree | 94e0fddf7b0973ce2cbcbb76962f362ae8bc900c /res/raw | |
| parent | f50de7e2660498d0c606597982639090ac1a8235 (diff) | |
| download | android_packages_wallpapers_MagicSmoke-8d57c78704797dff5df2df2b10a08dec885fe489.tar.gz android_packages_wallpapers_MagicSmoke-8d57c78704797dff5df2df2b10a08dec885fe489.tar.bz2 android_packages_wallpapers_MagicSmoke-8d57c78704797dff5df2df2b10a08dec885fe489.zip | |
Fix horizontal and vertical panning.
Change-Id: I5177f3f3424233371136bdcbf358ce7056ea055d
Diffstat (limited to 'res/raw')
| -rw-r--r-- | res/raw/pv4tex.glslv | 14 | ||||
| -rw-r--r-- | res/raw/pv5tex.glslv | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/res/raw/pv4tex.glslv b/res/raw/pv4tex.glslv index 9fd1f04..5634efe 100644 --- a/res/raw/pv4tex.glslv +++ b/res/raw/pv4tex.glslv @@ -3,18 +3,18 @@ varying vec2 varTex1; varying vec2 varTex2; varying vec2 varTex3; -vec2 mul(vec4 uni, vec2 attr, float idx) +vec2 mul(vec4 uni, vec2 attr, float idx, vec2 offset) { float invz = 0.35 + idx*0.05; return vec2( - 0.5 + 0.5 * invz * (uni.z * ( uni.y * attr.x + uni.x * attr.y)) + uni.w, - 0.5 + 0.5 * invz * (uni.z * (-uni.x * attr.x + uni.y * attr.y))); + 0.5 + 0.5 * invz * (uni.z * ( uni.y * (attr.x + offset.x) + uni.x * (attr.y + offset.y))) + uni.w, + 0.5 + 0.5 * invz * (uni.z * (-uni.x * (attr.x + offset.x) + uni.y * (attr.y + offset.y)))); } void main() { - varTex0 = mul(UNI_layer0, ATTRIB_position.xy, 1.0); - varTex1 = mul(UNI_layer1, ATTRIB_position.xy, 2.0); - varTex2 = mul(UNI_layer2, ATTRIB_position.xy, 3.0); - varTex3 = mul(UNI_layer3, ATTRIB_position.xy, 4.0); + varTex0 = mul(UNI_layer0, ATTRIB_position.xy, 1.0, UNI_panoffset); + varTex1 = mul(UNI_layer1, ATTRIB_position.xy, 2.0, UNI_panoffset); + varTex2 = mul(UNI_layer2, ATTRIB_position.xy, 3.0, UNI_panoffset); + varTex3 = mul(UNI_layer3, ATTRIB_position.xy, 4.0, UNI_panoffset); gl_Position = ATTRIB_position; } diff --git a/res/raw/pv5tex.glslv b/res/raw/pv5tex.glslv index 998f209..bb190e8 100644 --- a/res/raw/pv5tex.glslv +++ b/res/raw/pv5tex.glslv @@ -4,19 +4,19 @@ varying vec2 varTex2; varying vec2 varTex3; varying vec2 varTex4; -vec2 mul(vec4 uni, vec2 attr, float idx) +vec2 mul(vec4 uni, vec2 attr, float idx, vec2 offset) { float invz = 0.5 + idx*0.05; return vec2( - 0.5 + 0.5 * invz * (uni.z * ( uni.y * attr.x + uni.x * attr.y)) + uni.w, - 0.5 + 0.5 * invz * (uni.z * (-uni.x * attr.x + uni.y * attr.y))); + 0.5 + 0.5 * invz * (uni.z * ( uni.y * (attr.x + offset.x) + uni.x * (attr.y + offset.y))) + uni.w, + 0.5 + 0.5 * invz * (uni.z * (-uni.x * (attr.x + offset.x) + uni.y * (attr.y + offset.y)))); } void main() { - varTex0 = mul(UNI_layer0, ATTRIB_position.xy, 1.0); - varTex1 = mul(UNI_layer1, ATTRIB_position.xy, 2.0); - varTex2 = mul(UNI_layer2, ATTRIB_position.xy, 3.0); - varTex3 = mul(UNI_layer3, ATTRIB_position.xy, 4.0); - varTex4 = mul(UNI_layer4, ATTRIB_position.xy, 5.0); + varTex0 = mul(UNI_layer0, ATTRIB_position.xy, 1.0, UNI_panoffset); + varTex1 = mul(UNI_layer1, ATTRIB_position.xy, 2.0, UNI_panoffset); + varTex2 = mul(UNI_layer2, ATTRIB_position.xy, 3.0, UNI_panoffset); + varTex3 = mul(UNI_layer3, ATTRIB_position.xy, 4.0, UNI_panoffset); + varTex4 = mul(UNI_layer4, ATTRIB_position.xy, 5.0, UNI_panoffset); gl_Position = ATTRIB_position; } |