63c684a8a6
Fix path bugs exposed by the path fuzzer. Changes to existing gm and samplecode files defer their calls to construct SkPath objects until the first draw instead of at test initialization. Add an experimental call to SkPath to validate the internal SkPathRef. Fix SkPath::addPoly to set the last moveto after adding a close verb. Fix stroke to handle failures when computing the unit normal. Add a unit test for the unit normal failure. R=reed@google.com Review URL: https://codereview.chromium.org/953383002
220 lines
7.5 KiB
C++
220 lines
7.5 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
|
|
#include "SkBitmap.h"
|
|
#include "SkPaint.h"
|
|
#include "SkPicture.h"
|
|
#include "SkPictureRecorder.h"
|
|
#include "SkShader.h"
|
|
|
|
static struct {
|
|
SkShader::TileMode tmx;
|
|
SkShader::TileMode tmy;
|
|
} kTileConfigs[] = {
|
|
{ SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode },
|
|
{ SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode },
|
|
{ SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode },
|
|
};
|
|
|
|
class PictureShaderGM : public skiagm::GM {
|
|
public:
|
|
PictureShaderGM(SkScalar tileSize, SkScalar sceneSize)
|
|
: fTileSize(tileSize)
|
|
, fSceneSize(sceneSize) {
|
|
}
|
|
|
|
protected:
|
|
void onOnceBeforeDraw() SK_OVERRIDE {
|
|
// Build the picture.
|
|
SkPictureRecorder recorder;
|
|
SkCanvas* pictureCanvas = recorder.beginRecording(fTileSize, fTileSize, NULL, 0);
|
|
this->drawTile(pictureCanvas);
|
|
fPicture.reset(recorder.endRecording());
|
|
|
|
// Build a reference bitmap.
|
|
fBitmap.allocN32Pixels(SkScalarCeilToInt(fTileSize), SkScalarCeilToInt(fTileSize));
|
|
fBitmap.eraseColor(SK_ColorTRANSPARENT);
|
|
SkCanvas bitmapCanvas(fBitmap);
|
|
this->drawTile(&bitmapCanvas);
|
|
}
|
|
|
|
|
|
SkString onShortName() SK_OVERRIDE {
|
|
return SkString("pictureshader");
|
|
}
|
|
|
|
SkISize onISize() SK_OVERRIDE {
|
|
return SkISize::Make(1400, 1450);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
|
this->drawSceneColumn(canvas, SkPoint::Make(0, 0), 1, 1, 0);
|
|
this->drawSceneColumn(canvas, SkPoint::Make(0, fSceneSize * 6.4f), 1, 2, 0);
|
|
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 2.4f, 0), 1, 1, 1);
|
|
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 2.4f, fSceneSize * 6.4f), 1, 1, 2);
|
|
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 4.8f, 0), 2, 1, 0);
|
|
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 9.6f, 0), 2, 2, 0);
|
|
|
|
// One last custom row to exercise negative scaling
|
|
SkMatrix ctm, localMatrix;
|
|
ctm.setTranslate(fSceneSize * 2.1f, fSceneSize * 13.8f);
|
|
ctm.preScale(-1, -1);
|
|
localMatrix.setScale(2, 2);
|
|
this->drawScene(canvas, ctm, localMatrix, 0);
|
|
|
|
ctm.setTranslate(fSceneSize * 2.4f, fSceneSize * 12.8f);
|
|
localMatrix.setScale(-1, -1);
|
|
this->drawScene(canvas, ctm, localMatrix, 0);
|
|
|
|
ctm.setTranslate(fSceneSize * 4.8f, fSceneSize * 12.3f);
|
|
ctm.preScale(2, 2);
|
|
this->drawScene(canvas, ctm, localMatrix, 0);
|
|
|
|
ctm.setTranslate(fSceneSize * 13.8f, fSceneSize * 14.3f);
|
|
ctm.preScale(-2, -2);
|
|
localMatrix.setTranslate(fTileSize / 4, fTileSize / 4);
|
|
localMatrix.preRotate(45);
|
|
localMatrix.preScale(-2, -2);
|
|
this->drawScene(canvas, ctm, localMatrix, 0);
|
|
}
|
|
|
|
private:
|
|
void drawSceneColumn(SkCanvas* canvas, const SkPoint& pos, SkScalar scale, SkScalar localScale,
|
|
unsigned tileMode) {
|
|
SkMatrix ctm, localMatrix;
|
|
|
|
ctm.setTranslate(pos.x(), pos.y());
|
|
ctm.preScale(scale, scale);
|
|
localMatrix.setScale(localScale, localScale);
|
|
this->drawScene(canvas, ctm, localMatrix, tileMode);
|
|
|
|
ctm.setTranslate(pos.x(), pos.y() + fSceneSize * 1.2f * scale);
|
|
ctm.preScale(scale, scale);
|
|
localMatrix.setTranslate(fTileSize / 4, fTileSize / 4);
|
|
localMatrix.preScale(localScale, localScale);
|
|
this->drawScene(canvas, ctm, localMatrix, tileMode);
|
|
|
|
ctm.setTranslate(pos.x(), pos.y() + fSceneSize * 2.4f * scale);
|
|
ctm.preScale(scale, scale);
|
|
localMatrix.setRotate(45);
|
|
localMatrix.preScale(localScale, localScale);
|
|
this->drawScene(canvas, ctm, localMatrix, tileMode);
|
|
|
|
ctm.setTranslate(pos.x(), pos.y() + fSceneSize * 3.6f * scale);
|
|
ctm.preScale(scale, scale);
|
|
localMatrix.setSkew(1, 0);
|
|
localMatrix.preScale(localScale, localScale);
|
|
this->drawScene(canvas, ctm, localMatrix, tileMode);
|
|
|
|
ctm.setTranslate(pos.x(), pos.y() + fSceneSize * 4.8f * scale);
|
|
ctm.preScale(scale, scale);
|
|
localMatrix.setTranslate(fTileSize / 4, fTileSize / 4);
|
|
localMatrix.preRotate(45);
|
|
localMatrix.preScale(localScale, localScale);
|
|
this->drawScene(canvas, ctm, localMatrix, tileMode);
|
|
}
|
|
|
|
void drawTile(SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
paint.setColor(SK_ColorGREEN);
|
|
paint.setStyle(SkPaint::kFill_Style);
|
|
paint.setAntiAlias(true);
|
|
|
|
canvas->drawCircle(fTileSize / 4, fTileSize / 4, fTileSize / 4, paint);
|
|
canvas->drawRect(SkRect::MakeXYWH(fTileSize / 2, fTileSize / 2,
|
|
fTileSize / 2, fTileSize / 2), paint);
|
|
|
|
paint.setColor(SK_ColorRED);
|
|
canvas->drawLine(fTileSize / 2, fTileSize * 1 / 3,
|
|
fTileSize / 2, fTileSize * 2 / 3, paint);
|
|
canvas->drawLine(fTileSize * 1 / 3, fTileSize / 2,
|
|
fTileSize * 2 / 3, fTileSize / 2, paint);
|
|
}
|
|
|
|
void drawScene(SkCanvas* canvas, const SkMatrix& matrix, const SkMatrix& localMatrix,
|
|
unsigned tileMode) {
|
|
SkASSERT(tileMode < SK_ARRAY_COUNT(kTileConfigs));
|
|
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kFill_Style);
|
|
paint.setColor(SK_ColorLTGRAY);
|
|
|
|
canvas->save();
|
|
canvas->concat(matrix);
|
|
canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
|
|
canvas->drawRect(SkRect::MakeXYWH(fSceneSize * 1.1f, 0, fSceneSize, fSceneSize), paint);
|
|
|
|
SkAutoTUnref<SkShader> pictureShader(SkShader::CreatePictureShader(
|
|
fPicture,
|
|
kTileConfigs[tileMode].tmx,
|
|
kTileConfigs[tileMode].tmy,
|
|
&localMatrix,
|
|
NULL));
|
|
paint.setShader(pictureShader.get());
|
|
canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
|
|
|
|
canvas->translate(fSceneSize * 1.1f, 0);
|
|
|
|
SkAutoTUnref<SkShader> bitmapShader(SkShader::CreateBitmapShader(
|
|
fBitmap,
|
|
kTileConfigs[tileMode].tmx,
|
|
kTileConfigs[tileMode].tmy,
|
|
&localMatrix));
|
|
paint.setShader(bitmapShader.get());
|
|
canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
|
|
|
|
canvas->restore();
|
|
}
|
|
|
|
SkScalar fTileSize;
|
|
SkScalar fSceneSize;
|
|
|
|
SkAutoTUnref<SkPicture> fPicture;
|
|
SkBitmap fBitmap;
|
|
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
DEF_GM( return SkNEW_ARGS(PictureShaderGM, (50, 100)); )
|
|
|
|
DEF_SIMPLE_GM(tiled_picture_shader, canvas, 400, 400) {
|
|
// https://code.google.com/p/skia/issues/detail?id=3398
|
|
SkRect tile = SkRect::MakeWH(100, 100);
|
|
|
|
SkPictureRecorder recorder;
|
|
SkCanvas* c = recorder.beginRecording(tile);
|
|
|
|
SkRect r = tile;
|
|
r.inset(4, 4);
|
|
SkPaint p;
|
|
p.setColor(0xFF303F9F); // dark blue
|
|
c->drawRect(r, p);
|
|
p.setColor(0xFFC5CAE9); // light blue
|
|
p.setStrokeWidth(10);
|
|
c->drawLine(20, 20, 80, 80, p);
|
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
SkAutoTUnref<SkShader> shader(SkShader::CreatePictureShader(
|
|
picture.get(),
|
|
SkShader::kRepeat_TileMode,
|
|
SkShader::kRepeat_TileMode,
|
|
NULL,
|
|
NULL));
|
|
|
|
p.setColor(0xFF8BC34A); // green
|
|
canvas->drawPaint(p);
|
|
|
|
canvas->clipRect(SkRect::MakeXYWH(0, 0, 400, 350));
|
|
p.setColor(0xFFB6B6B6); // gray
|
|
canvas->drawPaint(p);
|
|
p.setShader(shader.get());
|
|
|
|
canvas->drawPaint(p);
|
|
}
|