Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev

Browse Source 
* commit '52a5096f7cf6ef2505e182a681b0a9705bbd44bd':
  tweak the electron beam animation a bit
This commit is contained in:
Mathias Agopian
2013-09-06 13:38:35 -07:00
committed by Android Git Automerger
parent 5e615ee5ad 52a5096f7c
commit e669c7aca3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/power/ElectronBeam.java
View File

@@ -319,10 +319,10 @@ final class ElectronBeam {
/** /**
* Draws a frame where the electron beam has been stretched out into * Draws a frame where the electron beam has been stretched out into
* a thin white horizontal line that fades as it expands outwards. * a thin white horizontal line that fades as it collapses inwards.
* *
* @param stretch The stretch factor. 0.0 is no stretch / no fade, * @param stretch The stretch factor. 0.0 is maximum stretch / no fade,
* 1.0 is maximum stretch / maximum fade. * 1.0 is collapsed / maximum fade.
*/ */
private void drawHStretch(float stretch) { private void drawHStretch(float stretch) {
// compute interpolation scale factor // compute interpolation scale factor
@@ -338,7 +338,7 @@ final class ElectronBeam {
// draw narrow fading white line // draw narrow fading white line
setHStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ag); setHStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ag);
GLES10.glColor4f(1.0f - ag, 1.0f - ag, 1.0f - ag, 1.0f); GLES10.glColor4f(1.0f - ag*0.75f, 1.0f - ag*0.75f, 1.0f - ag*0.75f, 1.0f);
GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4); GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
// clean up // clean up
@@ -355,7 +355,7 @@ final class ElectronBeam {
} }
private static void setHStretchQuad(FloatBuffer vtx, float dw, float dh, float a) { private static void setHStretchQuad(FloatBuffer vtx, float dw, float dh, float a) {
final float w = dw + (dw * a); final float w = 2 * dw * (1.0f - a);
final float h = 1.0f; final float h = 1.0f;
final float x = (dw - w) * 0.5f; final float x = (dw - w) * 0.5f;
final float y = (dh - h) * 0.5f; final float y = (dh - h) * 0.5f;