summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-02-12 15:10:01 -0800
committerJason Sams <rjsams@android.com>2010-02-12 15:10:01 -0800
commita0735b21a2f5bc456f72c5186f5baa7e0d258143 (patch)
treebc53484dd2490ed47ca544fdfcb62f04a3f7fd20 /res
parentf5afb72766ba1dba56eb14d57c72e70da0d76e92 (diff)
downloadandroid_packages_wallpapers_Basic-a0735b21a2f5bc456f72c5186f5baa7e0d258143.tar.gz
android_packages_wallpapers_Basic-a0735b21a2f5bc456f72c5186f5baa7e0d258143.tar.bz2
android_packages_wallpapers_Basic-a0735b21a2f5bc456f72c5186f5baa7e0d258143.zip
Fix leaf movement in fall in landscape.
Diffstat (limited to 'res')
-rw-r--r--res/raw/fall.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/res/raw/fall.rs b/res/raw/fall.rs
index e183178..0e9c340 100644
--- a/res/raw/fall.rs
+++ b/res/raw/fall.rs
@@ -161,15 +161,14 @@ int drawLeaf(struct Leaves_s *leaf) {
color(0.0f, 0.0f, 0.0f, alpha * 0.15f);
+ matrixLoadIdentity(matrix);
+ matrixTranslate(matrix, x - State->xOffset * 2, y, tz);
if (State->rotate) {
- matrixLoadRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f);
- } else {
- matrixLoadIdentity(matrix);
+ matrixRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f);
}
float shadowOffet = a / 5;
- matrixTranslate(matrix, (x - State->xOffset * 2) + (shadowOffet / 2), y - shadowOffet, tz);
matrixScale(matrix, s, s, 1.0f);
matrixRotate(matrix, r, 0.0f, 0.0f, 1.0f);
vpLoadModelMatrix(matrix);
@@ -184,12 +183,11 @@ int drawLeaf(struct Leaves_s *leaf) {
color(1.0f, 1.0f, 1.0f, 1.0f);
}
+ matrixLoadIdentity(matrix);
+ matrixTranslate(matrix, x - State->xOffset * 2, y, tz);
if (State->rotate) {
- matrixLoadRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f);
- } else {
- matrixLoadIdentity(matrix);
+ matrixRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f);
}
- matrixTranslate(matrix, x - State->xOffset * 2, y, tz);
matrixScale(matrix, s, s, 1.0f);
matrixRotate(matrix, r, 0.0f, 0.0f, 1.0f);
vpLoadModelMatrix(matrix);