diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-05-04 09:58:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-04 14:28:28 +0000 |
| commit | 060d9820364b0cf09c7eb3bda449f24c3dcba2e2 (patch) | |
| tree | c839d2c3129f90c281d3b0f2c642cf160675b056 /tests | |
| parent | db711c982bfaa805d2de5a253c55a680c30189e0 (diff) | |
Combine the ambient and spot alphas into the base color
for geometric shadows.
This matches the analytic shadow approach better, and
is color space invariant.
Also includes cleanup in SampleAndroidShadows.
Bug: skia:6546
Change-Id: I7a7cd060420dae741f967334c8b19542a14f0bcf
Reviewed-on: https://skia-review.googlesource.com/15228
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ShadowUtilsTest.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/ShadowUtilsTest.cpp b/tests/ShadowUtilsTest.cpp index 56990146f0..f83e44a1fc 100644 --- a/tests/ShadowUtilsTest.cpp +++ b/tests/ShadowUtilsTest.cpp @@ -14,29 +14,25 @@ void tessellate_shadow(skiatest::Reporter* reporter, const SkPath& path, const SkMatrix& ctm, bool expectSuccess) { - static constexpr SkScalar kAmbientAlpha = 0.25f; - static constexpr SkScalar kSpotAlpha = 0.25f; auto heightFunc = [] (SkScalar, SkScalar) { return 4; }; - auto verts = SkShadowTessellator::MakeAmbient(path, ctm, heightFunc, kAmbientAlpha, true); + auto verts = SkShadowTessellator::MakeAmbient(path, ctm, heightFunc, true); if (expectSuccess != SkToBool(verts)) { ERRORF(reporter, "Expected shadow tessellation to %s but it did not.", expectSuccess ? "succeed" : "fail"); } - verts = SkShadowTessellator::MakeAmbient(path, ctm, heightFunc, kAmbientAlpha, false); + verts = SkShadowTessellator::MakeAmbient(path, ctm, heightFunc, false); if (expectSuccess != SkToBool(verts)) { ERRORF(reporter, "Expected shadow tessellation to %s but it did not.", expectSuccess ? "succeed" : "fail"); } - verts = SkShadowTessellator::MakeSpot(path, ctm, heightFunc, {0, 0, 128}, 128.f, - kSpotAlpha, false); + verts = SkShadowTessellator::MakeSpot(path, ctm, heightFunc, {0, 0, 128}, 128.f, false); if (expectSuccess != SkToBool(verts)) { ERRORF(reporter, "Expected shadow tessellation to %s but it did not.", expectSuccess ? "succeed" : "fail"); } - verts = SkShadowTessellator::MakeSpot(path, ctm, heightFunc, {0, 0, 128}, 128.f, - kSpotAlpha, false); + verts = SkShadowTessellator::MakeSpot(path, ctm, heightFunc, {0, 0, 128}, 128.f, false); if (expectSuccess != SkToBool(verts)) { ERRORF(reporter, "Expected shadow tessellation to %s but it did not.", expectSuccess ? "succeed" : "fail"); |