diff options
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleAll.cpp | 9 | ||||
| -rw-r--r-- | samplecode/SampleEffects.cpp | 9 |
2 files changed, 11 insertions, 7 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index ea7d508979..e1b85934b1 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -208,10 +208,13 @@ static void apply_shader(SkPaint* paint, int index) { paint->setRasterizer(rastBuilder.detach()); } - paint->setMaskFilter(SkEmbossMaskFilter::Make( - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), - { { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 })); +#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER + SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 }; + paint->setMaskFilter(SkBlurMaskFilter::MakeEmboss( + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), dir, + SK_Scalar1/4, SkIntToScalar(4))); paint->setColor(SK_ColorBLUE); +#endif } class DemoView : public SampleView { diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp index 49654983da..8c6793eb67 100644 --- a/samplecode/SampleEffects.cpp +++ b/samplecode/SampleEffects.cpp @@ -10,7 +10,6 @@ #include "SkCanvas.h" #include "SkColorMatrixFilter.h" #include "SkDiscretePathEffect.h" -#include "SkEmbossMaskFilter.h" #include "SkGradientShader.h" #include "SkPaint.h" #include "SkView.h" @@ -29,9 +28,11 @@ static void paint_proc1(SkPaint* paint) { } static void paint_proc2(SkPaint* paint) { - paint->setMaskFilter(SkEmbossMaskFilter::Make( - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)), - { { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 64, 16 })); +#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER + SkScalar dir[3] = { 1, 1, 1}; + paint->setMaskFilter( + SkBlurMaskFilter::MakeEmboss(SkBlurMask::ConvertRadiusToSigma(1), dir, 0.1f, 0.05f)); +#endif } static void paint_proc3(SkPaint* paint) { |