diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/raw/allapps.rs | 339 | ||||
| -rw-r--r-- | res/raw/allapps_bc.bc | bin | 0 -> 10200 bytes |
2 files changed, 167 insertions, 172 deletions
diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index af5abd311..9342943e4 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -1,50 +1,89 @@ #pragma version(1) -#pragma stateVertex(PV) -#pragma stateFragment(PFTexNearest) -#pragma stateStore(PSIcons) + +#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" #define PI 3.14159f -int g_SpecialHWWar; +// Constants from Java +int COLUMNS_PER_PAGE_PORTRAIT; +int ROWS_PER_PAGE_PORTRAIT; +int COLUMNS_PER_PAGE_LANDSCAPE; +int ROWS_PER_PAGE_LANDSCAPE; + +float gNewPositionX; +int gNewTouchDown; +float gFlingVelocity; +int gIconCount; +int gSelectedIconIndex; +rs_allocation gSelectedIconTexture; +float gZoomTarget; +rs_allocation gHomeButton; +float gTargetPos; + +rs_program_fragment gPFTexNearest; +rs_program_fragment gPFTexMip; +rs_program_fragment gPFTexMipAlpha; +rs_program_vertex gPVCurve; +rs_program_store gPS; +rs_mesh gSMCell; + +rs_allocation *gIconIDs; +rs_allocation *gLabelIDs; + +typedef struct VpConsts_s { + float4 Position; + float4 ScaleOffset; + float2 BendPos; + float2 ImgSize; +} VpConsts_t; +VpConsts_t *vpConstants; + + +#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gNewPositionX, gNewTouchDown, gFlingVelocity, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gZoomTarget, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants) +#pragma rs export_func(resetHWWar, move, moveTo, setZoom, fling) + + +void debugAll() +{ +} + // Attraction to center values from page edge to page center. -float g_AttractionTable[9]; -float g_FrictionTable[9]; -float g_PhysicsTableSize; - -float g_PosPage; -float g_PosVelocity; -float g_LastPositionX; -int g_LastTouchDown; -float g_DT; -int g_LastTime; -int g_PosMax; -float g_Zoom; -float g_Animation; -float g_OldPosPage; -float g_OldPosVelocity; -float g_OldZoom; -float g_MoveToTotalTime; -float g_MoveToTime; -float g_MoveToOldPos; - -int g_Cols; -int g_Rows; +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 = 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 = 0.f; +static float g_Animation = 1.f; +static float g_OldPosPage; +static float g_OldPosVelocity; +static float g_OldZoom; +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; // Drawing constants, should be parameters ====== #define VIEW_ANGLE 1.28700222f -int g_DrawLastFrame; -int lastFrame(int draw) { - // 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; +static int g_DrawLastFrame; +static int lastFrame(int draw) { g_DrawLastFrame = draw; - return ret; // should return draw instead. + return draw; } -void updateReadback() { +static void updateReadback() { if ((g_OldPosPage != g_PosPage) || (g_OldPosVelocity != g_PosVelocity) || (g_OldZoom != g_Zoom)) { @@ -62,67 +101,34 @@ void updateReadback() { } void setColor(float r, float g, float b, float a) { - if (g_SpecialHWWar) { - color(0, 0, 0, 0.001f); - } else { - color(r, g, b, a); - } } void init() { - 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 + //debugPi(99, 10); } void resetHWWar() { - g_SpecialHWWar = 1; } void move() { + //debugPi(99, 8); if (g_LastTouchDown) { - float dx = -(state->newPositionX - g_LastPositionX); + float dx = -(gNewPositionX - g_LastPositionX); g_PosVelocity = 0; g_PosPage += dx * 5.2f; float pmin = -0.49f; float pmax = g_PosMax + 0.49f; - g_PosPage = clampf(g_PosPage, pmin, pmax); + g_PosPage = clamp(g_PosPage, pmin, pmax); } - g_LastTouchDown = state->newTouchDown; - g_LastPositionX = state->newPositionX; + g_LastTouchDown = gNewTouchDown; + g_LastPositionX = gNewPositionX; g_MoveToTime = 0; //debugF("Move P", g_PosPage); } void moveTo() { + //debugPi(99, 7); g_MoveToTime = g_MoveToTotalTime; g_PosVelocity = 0; g_MoveToOldPos = g_PosPage; @@ -131,18 +137,20 @@ void moveTo() { } void setZoom() { - g_Zoom = state->zoomTarget; + //debugPi(99, 6); + g_Zoom = gZoomTarget; g_DrawLastFrame = 1; updateReadback(); } void fling() { + //debugPi(99, 5); g_LastTouchDown = 0; - g_PosVelocity = -state->flingVelocity * 4; - float av = fabsf(g_PosVelocity); + g_PosVelocity = -gFlingVelocity * 4; + float av = fabs(g_PosVelocity); float minVel = 3.5f; - minVel *= 1.f - (fabsf(fracf(g_PosPage + 0.5f) - 0.5f) * 0.45f); + minVel *= 1.f - (fabs(frac(g_PosPage + 0.5f) - 0.5f) * 0.45f); if (av < minVel && av > 0.2f) { if (g_PosVelocity > 0) { @@ -153,59 +161,51 @@ void fling() { } if (g_PosPage <= 0) { - g_PosVelocity = maxf(0, g_PosVelocity); + g_PosVelocity = max(0.f, g_PosVelocity); } if (g_PosPage > g_PosMax) { - g_PosVelocity = minf(0, g_PosVelocity); + g_PosVelocity = min(0.f, g_PosVelocity); } } -float -modf(float x, float y) -{ - return x-(y*floorf(x/y)); -} - - -/* - * Interpolates values in the range 0..1 to a curve that eases in - * and out. - */ -float -getInterpolation(float input) { - return (cosf((input + 1) * PI) / 2.0f) + 0.5f; +// Interpolates values in the range 0..1 to a curve that eases in +// and out. +static float getInterpolation(float input) { + //debugPi(99, 4); + return (cos((input + 1) * PI) * 0.5f) + 0.5f; } -void updatePos() { +static void updatePos() { + //debugPi(99, 3); if (g_LastTouchDown) { return; } - float tablePosNorm = fracf(g_PosPage + 0.5f); + float tablePosNorm = frac(g_PosPage + 0.5f); float tablePosF = tablePosNorm * g_PhysicsTableSize; int tablePosI = tablePosF; float tablePosFrac = tablePosF - tablePosI; - float accel = lerpf(g_AttractionTable[tablePosI], + float accel = mix(g_AttractionTable[tablePosI], g_AttractionTable[tablePosI + 1], tablePosFrac) * g_DT; - float friction = lerpf(g_FrictionTable[tablePosI], + float friction = mix(g_FrictionTable[tablePosI], g_FrictionTable[tablePosI + 1], tablePosFrac) * g_DT; if (g_MoveToTime) { // New position is old posiition + (total distance) * (interpolated time) - g_PosPage = g_MoveToOldPos + (state->targetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime); + g_PosPage = g_MoveToOldPos + (gTargetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime); g_MoveToTime -= g_DT; if (g_MoveToTime <= 0) { g_MoveToTime = 0; - g_PosPage = state->targetPos; + g_PosPage = gTargetPos; } return; } // If our velocity is low OR acceleration is opposing it, apply it. - if (fabsf(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) { + if (fabs(g_PosVelocity) < 4.0f || (g_PosVelocity * accel) < 0) { g_PosVelocity += accel; } //debugF("g_PosPage", g_PosPage); @@ -216,18 +216,18 @@ void updatePos() { // Normal physics if (g_PosVelocity > 0) { g_PosVelocity -= friction; - g_PosVelocity = maxf(g_PosVelocity, 0); + g_PosVelocity = max(g_PosVelocity, 0.f); } else { g_PosVelocity += friction; - g_PosVelocity = minf(g_PosVelocity, 0); + g_PosVelocity = min(g_PosVelocity, 0.f); } - if ((friction > fabsf(g_PosVelocity)) && (friction > fabsf(accel))) { + if ((friction > fabs(g_PosVelocity)) && (friction > fabs(accel))) { // Special get back to center and overcome friction physics. float t = tablePosNorm - 0.5f; - if (fabsf(t) < (friction * g_DT)) { + if (fabs(t) < (friction * g_DT)) { // really close, just snap - g_PosPage = roundf(g_PosPage); + g_PosPage = round(g_PosPage); g_PosVelocity = 0; } else { if (t > 0) { @@ -240,46 +240,49 @@ void updatePos() { // Check for out of boundry conditions. if (g_PosPage < 0 && g_PosVelocity < 0) { - float damp = 1.0 + (g_PosPage * 4); - damp = clampf(damp, 0.f, 0.9f); + float damp = 1.0f + (g_PosPage * 4); + damp = clamp(damp, 0.f, 0.9f); g_PosVelocity *= damp; } if (g_PosPage > g_PosMax && g_PosVelocity > 0) { - float damp = 1.0 - ((g_PosPage - g_PosMax) * 4); - damp = clampf(damp, 0.f, 0.9f); + float damp = 1.0f - ((g_PosPage - g_PosMax) * 4); + damp = clamp(damp, 0.f, 0.9f); g_PosVelocity *= damp; } g_PosPage += g_PosVelocity * g_DT; - g_PosPage = clampf(g_PosPage, -0.49, g_PosMax + 0.49); + g_PosPage = clamp(g_PosPage, -0.49f, g_PosMax + 0.49f); } - -void +static void draw_home_button() { - setColor(1.0f, 1.0f, 1.0f, 1.0f); - bindTexture(NAMED_PFTexNearest, 0, state->homeButtonId); + //debugPi(99, 2); + color(1.0f, 1.0f, 1.0f, 1.0f); + bindTexture(gPFTexNearest, 0, gHomeButton); float w = getWidth(); float h = getHeight(); + float tw = allocGetDimX(gHomeButton); + float th = allocGetDimY(gHomeButton); float x; float y; if (getWidth() > getHeight()) { - x = w - (params->homeButtonTextureWidth * (1 - g_Animation)) + 20; - y = (h - params->homeButtonTextureHeight) * 0.5f; + x = w - (tw * (1 - g_Animation)) + 20; + y = (h - th) * 0.5f; } else { - x = (w - params->homeButtonTextureWidth) / 2; - y = -g_Animation * params->homeButtonTextureHeight; + x = (w - tw) / 2; + y = -g_Animation * th; y -= 30; // move the house to the edge of the screen as it doesn't fill the texture. } - drawSpriteScreenspace(x, y, 0, params->homeButtonTextureWidth, params->homeButtonTextureHeight); + drawSpriteScreenspace(x, y, 0, tw, th); } -void drawFrontGrid(float rowOffset, float p) +static void drawFrontGrid(float rowOffset, float p) { + //debugPi(99, 1); float h = getHeight(); float w = getWidth(); @@ -299,17 +302,16 @@ void drawFrontGrid(float rowOffset, float p) int iconNum = (intRowOffset - 5) * colCount; - - bindProgramVertex(NAMED_PVCurve); + bindProgramVertex(gPVCurve); 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); for (col=0; col < colCount; col++) { - if (iconNum >= state->iconCount) { + if (iconNum >= gIconCount) { return; } @@ -317,28 +319,28 @@ void drawFrontGrid(float rowOffset, float p) float x = colWidth * col + (colWidth / 2); vpConstants->Position.x = x + 0.2f; - if (state->selectedIconIndex == iconNum && !p) { - bindProgramFragment(NAMED_PFTexNearest); - bindTexture(NAMED_PFTexNearest, 0, state->selectedIconTexture); - vpConstants->ImgSize.x = SELECTION_TEXTURE_WIDTH_PX; - vpConstants->ImgSize.y = SELECTION_TEXTURE_HEIGHT_PX; - vpConstants->Position.y = y - (SELECTION_TEXTURE_HEIGHT_PX - ICON_TEXTURE_HEIGHT_PX) * 0.5f; - drawSimpleMesh(NAMED_SMCell); + if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture) { + bindProgramFragment(gPFTexNearest); + bindTexture(gPFTexNearest, 0, gSelectedIconTexture); + vpConstants->ImgSize.x = allocGetDimX(gSelectedIconTexture); + vpConstants->ImgSize.y = allocGetDimY(gSelectedIconTexture); + vpConstants->Position.y = y - (allocGetDimY(gSelectedIconTexture) - allocGetDimY(gIconIDs[iconNum])) * 0.5f; + drawSimpleMesh(gSMCell); } - bindProgramFragment(NAMED_PFTexMip); - vpConstants->ImgSize.x = ICON_TEXTURE_WIDTH_PX; - vpConstants->ImgSize.y = ICON_TEXTURE_HEIGHT_PX; + bindProgramFragment(gPFTexMip); + vpConstants->ImgSize.x = allocGetDimX(gIconIDs[iconNum]); + vpConstants->ImgSize.y = allocGetDimY(gIconIDs[iconNum]); vpConstants->Position.y = y - 0.2f; - bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum)); - drawSimpleMesh(NAMED_SMCell); + bindTexture(gPFTexMip, 0, gIconIDs[iconNum]); + drawSimpleMesh(gSMCell); - bindProgramFragment(NAMED_PFTexMipAlpha); - vpConstants->ImgSize.x = 120.f; - vpConstants->ImgSize.y = 64.f; + bindProgramFragment(gPFTexMipAlpha); + vpConstants->ImgSize.x = allocGetDimX(gLabelIDs[iconNum]); + vpConstants->ImgSize.y = allocGetDimY(gLabelIDs[iconNum]); vpConstants->Position.y = y - 64.f - 0.2f; - bindTexture(NAMED_PFTexMipAlpha, 0, loadI32(ALLOC_LABEL_IDS, iconNum)); - drawSimpleMesh(NAMED_SMCell); + bindTexture(gPFTexMipAlpha, 0, gLabelIDs[iconNum]); + drawSimpleMesh(gSMCell); } iconNum++; } @@ -346,12 +348,14 @@ void drawFrontGrid(float rowOffset, float p) } -int -main(int launchID) +int root() { + //debugAll(); + bindProgramStore(gPS); + // Compute dt in seconds. int newTime = uptimeMillis(); - g_DT = (newTime - g_LastTime) / 1000.f; + g_DT = (newTime - g_LastTime) * 0.001f; g_LastTime = newTime; if (!g_DrawLastFrame) { @@ -360,24 +364,25 @@ main(int launchID) g_DT = 0.033f; } // physics may break if DT is large. - g_DT = minf(g_DT, 0.2f); + g_DT = min(g_DT, 0.2f); - if (g_Zoom != state->zoomTarget) { + if (g_Zoom != gZoomTarget) { float dz = g_DT * 1.7f; - if (state->zoomTarget < 0.5f) { + if (gZoomTarget < 0.5f) { dz = -dz; } - if (fabsf(g_Zoom - state->zoomTarget) < fabsf(dz)) { - g_Zoom = state->zoomTarget; + if (fabs(g_Zoom - gZoomTarget) < fabs(dz)) { + g_Zoom = gZoomTarget; } else { g_Zoom += dz; } updateReadback(); } - g_Animation = powf(1-g_Zoom, 3); + g_Animation = pow(1.f - g_Zoom, 3.f); + //debugPf(100, g_Zoom); // Set clear value to dim the background based on the zoom position. - if ((g_Zoom < 0.001f) && (state->zoomTarget < 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) { @@ -385,19 +390,20 @@ main(int launchID) } return lastFrame(0); } else { + //debugPf(101, g_Zoom); pfClearColor(0.0f, 0.0f, 0.0f, g_Zoom); } // icons & labels - int iconCount = state->iconCount; 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 = ((iconCount + (g_Cols-1)) / g_Cols) - g_Rows; + + g_PosMax = ((gIconCount + (g_Cols-1)) / g_Cols) - g_Rows; if (g_PosMax < 0) g_PosMax = 0; updatePos(); @@ -408,20 +414,9 @@ main(int launchID) // Draw the icons ======================================== drawFrontGrid(g_PosPage, g_Animation); - bindProgramFragment(NAMED_PFTexNearest); + 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) || fracf(g_PosPage) || g_Zoom != state->zoomTarget || (g_MoveToTime != 0)); + 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 Binary files differnew file mode 100644 index 000000000..d73db54e7 --- /dev/null +++ b/res/raw/allapps_bc.bc |