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

Merge "Fix sparkle alpha blending" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-05-07 15:08:22 +00:00
committed by Android (Google) Code Review
parent 4fa6d3a873 a79111e05c
commit 1cc81e18f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/java/android/graphics/drawable/RippleShader.java
View File

@@ -113,10 +113,11 @@ final class RippleShader extends RuntimeShader {
+ " float sparkle = sparkles(densityUv, in_noisePhase) * ring * alpha " + " float sparkle = sparkles(densityUv, in_noisePhase) * ring * alpha "
+ "* turbulence;\n" + "* turbulence;\n"
+ " float fade = min(fadeIn, 1. - fadeOutRipple);\n" + " float fade = min(fadeIn, 1. - fadeOutRipple);\n"
+ " vec4 circle = in_color * (softCircle(p, center, in_maxRadius " + " float circleAlpha = softCircle(p, center, in_maxRadius * scaleIn, 0.2) * fade;\n"
+ " * scaleIn, 0.2) * fade);\n" + " vec3 color = mix(in_color.rgb, in_sparkleColor.rgb, sparkle);\n"
+ " float mask = in_hasMask == 1. ? sample(in_shader, p).a > 0. ? 1. : 0. : 1.;\n" + " float mask = in_hasMask == 1. ? sample(in_shader, p).a > 0. ? 1. : 0. : 1.;\n"
+ " return mix(circle, in_sparkleColor, sparkle) * mask;\n" + " float a = (in_color.a * circleAlpha + in_sparkleColor.a * sparkle) * mask;\n"
+ " return vec4(color * a, a);\n"
+ "}"; + "}";
private static final String SHADER = SHADER_UNIFORMS + SHADER_LIB + SHADER_MAIN; private static final String SHADER = SHADER_UNIFORMS + SHADER_LIB + SHADER_MAIN;
private static final double PI_ROTATE_RIGHT = Math.PI * 0.0078125; private static final double PI_ROTATE_RIGHT = Math.PI * 0.0078125;