AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix shadow_utils light position for SampleApp tiling

Browse Source 
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>
This commit is contained in:
Jim Van Verth 2017-05-16 15:01:43 -04:00 committed by Skia Commit-Bot
parent d5a16911bb
commit 9392f569cc
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gm/shadowutils.cpp
View File

@ -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();
}
}

9
samplecode/SampleShadowUtils.cpp
View File

@ -150,12 +150,15 @@ protected:
static constexpr int kW = 800;
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;
static constexpr SkScalar kAmbientAlpha = 0.5f;
static constexpr SkScalar kSpotAlpha = 0.5f;
// 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;
@ -186,7 +189,7 @@ protected:
canvas->save();
canvas->concat(m);
drawShadowedPath(canvas, path, zPlaneParams, paint, kAmbientAlpha, kLightPos,
drawShadowedPath(canvas, path, zPlaneParams, paint, kAmbientAlpha, lightPos,
kLightR, kSpotAlpha, flags);
canvas->restore();
@ -204,7 +207,7 @@ protected:
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();
}
}