summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2021-03-31 13:40:36 -0700
committer Lucas Dupin <dupin@google.com> 2021-03-31 13:48:10 -0700
commit3e342880013e83f047c239b25978612d64f23b41 (patch)
tree5de6eac6a684602bd52cf7f75130b451fb169dca
parent74d4d0297792a42aca2cd11cab3cae851d2b0401 (diff)
Make ripple sparkles less prominent
Test: visual Bug: 184188444 Change-Id: Ieac0a7e7ff389f16bc4e42c14ea94182cec44c38
-rw-r--r--graphics/java/android/graphics/drawable/RippleShader.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java
index 98b9584f7b4a..b1862f36fbdc 100644
--- a/graphics/java/android/graphics/drawable/RippleShader.java
+++ b/graphics/java/android/graphics/drawable/RippleShader.java
@@ -41,6 +41,7 @@ final class RippleShader extends RuntimeShader {
+ " return fract(xy * 95.4307) + fract(xy * 75.04961) - 1.0;\n"
+ "}"
+ "const float PI = 3.1415926535897932384626;\n"
+ + "const float SPARKLE_OPACITY = 0.55;\n"
+ "\n"
+ "float sparkles(vec2 uv, float t) {\n"
+ " float n = triangleNoise(uv);\n"
@@ -52,7 +53,7 @@ final class RippleShader extends RuntimeShader {
+ " o *= abs(sin(PI * o * (t + 0.55 * i)));\n"
+ " s += o;\n"
+ " }\n"
- + " return saturate(s);\n"
+ + " return saturate(s) * SPARKLE_OPACITY;\n"
+ "}\n"
+ "\n"
+ "float softCircle(vec2 uv, vec2 xy, float radius, float blur) {\n"