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

Added concave paths to aaxfermodes GM

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1534823004

Review URL: https://codereview.chromium.org/1534823004
This commit is contained in:
ethannicholas 2015-12-17 10:58:28 -08:00 committed by Commit bot
parent f6d8d28883
commit 3819d2d767
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gm/aaxfermodes.cpp
View File

@ -16,7 +16,7 @@ enum {
kShapeSize = 22, kShapeSize = 22,
kShapeSpacing = 36, kShapeSpacing = 36,
kShapeTypeSpacing = 4 * kShapeSpacing / 3, kShapeTypeSpacing = 4 * kShapeSpacing / 3,
kPaintSpacing = 3 * kShapeTypeSpacing, kPaintSpacing = 4 * kShapeTypeSpacing,
kLabelSpacing = 3 * kShapeSize, kLabelSpacing = 3 * kShapeSize,
kMargin = kShapeSpacing / 2, kMargin = kShapeSpacing / 2,
kXfermodeTypeSpacing = kLabelSpacing + 2 * kPaintSpacing + kShapeTypeSpacing, kXfermodeTypeSpacing = kLabelSpacing + 2 * kPaintSpacing + kShapeTypeSpacing,
@ -35,8 +35,9 @@ enum Shape {
kSquare_Shape, kSquare_Shape,
kDiamond_Shape, kDiamond_Shape,
kOval_Shape, kOval_Shape,
kConcave_Shape,
kLast_Shape = kOval_Shape kLast_Shape = kConcave_Shape
}; };
namespace skiagm { namespace skiagm {
@ -80,9 +81,16 @@ protected:
{radius, 0}, {radius, 0},
{0, 1.33f * radius} {0, 1.33f * radius}
}; };
fPath.moveTo(pts[0]); fOval.moveTo(pts[0]);
fPath.quadTo(pts[1], pts[2]); fOval.quadTo(pts[1], pts[2]);
fPath.quadTo(pts[3], pts[0]); fOval.quadTo(pts[3], pts[0]);
fConcave.moveTo(-radius, 0);
fConcave.quadTo(0, 0, 0, -radius);
fConcave.quadTo(0, 0, radius, 0);
fConcave.quadTo(0, 0, 0, radius);
fConcave.quadTo(0, 0, -radius, 0);
fConcave.close();
} }
void draw_pass(SkCanvas* canvas, DrawingPass drawingPass) { void draw_pass(SkCanvas* canvas, DrawingPass drawingPass) {
@ -102,11 +110,12 @@ protected:
if (kShape_Pass == drawingPass) { if (kShape_Pass == drawingPass) {
fLabelPaint.setTextAlign(SkPaint::kCenter_Align); fLabelPaint.setTextAlign(SkPaint::kCenter_Align);
canvas->drawText("Src Unknown", sizeof("Src Unknown") - 1, canvas->drawText("Src Unknown", sizeof("Src Unknown") - 1,
kLabelSpacing + kShapeSpacing / 2 + kShapeTypeSpacing, kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2,
kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint); kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint);
canvas->drawText("Src Opaque", sizeof("Src Opaque") - 1, canvas->drawText("Src Opaque", sizeof("Src Opaque") - 1,
kLabelSpacing + kShapeSpacing / 2 + kShapeTypeSpacing + kPaintSpacing, kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2 +
kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint); kPaintSpacing, kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3,
fLabelPaint);
} }
canvas->translate(0, kSubtitleSpacing + kShapeSpacing/2); canvas->translate(0, kSubtitleSpacing + kShapeSpacing/2);
@ -171,10 +180,10 @@ protected:
titlePaint.setFakeBoldText(true); titlePaint.setFakeBoldText(true);
titlePaint.setTextAlign(SkPaint::kCenter_Align); titlePaint.setTextAlign(SkPaint::kCenter_Align);
canvas->drawText("Porter Duff", sizeof("Porter Duff") - 1, canvas->drawText("Porter Duff", sizeof("Porter Duff") - 1,
kLabelSpacing + 3 * kShapeTypeSpacing, kLabelSpacing + 4 * kShapeTypeSpacing,
kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint); kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint);
canvas->drawText("Advanced", sizeof("Advanced") - 1, canvas->drawText("Advanced", sizeof("Advanced") - 1,
kXfermodeTypeSpacing + kLabelSpacing + 3 * kShapeTypeSpacing, kXfermodeTypeSpacing + kLabelSpacing + 4 * kShapeTypeSpacing,
kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint); kTitleSpacing / 2 + titlePaint.getTextSize() / 3, titlePaint);
draw_pass(canvas, kShape_Pass); draw_pass(canvas, kShape_Pass);
@ -186,7 +195,7 @@ protected:
: "Arithmetic"; : "Arithmetic";
fLabelPaint.setTextAlign(SkPaint::kRight_Align); fLabelPaint.setTextAlign(SkPaint::kRight_Align);
canvas->drawText(modeName, strlen(modeName), kLabelSpacing - kShapeSize / 4, canvas->drawText(modeName, strlen(modeName), kLabelSpacing - kShapeSize / 4,
fLabelPaint.getTextSize() / 3, fLabelPaint); fLabelPaint.getTextSize() / 4, fLabelPaint);
} }
void setupShapePaint(SkCanvas* canvas, GrColor color, SkXfermode::Mode mode, SkPaint* paint) { void setupShapePaint(SkCanvas* canvas, GrColor color, SkXfermode::Mode mode, SkPaint* paint) {
@ -212,7 +221,7 @@ protected:
dimPaint.setARGB(0, 0, 0, 0); dimPaint.setARGB(0, 0, 0, 0);
} }
canvas->drawRectCoords(-kShapeSpacing/2, -kShapeSpacing/2, canvas->drawRectCoords(-kShapeSpacing/2, -kShapeSpacing/2,
kShapeSpacing/2 + 2 * kShapeTypeSpacing, kShapeSpacing/2 + 3 * kShapeTypeSpacing,
kShapeSpacing/2, dimPaint); kShapeSpacing/2, dimPaint);
} }
} }
@ -247,10 +256,14 @@ protected:
case kOval_Shape: case kOval_Shape:
canvas->save(); canvas->save();
canvas->rotate(static_cast<SkScalar>((511 * mode + 257) % 360)); canvas->rotate(static_cast<SkScalar>((511 * mode + 257) % 360));
canvas->drawPath(fPath, shapePaint); canvas->drawPath(fOval, shapePaint);
canvas->restore(); canvas->restore();
break; break;
case kConcave_Shape:
canvas->drawPath(fConcave, shapePaint);
break;
default: default:
SkFAIL("Invalid shape."); SkFAIL("Invalid shape.");
} }
@ -258,7 +271,8 @@ protected:
private: private:
SkPaint fLabelPaint; SkPaint fLabelPaint;
SkPath fPath; SkPath fOval;
SkPath fConcave;
typedef GM INHERITED; typedef GM INHERITED;
}; };