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

Merge "Do not scale down sparkles" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-03-31 02:43:53 +00:00
committed by Android (Google) Code Review
parent 12e4fde793 9b1bcd73b0
commit 19f026c222
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ final class RippleShader extends RuntimeShader {
+ " float currentRadius = radius * progress;\n"
+ " float circle_outer = softCircle(uv, xy, currentRadius + thickness, blur);\n"
+ " float circle_inner = softCircle(uv, xy, currentRadius - thickness, blur);\n"
+ " return clamp(circle_outer - circle_inner, 0., 1.);\n"
+ " return saturate(circle_outer - circle_inner);\n"
+ "}\n"
+ "float subProgress(float start, float end, float progress) {\n"
+ " float sub = clamp(progress, start, end);\n"
@@ -133,7 +133,7 @@ final class RippleShader extends RuntimeShader {
}
public void setResolution(float w, float h, int density) {
float densityScale = density * DisplayMetrics.DENSITY_DEFAULT_SCALE * 0.5f;
float densityScale = density * DisplayMetrics.DENSITY_DEFAULT_SCALE;
setUniform("in_resolutionScale", new float[] {1f / w, 1f / h});
setUniform("in_noiseScale", new float[] {densityScale / w, densityScale / h});
}