diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-20 15:07:18 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-20 15:07:18 -0400 |
| commit | f70fbe70b555386f90c94c600b3763ba3afa7a9f (patch) | |
| tree | 56b89617de78b4b146e6d6c893d907b6eccae91b /res/raw | |
| parent | b6082fa019937c13e19b023cc3feb7fca14a62ab (diff) | |
| parent | 461073bbddd5d0fe026e0f89e1df22eda014817f (diff) | |
| download | android_packages_apps_Trebuchet-f70fbe70b555386f90c94c600b3763ba3afa7a9f.tar.gz android_packages_apps_Trebuchet-f70fbe70b555386f90c94c600b3763ba3afa7a9f.tar.bz2 android_packages_apps_Trebuchet-f70fbe70b555386f90c94c600b3763ba3afa7a9f.zip | |
Merge change I461073bb into eclair
* changes:
Fix exit animation of top icon when present.
Diffstat (limited to 'res/raw')
| -rw-r--r-- | res/raw/rollo3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/raw/rollo3.c b/res/raw/rollo3.c index 253709a44..77db74a69 100644 --- a/res/raw/rollo3.c +++ b/res/raw/rollo3.c @@ -247,9 +247,9 @@ int positionStrip(float row, float column, int isTop, float p) } else { matrixLoadTranslate(mat1, x, -0.9f, 0.f); matrixScale(mat1, scale, -scale, 1.f); - matrixTranslate(mat1, 0, p * 2, 0.f); - matrixRotate(mat1, -p * 50, 1, 0, 0); } + matrixTranslate(mat1, 0, p * 2, 0.f); + matrixRotate(mat1, -p * 50, 1, 0, 0); vpLoadModelMatrix(mat1); float soff = -(row * 1.4); @@ -365,7 +365,7 @@ void drawStrip(float row, float column, int isTop, int iconNum, float p) drawSimpleMeshRange(NAMED_SMMesh, offset * 6, 20 * 6); } -void drawTop(float rowOffset) +void drawTop(float rowOffset, float p) { int row, col; int iconNum = 0; @@ -374,7 +374,7 @@ void drawTop(float rowOffset) if (iconNum >= state->iconCount) { return; } - drawStrip(rowOffset - row, col, 1, iconNum, 0); + drawStrip(rowOffset - row, col, 1, iconNum, p); iconNum++; } } @@ -471,7 +471,7 @@ main(int launchID) bindProgramFragment(NAMED_PFTexLinear); - drawTop(g_PosPage); + drawTop(g_PosPage, 1-g_Zoom); drawBottom(g_PosPage, 1-g_Zoom); { |