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

handle conics in text warper

Browse Source 
Bug: skia:7507
Change-Id: I8d0d9b5f51f13ee52ed42c40664b8bafb5ff9420
Reviewed-on: https://skia-review.googlesource.com/101420
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2018-01-29 14:32:38 -05:00 committed by Skia Commit-Bot
parent 7f1a074600
commit caaf211e8d
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gm/drawatlas.cpp
View File

@ -150,7 +150,7 @@ static void draw_text_on_path(SkCanvas* canvas, const void* text, size_t length,
}
}
static void drawTextPath(SkCanvas* canvas, bool useRSX) {
static void drawTextPath(SkCanvas* canvas, bool useRSX, bool doStroke) {
const char text0[] = "ABCDFGHJKLMNOPQRSTUVWXYZ";
const int N = sizeof(text0) - 1;
SkPoint pos[N];
@ -158,6 +158,11 @@ static void drawTextPath(SkCanvas* canvas, bool useRSX) {
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(100);
if (doStroke) {
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(2.25f);
paint.setStrokeJoin(SkPaint::kRound_Join);
}
SkScalar x = 0;
for (int i = 0; i < N; ++i) {
@ -177,15 +182,22 @@ static void drawTextPath(SkCanvas* canvas, bool useRSX) {
draw_text_on_path(canvas, text0, N, pos, path, paint, baseline_offset, useRSX);
}
paint.reset();
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawPath(path, paint);
}
DEF_SIMPLE_GM(drawTextRSXform, canvas, 860, 430) {
DEF_SIMPLE_GM(drawTextRSXform, canvas, 860, 860) {
canvas->scale(0.5f, 0.5f);
drawTextPath(canvas, false);
canvas->translate(860, 0);
drawTextPath(canvas, true);
const bool doStroke[] = { false, true };
for (auto st : doStroke) {
canvas->save();
drawTextPath(canvas, false, st);
canvas->translate(860, 0);
drawTextPath(canvas, true, st);
canvas->restore();
canvas->translate(0, 860);
}
}
#include "Resources.h"

4
src/core/SkDevice.cpp
View File

@ -403,6 +403,10 @@ static void morphpath(SkPath* dst, const SkPath& src, SkPathMeasure& meas,
morphpoints(dstP, &srcP[1], 2, meas, matrix);
dst->quadTo(dstP[0], dstP[1]);
break;
case SkPath::kConic_Verb:
morphpoints(dstP, &srcP[1], 2, meas, matrix);
dst->conicTo(dstP[0], dstP[1], iter.conicWeight());
break;
case SkPath::kCubic_Verb:
morphpoints(dstP, &srcP[1], 3, meas, matrix);
dst->cubicTo(dstP[0], dstP[1], dstP[2]);