AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2d41186521
skia2/modules/sksg/include/SkSGText.h

103 lines
3.0 KiB
C
Raw Normal View History

[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
/*
* Copyright 2018 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkSGText_DEFINED
#define SkSGText_DEFINED
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "modules/sksg/include/SkSGGeometryNode.h"
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/core/SkFont.h"
#include "include/core/SkPoint.h"
#include "include/core/SkString.h"
#include "include/core/SkTextBlob.h"
#include "include/utils/SkTextUtils.h"
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
class SkCanvas;
class SkPaint;
class SkTypeface;
namespace sksg {
/**
* Concrete Geometry node, wrapping a (shaped) SkTextBlob.
*/
class Text final : public GeometryNode {
public:
static sk_sp<Text> Make(sk_sp<SkTypeface> tf, const SkString& text);
~Text() override;
[sksg] Expose SkFont::Edging in TextNode (instead of SkPaint flags) TBR= Change-Id: I31566f29d7922b26898234c357d8d249ebc1e094 Reviewed-on: https://skia-review.googlesource.com/c/172504 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-21 21:03:58 +00:00
SG_ATTRIBUTE(Typeface, sk_sp<SkTypeface> , fTypeface)
SG_ATTRIBUTE(Text , SkString , fText )
SG_ATTRIBUTE(Position, SkPoint , fPosition)
SG_ATTRIBUTE(Size , SkScalar , fSize )
SG_ATTRIBUTE(ScaleX , SkScalar , fScaleX )
SG_ATTRIBUTE(SkewX , SkScalar , fSkewX )
SG_ATTRIBUTE(Align , SkTextUtils::Align, fAlign )
SG_ATTRIBUTE(Edging , SkFont::Edging , fEdging )
SG_ATTRIBUTE(Hinting , SkFontHinting , fHinting )
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
// TODO: add shaping functionality.
protected:
void onClip(SkCanvas*, bool antiAlias) const override;
void onDraw(SkCanvas*, const SkPaint&) const override;
[sksg] Hit-testing API Introduce RenderNode::nodeAt(const SkPoint&) as the entry point for the hit-testing API. This is backed by a onNodeAt() virtual, which gets dispatched throughout the render DAG, and normally stops at the first leaf Draw node in encounters. To support the implementation, introduce a GeometryNode::contains(const SkPoint&) API. This is backed by a onContains() virtual, overridden in each concrete geometry class. Expose nodeAt() on sksg::Scene, and add some basic unit tests. Change-Id: I0c8abd9d1e51ecf2d8b4dd699f325cd636e21084 Reviewed-on: https://skia-review.googlesource.com/c/191296 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
2019-02-12 14:33:21 +00:00
bool onContains(const SkPoint&) const override;
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
SkPath onAsPath() const override;
private:
[skottie] Add support for explicit text line breaks To support wacky explicit AE line breaking: * add sksg::TextBlob (SG node backed by externally-built text blobs) * add skottie::TextAdapter logic to handle \r line breaks and construct the blob explicitly Change-Id: I2eed9adf28a8c3c1f7de5bbec3d32abd7ddbd484 Reviewed-on: https://skia-review.googlesource.com/c/167384 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-01 15:16:18 +00:00
Text(sk_sp<SkTypeface>, const SkString&);
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
[sksg] Explicit text alignment Work around for https://bugs.chromium.org/p/skia/issues/detail?id=8252 Change-Id: Icae3f69f07a2c95302cfbb3833185517f43d326e Reviewed-on: https://skia-review.googlesource.com/147218 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
2018-08-15 20:51:42 +00:00
SkPoint alignedPosition(SkScalar advance) const;
[skottie] Add support for keyframed text nodes -- introduce a new animatable value (TextValue) -- introduce a new adapter (TextAdapter) to translate Lottie text props to SG text props -- use existing animated property-bind machinery and the new constructs when parsing text layers Change-Id: Ibbfb69daf5b0a3c9a5ce8d1ccdeedca5b5d0fa6f Reviewed-on: https://skia-review.googlesource.com/149266 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-27 02:06:55 +00:00
sk_sp<SkTypeface> fTypeface;
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
SkString fText;
SkPoint fPosition = SkPoint::Make(0, 0);
[sksg] Expose SkFont::Edging in TextNode (instead of SkPaint flags) TBR= Change-Id: I31566f29d7922b26898234c357d8d249ebc1e094 Reviewed-on: https://skia-review.googlesource.com/c/172504 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-21 21:03:58 +00:00
SkScalar fSize = 12;
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
SkScalar fScaleX = 1;
SkScalar fSkewX = 0;
hide the SkPaint::Align enum entirely Bug: skia:2664 Change-Id: I080b015dbcb3a3cd73bb6847f3243a996d5f7b7d Reviewed-on: https://skia-review.googlesource.com/c/166282 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-10-30 16:53:21 +00:00
SkTextUtils::Align fAlign = SkTextUtils::kLeft_Align;
[sksg] Expose SkFont::Edging in TextNode (instead of SkPaint flags) TBR= Change-Id: I31566f29d7922b26898234c357d8d249ebc1e094 Reviewed-on: https://skia-review.googlesource.com/c/172504 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-21 21:03:58 +00:00
SkFont::Edging fEdging = SkFont::Edging::kAntiAlias;
Use SkFontHinting instead of macros. Change-Id: Ie7f231295c27010f53f09e9879aa7df74ab2d09b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212507 Auto-Submit: Ben Wagner <bungeman@google.com> Reviewed-by: Hal Canary <halcanary@skia.org> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-05-07 20:50:29 +00:00
SkFontHinting fHinting = SkFontHinting::kNormal;
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
sk_sp<SkTextBlob> fBlob; // cached text blob
using INHERITED = GeometryNode;
};
[skottie] Add support for explicit text line breaks To support wacky explicit AE line breaking: * add sksg::TextBlob (SG node backed by externally-built text blobs) * add skottie::TextAdapter logic to handle \r line breaks and construct the blob explicitly Change-Id: I2eed9adf28a8c3c1f7de5bbec3d32abd7ddbd484 Reviewed-on: https://skia-review.googlesource.com/c/167384 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-01 15:16:18 +00:00
/**
* Concrete Geometry node, wrapping an external SkTextBlob.
*/
class TextBlob final : public GeometryNode {
public:
static sk_sp<TextBlob> Make(sk_sp<SkTextBlob> = nullptr);
~TextBlob() override;
SG_ATTRIBUTE(Blob , sk_sp<SkTextBlob>, fBlob )
SG_ATTRIBUTE(Position, SkPoint , fPosition)
protected:
void onClip(SkCanvas*, bool antiAlias) const override;
void onDraw(SkCanvas*, const SkPaint&) const override;
[sksg] Hit-testing API Introduce RenderNode::nodeAt(const SkPoint&) as the entry point for the hit-testing API. This is backed by a onNodeAt() virtual, which gets dispatched throughout the render DAG, and normally stops at the first leaf Draw node in encounters. To support the implementation, introduce a GeometryNode::contains(const SkPoint&) API. This is backed by a onContains() virtual, overridden in each concrete geometry class. Expose nodeAt() on sksg::Scene, and add some basic unit tests. Change-Id: I0c8abd9d1e51ecf2d8b4dd699f325cd636e21084 Reviewed-on: https://skia-review.googlesource.com/c/191296 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
2019-02-12 14:33:21 +00:00
bool onContains(const SkPoint&) const override;
[skottie] Add support for explicit text line breaks To support wacky explicit AE line breaking: * add sksg::TextBlob (SG node backed by externally-built text blobs) * add skottie::TextAdapter logic to handle \r line breaks and construct the blob explicitly Change-Id: I2eed9adf28a8c3c1f7de5bbec3d32abd7ddbd484 Reviewed-on: https://skia-review.googlesource.com/c/167384 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-11-01 15:16:18 +00:00
SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
SkPath onAsPath() const override;
private:
explicit TextBlob(sk_sp<SkTextBlob>);
sk_sp<SkTextBlob> fBlob;
SkPoint fPosition = SkPoint::Make(0, 0);
using INHERITED = GeometryNode;
};
[sksg] Initial text support Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-31 22:06:59 +00:00
} // namespace sksg
#endif // SkSGText_DEFINED
Reference in New Issue Copy Permalink