diff options
Diffstat (limited to 'samplecode/SampleAndroidShadows.cpp')
| -rw-r--r-- | samplecode/SampleAndroidShadows.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/samplecode/SampleAndroidShadows.cpp b/samplecode/SampleAndroidShadows.cpp index 87fa0510fe..d9e513b5c4 100644 --- a/samplecode/SampleAndroidShadows.cpp +++ b/samplecode/SampleAndroidShadows.cpp @@ -12,11 +12,13 @@ #include "SkGaussianEdgeShader.h" #include "SkPath.h" #include "SkPoint3.h" -#include "SkShadowMaskFilter.h" +#include "SkShadowUtils.h" #include "SkUtils.h" #include "SkView.h" #include "sk_tool_utils.h" +#define USE_SHADOW_UTILS + //////////////////////////////////////////////////////////////////////////// class ShadowsView : public SampleView { @@ -367,7 +369,7 @@ protected: void drawShadowedPath(SkCanvas* canvas, const SkPath& path, SkScalar zValue, const SkPaint& paint, SkScalar ambientAlpha, const SkPoint3& lightPos, SkScalar lightWidth, SkScalar spotAlpha) { -#ifdef USE_MASK_FILTER +#ifdef USE_SHADOW_UTILS if (fUseAlt) { if (fShowAmbient) { this->drawAmbientShadowAlt(canvas, path, zValue, ambientAlpha); @@ -376,19 +378,14 @@ protected: this->drawSpotShadowAlt(canvas, path, zValue, lightPos, lightWidth, spotAlpha); } } else { - SkPaint newPaint; - newPaint.setColor(SK_ColorBLACK); if (!fShowAmbient) { ambientAlpha = 0; } if (!fShowSpot) { spotAlpha = 0; } - - newPaint.setMaskFilter(SkShadowMaskFilter::Make(zValue, lightPos, lightWidth, - ambientAlpha, spotAlpha)); - - canvas->drawPath(path, newPaint); + SkShadowUtils::DrawShadow(canvas, path, zValue, lightPos, lightWidth, + ambientAlpha, spotAlpha, SK_ColorBLACK); } #else if (fShowAmbient) { |