From ad1bdf02040924ed5044c4c41d4b71f6b6690db9 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Fri, 14 May 2010 17:54:50 -0700 Subject: [PATCH] Launcher2 cleanup. Will remove dead script functions once reflection is working. Change-Id: Ieffcf55047b5e241a8cffb1852619d04e1a00d53 --- res/raw/allapps.rs | 151 +++--------------- res/raw/allapps_bc.bc | Bin 11052 -> 10200 bytes src/com/android/launcher2/AllApps3D.java | 1 - .../android/launcher2/ScriptC_allapps.java | 6 +- 4 files changed, 29 insertions(+), 129 deletions(-) diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index 0e278d9e13..9342943e43 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -3,15 +3,9 @@ #include "../../../../../frameworks/base/libs/rs/scriptc/rs_types.rsh" #include "../../../../../frameworks/base/libs/rs/scriptc/rs_math.rsh" #include "../../../../../frameworks/base/libs/rs/scriptc/rs_graphics.rsh" -//#pragma stateVertex(PV) -//#pragma stateFragment(PFTexNearest) -//#pragma stateStore(PSIcons) #define PI 3.14159f -static int g_SpecialHWWar; - - // Constants from Java int COLUMNS_PER_PAGE_PORTRAIT; int ROWS_PER_PAGE_PORTRAIT; @@ -53,53 +47,29 @@ VpConsts_t *vpConstants; void debugAll() { - debugPi(1000, COLUMNS_PER_PAGE_PORTRAIT); - debugPi(1001, ROWS_PER_PAGE_PORTRAIT); - debugPi(1002, COLUMNS_PER_PAGE_LANDSCAPE); - debugPi(1003, ROWS_PER_PAGE_LANDSCAPE); - - debugPf(1018, gNewPositionX); - debugPi(1019, gNewTouchDown); - debugPf(1020, gFlingVelocity); - debugPi(1021, gIconCount); - debugPi(1022, gSelectedIconIndex); - debugPi(1023, gSelectedIconTexture); - debugPf(1024, gZoomTarget); - debugPi(1025, gHomeButton); - debugPf(1026, gTargetPos); - - debugPi(1027, gPFTexNearest); - debugPi(1028, gPFTexMip); - debugPi(1029, gPFTexMipAlpha); - debugPi(1030, gPVCurve); - debugPi(1031, gSMCell); - - debugP(1032, gIconIDs); - debugP(1033, gLabelIDs); - debugP(1034, vpConstants); } // Attraction to center values from page edge to page center. -static float g_AttractionTable[9]; -static float g_FrictionTable[9]; -static float g_PhysicsTableSize; +static float g_AttractionTable[9] = {20.f, 20.f, 20.f, 10.f, -10.f, -20.f, -20.f, -20.f, -20.f}; +static float g_FrictionTable[9] = {10.f, 10.f, 11.f, 15.f, 15.f, 11.f, 10.f, 10.f, 10.f}; +static float g_PhysicsTableSize = 7; -static float g_PosPage; -static float g_PosVelocity; -static float g_LastPositionX; -static int g_LastTouchDown; +static float g_PosPage = 0.f; +static float g_PosVelocity = 0.f; +static float g_LastPositionX = 0.f; +static int g_LastTouchDown = 0; static float g_DT; static int g_LastTime; static int g_PosMax; -static float g_Zoom; -static float g_Animation; +static float g_Zoom = 0.f; +static float g_Animation = 1.f; static float g_OldPosPage; static float g_OldPosVelocity; static float g_OldZoom; -static float g_MoveToTotalTime; -static float g_MoveToTime; -static float g_MoveToOldPos; +static float g_MoveToTotalTime = 0.2f; +static float g_MoveToTime = 0.f; +static float g_MoveToOldPos = 0.f; static int g_Cols; static int g_Rows; @@ -109,24 +79,15 @@ static int g_Rows; static int g_DrawLastFrame; static int lastFrame(int draw) { - //debugPi(99, 13); - // We draw one extra frame to work around the last frame post bug. - // We also need to track if we drew the last frame to deal with large DT - // in the physics. - int ret = g_DrawLastFrame | draw; g_DrawLastFrame = draw; - return ret; // should return draw instead. + return draw; } static void updateReadback() { - //debugPi(99, 12); - //if ((g_OldPosPage != g_PosPage) || - //(g_OldPosVelocity != g_PosVelocity) || - //(g_OldZoom != g_Zoom)) { + if ((g_OldPosPage != g_PosPage) || + (g_OldPosVelocity != g_PosVelocity) || + (g_OldZoom != g_Zoom)) { - //debugPf(40, g_PosPage); - //debugPf(41, g_PosVelocity); - //debugPf(42, g_Zoom); g_OldPosPage = g_PosPage; g_OldPosVelocity = g_PosVelocity; g_OldZoom = g_Zoom; @@ -136,55 +97,17 @@ static void updateReadback() { i[1] = g_PosVelocity * (1 << 16); i[2] = g_OldZoom * (1 << 16); sendToClient(&i[0], 1, 12, 1); - //} + } } -static void setColor(float r, float g, float b, float a) { - //debugPi(99, 11); - if (g_SpecialHWWar) { - color(0, 0, 0, 0.001f); - } else { - color(r, g, b, a); - } +void setColor(float r, float g, float b, float a) { } void init() { //debugPi(99, 10); - g_AttractionTable[0] = 20.0f; - g_AttractionTable[1] = 20.0f; - g_AttractionTable[2] = 20.0f; - g_AttractionTable[3] = 10.0f; - g_AttractionTable[4] = -10.0f; - g_AttractionTable[5] = -20.0f; - g_AttractionTable[6] = -20.0f; - g_AttractionTable[7] = -20.0f; - g_AttractionTable[8] = -20.0f; // dup 7 to avoid a clamp later - g_FrictionTable[0] = 10.0f; - g_FrictionTable[1] = 10.0f; - g_FrictionTable[2] = 11.0f; - g_FrictionTable[3] = 15.0f; - g_FrictionTable[4] = 15.0f; - g_FrictionTable[5] = 11.0f; - g_FrictionTable[6] = 10.0f; - g_FrictionTable[7] = 10.0f; - g_FrictionTable[8] = 10.0f; // dup 7 to avoid a clamp later - g_PhysicsTableSize = 7; - - g_PosVelocity = 0; - g_PosPage = 0; - g_LastTouchDown = 0; - g_LastPositionX = 0; - g_Zoom = 0; - g_Animation = 1.f; - g_SpecialHWWar = 1; - g_MoveToTime = 0; - g_MoveToOldPos = 0; - g_MoveToTotalTime = 0.2f; // Duration of scrolling 1 line } void resetHWWar() { - //debugPi(99, 9); - g_SpecialHWWar = 1; } void move() { @@ -329,15 +252,13 @@ static void updatePos() { g_PosPage += g_PosVelocity * g_DT; g_PosPage = clamp(g_PosPage, -0.49f, g_PosMax + 0.49f); - - //debugPf(300, g_PosPage); } static void draw_home_button() { //debugPi(99, 2); - setColor(1.0f, 1.0f, 1.0f, 1.0f); + color(1.0f, 1.0f, 1.0f, 1.0f); bindTexture(gPFTexNearest, 0, gHomeButton); float w = getWidth(); @@ -371,8 +292,6 @@ static void drawFrontGrid(float rowOffset, float p) float rowHeight = colWidth + 25.f; float yoff = 0.5f * h + 1.5f * rowHeight; - //debugPi(199, 1); - int row, col; int colCount = 4; if (w > h) { @@ -387,7 +306,7 @@ static void drawFrontGrid(float rowOffset, float p) vpConstants->Position.z = p; - setColor(1.0f, 1.0f, 1.0f, 1.0f); + color(1.0f, 1.0f, 1.0f, 1.0f); for (row = -5; row < 15; row++) { float y = yoff - ((-rowFrac + row) * rowHeight); @@ -416,13 +335,6 @@ static void drawFrontGrid(float rowOffset, float p) bindTexture(gPFTexMip, 0, gIconIDs[iconNum]); drawSimpleMesh(gSMCell); - //debugPf(202, vpConstants->ImgSize.x); - //debugPf(203, vpConstants->ImgSize.y); - //debugPf(204, vpConstants->Position.y); - //debugPi(205, gIconIDs[iconNum]); - //debugPi(206, gLabelIDs[iconNum]); - - bindProgramFragment(gPFTexMipAlpha); vpConstants->ImgSize.x = allocGetDimX(gLabelIDs[iconNum]); vpConstants->ImgSize.y = allocGetDimY(gLabelIDs[iconNum]); @@ -470,7 +382,7 @@ int root() //debugPf(100, g_Zoom); // Set clear value to dim the background based on the zoom position. - if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f) && !g_SpecialHWWar) { + if ((g_Zoom < 0.001f) && (gZoomTarget < 0.001f)) { pfClearColor(0.0f, 0.0f, 0.0f, 0.0f); // When we're zoomed out and not tracking motion events, reset the pos to 0. if (!g_LastTouchDown) { @@ -484,12 +396,13 @@ int root() // icons & labels if (getWidth() > getHeight()) { - g_Cols = 6; - g_Rows = 3; + g_Cols = COLUMNS_PER_PAGE_LANDSCAPE; + g_Rows = ROWS_PER_PAGE_LANDSCAPE; } else { - g_Cols = 4; - g_Rows = 4; + g_Cols = COLUMNS_PER_PAGE_PORTRAIT; + g_Rows = ROWS_PER_PAGE_PORTRAIT; } + g_PosMax = ((gIconCount + (g_Cols-1)) / g_Cols) - g_Rows; if (g_PosMax < 0) g_PosMax = 0; @@ -503,18 +416,6 @@ int root() bindProgramFragment(gPFTexNearest); draw_home_button(); - - // This is a WAR to do a rendering pass without drawing during init to - // force the driver to preload and compile its shaders. - // Without this the first animation does not appear due to the time it - // takes to init the driver state. - if (g_SpecialHWWar) { - g_SpecialHWWar = 0; - return 1; - } - - // Bug workaround where the last frame is not always displayed - // So we keep rendering until the bug is fixed. return lastFrame((g_PosVelocity != 0) || frac(g_PosPage) || g_Zoom != gZoomTarget || (g_MoveToTime != 0)); } diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc index 85d680557df9d9876fbaf5c9a74f998c40926fa9..d73db54e7f55065e6107156be443f384c7bb8f24 100644 GIT binary patch literal 10200 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 Q+M7c|cG!qyHQc-Z2ThLT$N&HU diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java index 8644a43e60..730e064e19 100644 --- a/src/com/android/launcher2/AllApps3D.java +++ b/src/com/android/launcher2/AllApps3D.java @@ -1366,7 +1366,6 @@ public class AllApps3D extends RSSurfaceView mScript.bind_gIconIDs(mAllocIconIds); mScript.bind_gLabelIDs(mAllocLabelIds); - mScript.invokable_ResetWAR(); } } diff --git a/src/com/android/launcher2/ScriptC_allapps.java b/src/com/android/launcher2/ScriptC_allapps.java index 7e6152b5ce..4bd1c3926c 100644 --- a/src/com/android/launcher2/ScriptC_allapps.java +++ b/src/com/android/launcher2/ScriptC_allapps.java @@ -184,10 +184,10 @@ public class ScriptC_allapps //android.util.Log.e("rs", "invokable_Fling"); invoke(2); } - public void invokable_ResetWAR() { + //public void invokable_ResetWAR() { //android.util.Log.e("rs", "invokable_WAR"); - invoke(9); // verified - } + //invoke(9); // verified + //} public void invokable_SetZoom() { //android.util.Log.e("rs", "invokable_SetZoom"); invoke(12);