diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-06 14:16:12 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-06 14:16:12 +0000 |
| commit | b7061176c7f414616fe2e79e832b3e0abe326af6 (patch) | |
| tree | 05269431ac1dfa9b62d5fa34a0351e2f21af712e /samplecode/SampleAll.cpp | |
| parent | b27eba7c28c7a52e6af91743ab51c266ed96dccd (diff) | |
Push sigma-based blur interface into our GMs/benches/tests/samplecode
https://codereview.chromium.org/23701006/
git-svn-id: http://skia.googlecode.com/svn/trunk@11129 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleAll.cpp')
| -rw-r--r-- | samplecode/SampleAll.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 24fbc2037f..133b653c07 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -6,6 +6,7 @@ * found in the LICENSE file. */ #include "SampleCode.h" +#include "SkBlurMask.h" #include "SkCanvas.h" #include "SkView.h" #include "Sk1DPathEffect.h" @@ -79,8 +80,8 @@ private: /////////////////////////////////////////////////////////// static void r0(SkLayerRasterizer* rast, SkPaint& p) { - p.setMaskFilter(SkBlurMaskFilter::Create(SkIntToScalar(3), - SkBlurMaskFilter::kNormal_BlurStyle, + p.setMaskFilter(SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), SkBlurMaskFilter::kNone_BlurFlag))->unref(); rast->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); @@ -255,10 +256,9 @@ static void apply_shader(SkPaint* paint, int index) { #if 1 SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 }; - paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss(dir, - SK_Scalar1/4, - SkIntToScalar(4), - SkIntToScalar(3)))->unref(); + paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss( + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), dir, + SK_Scalar1/4, SkIntToScalar(4)))->unref(); paint->setColor(SK_ColorBLUE); #endif } @@ -386,8 +386,8 @@ protected: light.fDirection[2] = SK_Scalar1/3; light.fAmbient = 0x48; light.fSpecular = 0x80; - SkScalar radius = SkIntToScalar(12)/5; - SkEmbossMaskFilter* embossFilter = new SkEmbossMaskFilter(light, radius); + SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5); + SkEmbossMaskFilter* embossFilter = new SkEmbossMaskFilter(sigma, light); SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); SkColorFilter* lightingFilter = SkColorFilter::CreateLightingFilter( |