diff options
author | Jim Van Verth <jvanverth@google.com> | 2017-05-16 15:01:43 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 02:29:39 +0000 |
commit | 9392f569ccb9f52faf39db6bec22553e5abc7cc1 (patch) | |
tree | 10d44f527f6ccf25e40a735e2f2de3beb080cd90 /gm/shadowutils.cpp | |
parent | d5a16911bb0da6b03daee6e9dd896429c7f8e8a1 (diff) |
Fix shadow_utils light position for SampleApp tiling
Change-Id: Icddc82a095aa698bdba9004641acdc411392632f
Reviewed-on: https://skia-review.googlesource.com/17044
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/shadowutils.cpp')
-rw-r--r-- | gm/shadowutils.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gm/shadowutils.cpp b/gm/shadowutils.cpp index 17e2620164..87c151e8ab 100644 --- a/gm/shadowutils.cpp +++ b/gm/shadowutils.cpp @@ -34,9 +34,13 @@ void draw_paths(SkCanvas* canvas, bool hideOccluders) { paths.push_back().addOval(SkRect::MakeWH(20, 60)); static constexpr SkScalar kPad = 15.f; - static constexpr SkPoint3 kLightPos = { 250, 400, 500 }; static constexpr SkScalar kLightR = 100.f; static constexpr SkScalar kHeight = 50.f; + + // transform light position relative to canvas to handle tiling + SkPoint lightXY = canvas->getTotalMatrix().mapXY(250, 400); + SkPoint3 lightPos = { lightXY.fX, lightXY.fY, 500 }; + canvas->translate(3 * kPad, 3 * kPad); canvas->save(); SkScalar x = 0; @@ -63,8 +67,8 @@ void draw_paths(SkCanvas* canvas, bool hideOccluders) { canvas->save(); canvas->concat(m); - draw_shadow(canvas, path, kHeight, SK_ColorRED, kLightPos, kLightR, true, flags); - draw_shadow(canvas, path, kHeight, SK_ColorBLUE, kLightPos, kLightR, false, flags); + draw_shadow(canvas, path, kHeight, SK_ColorRED, lightPos, kLightR, true, flags); + draw_shadow(canvas, path, kHeight, SK_ColorBLUE, lightPos, kLightR, false, flags); // Draw the path outline in green on top of the ambient and spot shadows. SkPaint paint; @@ -101,7 +105,7 @@ void draw_paths(SkCanvas* canvas, bool hideOccluders) { SkPaint paint; paint.setColor(SK_ColorBLACK); paint.setAntiAlias(true); - canvas->drawCircle(kLightPos.fX, kLightPos.fY, kLightR / 10.f, paint); + canvas->drawCircle(lightPos.fX, lightPos.fY, kLightR / 10.f, paint); canvas->restore(); } } |