47c88cc9d6
For GPU: Handling a blob that moved around in perspective reused cached information incorrectly. Always recalculate the sub run information when drawing perspective. For Bitmap: Make color emoji draw correctly. Testing: Add a GM that draws a single text blob in multiple different perspective orientations. Bug: skia:10473 Bug: skia:8914 Change-Id: I945e3326804ec47bf8cbca0e3cf4a17afc9ba5f0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400598 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Herb Derby <herb@google.com>
218 lines
6.2 KiB
C++
218 lines
6.2 KiB
C++
/*
|
|
* Copyright 2018 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm/gm.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkColor.h"
|
|
#include "include/core/SkFont.h"
|
|
#include "include/core/SkFontMetrics.h"
|
|
#include "include/core/SkFontTypes.h"
|
|
#include "include/core/SkPaint.h"
|
|
#include "include/core/SkRefCnt.h"
|
|
#include "include/core/SkScalar.h"
|
|
#include "include/core/SkSize.h"
|
|
#include "include/core/SkString.h"
|
|
#include "include/core/SkTextBlob.h"
|
|
#include "include/core/SkTypeface.h"
|
|
#include "tools/ToolUtils.h"
|
|
|
|
#include <string.h>
|
|
#include <initializer_list>
|
|
|
|
static sk_sp<SkTextBlob> make_hpos_test_blob_utf8(const char* text, const SkFont& font) {
|
|
constexpr SkTextEncoding enc = SkTextEncoding::kUTF8;
|
|
SkTextBlobBuilder builder;
|
|
size_t len = strlen(text);
|
|
int glyphCount = font.countText(text, len, enc);
|
|
const auto& buffer = builder.allocRunPosH(font, glyphCount, 0);
|
|
(void)font.textToGlyphs(text, len, enc, buffer.glyphs, glyphCount);
|
|
font.getXPos(buffer.glyphs, glyphCount, buffer.pos);
|
|
return builder.make();
|
|
}
|
|
|
|
namespace skiagm {
|
|
|
|
class ScaledEmojiGM : public GM {
|
|
public:
|
|
ScaledEmojiGM() { }
|
|
|
|
protected:
|
|
struct EmojiFont {
|
|
sk_sp<SkTypeface> fTypeface;
|
|
const char* fText;
|
|
} fEmojiFont;
|
|
|
|
void onOnceBeforeDraw() override {
|
|
fEmojiFont.fTypeface = ToolUtils::emoji_typeface();
|
|
fEmojiFont.fText = ToolUtils::emoji_sample_text();
|
|
}
|
|
|
|
SkString onShortName() override {
|
|
return SkString("scaledemoji");
|
|
}
|
|
|
|
SkISize onISize() override { return SkISize::Make(1200, 1200); }
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
|
|
canvas->drawColor(SK_ColorGRAY);
|
|
|
|
SkPaint paint;
|
|
SkFont font(fEmojiFont.fTypeface);
|
|
font.setEdging(SkFont::Edging::kAlias);
|
|
|
|
const char* text = fEmojiFont.fText;
|
|
|
|
// draw text at different point sizes
|
|
// Testing GPU bitmap path, SDF path with no scaling,
|
|
// SDF path with scaling, path rendering with scaling
|
|
SkFontMetrics metrics;
|
|
SkScalar y = 0;
|
|
for (SkScalar textSize : { 70, 180, 270, 340 }) {
|
|
font.setSize(textSize);
|
|
font.getMetrics(&metrics);
|
|
y += -metrics.fAscent;
|
|
canvas->drawSimpleText(text, strlen(text), SkTextEncoding::kUTF8, 10, y, font, paint);
|
|
y += metrics.fDescent + metrics.fLeading;
|
|
}
|
|
}
|
|
|
|
private:
|
|
using INHERITED = GM;
|
|
};
|
|
|
|
class ScaledEmojiPosGM : public GM {
|
|
public:
|
|
ScaledEmojiPosGM() {}
|
|
|
|
protected:
|
|
struct EmojiFont {
|
|
sk_sp<SkTypeface> fTypeface;
|
|
const char* fText;
|
|
} fEmojiFont;
|
|
|
|
void onOnceBeforeDraw() override {
|
|
fEmojiFont.fTypeface = ToolUtils::emoji_typeface();
|
|
fEmojiFont.fText = ToolUtils::emoji_sample_text();
|
|
}
|
|
|
|
SkString onShortName() override {
|
|
return SkString("scaledemojipos");
|
|
}
|
|
|
|
SkISize onISize() override { return SkISize::Make(1200, 1200); }
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
|
|
canvas->drawColor(SK_ColorGRAY);
|
|
|
|
SkPaint paint;
|
|
SkFont font;
|
|
font.setTypeface(fEmojiFont.fTypeface);
|
|
const char* text = fEmojiFont.fText;
|
|
|
|
// draw text at different point sizes
|
|
// Testing GPU bitmap path, SDF path with no scaling,
|
|
// SDF path with scaling, path rendering with scaling
|
|
SkFontMetrics metrics;
|
|
SkScalar y = 0;
|
|
for (SkScalar textSize : { 70, 180, 270, 340 }) {
|
|
font.setSize(textSize);
|
|
font.getMetrics(&metrics);
|
|
y += -metrics.fAscent;
|
|
|
|
sk_sp<SkTextBlob> blob = make_hpos_test_blob_utf8(text, font);
|
|
// Draw with an origin.
|
|
canvas->drawTextBlob(blob, 10, y, paint);
|
|
|
|
// Draw with shifted canvas.
|
|
canvas->save();
|
|
canvas->translate(750, 0);
|
|
canvas->drawTextBlob(blob, 10, y, paint);
|
|
canvas->restore();
|
|
|
|
y += metrics.fDescent + metrics.fLeading;
|
|
}
|
|
}
|
|
|
|
private:
|
|
using INHERITED = GM;
|
|
};
|
|
|
|
class ScaledEmojiPerspectiveGM : public GM {
|
|
public:
|
|
ScaledEmojiPerspectiveGM() {}
|
|
|
|
protected:
|
|
struct EmojiFont {
|
|
sk_sp<SkTypeface> fTypeface;
|
|
const char* fText;
|
|
} fEmojiFont;
|
|
|
|
void onOnceBeforeDraw() override {
|
|
fEmojiFont.fTypeface = ToolUtils::emoji_typeface();
|
|
fEmojiFont.fText = ToolUtils::emoji_sample_text();
|
|
}
|
|
|
|
SkString onShortName() override {
|
|
return SkString("scaledemojiperspective");
|
|
}
|
|
|
|
SkISize onISize() override { return SkISize::Make(1200, 1200); }
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
|
|
canvas->drawColor(SK_ColorGRAY);
|
|
SkMatrix taper;
|
|
taper.setPerspY(-0.0025f);
|
|
|
|
SkPaint paint;
|
|
SkFont font;
|
|
font.setTypeface(fEmojiFont.fTypeface);
|
|
font.setSize(40);
|
|
const char* text = "\xF0\x9F\x98\x80"
|
|
"\xE2\x99\xA2"; // 😀♢;
|
|
sk_sp<SkTextBlob> blob = make_hpos_test_blob_utf8(text, font);
|
|
|
|
// draw text at different point sizes
|
|
// Testing GPU bitmap path, SDF path with no scaling,
|
|
// SDF path with scaling, path rendering with scaling
|
|
SkFontMetrics metrics;
|
|
font.getMetrics(&metrics);
|
|
for (auto rotate : {0.0, 45.0, 90.0, 135.0, 180.0, 225.0, 270.0, 315.0}) {
|
|
canvas->save();
|
|
SkMatrix perspective;
|
|
perspective.postTranslate(-600, -600);
|
|
perspective.postConcat(taper);
|
|
perspective.postRotate(rotate);
|
|
perspective.postTranslate(600, 600);
|
|
canvas->concat(perspective);
|
|
SkScalar y = 670;
|
|
for (int i = 0; i < 5; i++) {
|
|
|
|
y += -metrics.fAscent;
|
|
|
|
// Draw with an origin.
|
|
canvas->drawTextBlob(blob, 565, y, paint);
|
|
|
|
y += metrics.fDescent + metrics.fLeading;
|
|
}
|
|
canvas->restore();
|
|
}
|
|
}
|
|
|
|
private:
|
|
using INHERITED = GM;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM(return new ScaledEmojiGM;)
|
|
DEF_GM(return new ScaledEmojiPosGM;)
|
|
DEF_GM(return new ScaledEmojiPerspectiveGM;)
|
|
} // namespace skiagm
|