c91527f297
Geometry effects (trim-path, etc) are sensitive to the SkPath conversion
direction and starting point.
Introduce SkSG{Rect,RRect) direction and initial point attributes, and
update Skottie to initialize these according to the AE model.
TBR=
Bug: skia:8303, skia:8328, skia:8299
Change-Id: I5ec82d747e015067c7fc416c9eded6eea73d759a
Reviewed-on: https://skia-review.googlesource.com/c/185689
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
112 lines
3.2 KiB
C++
112 lines
3.2 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkSGRect_DEFINED
|
|
#define SkSGRect_DEFINED
|
|
|
|
#include "SkSGGeometryNode.h"
|
|
|
|
#include "SkPath.h"
|
|
#include "SkRect.h"
|
|
#include "SkRRect.h"
|
|
|
|
class SkCanvas;
|
|
class SkPaint;
|
|
|
|
namespace sksg {
|
|
|
|
/**
|
|
* Concrete Geometry node, wrapping an SkRect.
|
|
*/
|
|
class Rect final : public GeometryNode {
|
|
public:
|
|
static sk_sp<Rect> Make() { return sk_sp<Rect>(new Rect(SkRect::MakeEmpty())); }
|
|
static sk_sp<Rect> Make(const SkRect& r) { return sk_sp<Rect>(new Rect(r)); }
|
|
|
|
SG_ATTRIBUTE(L, SkScalar, fRect.fLeft )
|
|
SG_ATTRIBUTE(T, SkScalar, fRect.fTop )
|
|
SG_ATTRIBUTE(R, SkScalar, fRect.fRight )
|
|
SG_ATTRIBUTE(B, SkScalar, fRect.fBottom)
|
|
|
|
SG_MAPPED_ATTRIBUTE(Direction , SkPath::Direction, fAttrContaier)
|
|
SG_MAPPED_ATTRIBUTE(InitialPointIndex, uint8_t , fAttrContaier)
|
|
|
|
protected:
|
|
void onClip(SkCanvas*, bool antiAlias) const override;
|
|
void onDraw(SkCanvas*, const SkPaint&) const override;
|
|
|
|
SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
|
|
SkPath onAsPath() const override;
|
|
|
|
private:
|
|
explicit Rect(const SkRect&);
|
|
|
|
SkRect fRect;
|
|
|
|
struct AttrContainer {
|
|
uint8_t fDirection : 1;
|
|
uint8_t fInitialPointIndex : 2;
|
|
|
|
SkPath::Direction getDirection() const {
|
|
return static_cast<SkPath::Direction>(fDirection);
|
|
}
|
|
void setDirection(SkPath::Direction dir) { fDirection = SkTo<uint8_t>(dir); }
|
|
|
|
uint8_t getInitialPointIndex() const { return fInitialPointIndex; }
|
|
void setInitialPointIndex(uint8_t idx) { fInitialPointIndex = idx; }
|
|
};
|
|
AttrContainer fAttrContaier = { SkPath::kCW_Direction, 0 };
|
|
|
|
using INHERITED = GeometryNode;
|
|
};
|
|
|
|
/**
|
|
* Concrete Geometry node, wrapping an SkRRect.
|
|
*/
|
|
class RRect final : public GeometryNode {
|
|
public:
|
|
static sk_sp<RRect> Make() { return sk_sp<RRect>(new RRect(SkRRect())); }
|
|
static sk_sp<RRect> Make(const SkRRect& rr) { return sk_sp<RRect>(new RRect(rr)); }
|
|
|
|
SG_ATTRIBUTE(RRect, SkRRect, fRRect)
|
|
|
|
SG_MAPPED_ATTRIBUTE(Direction , SkPath::Direction, fAttrContaier)
|
|
SG_MAPPED_ATTRIBUTE(InitialPointIndex, uint8_t , fAttrContaier)
|
|
|
|
protected:
|
|
void onClip(SkCanvas*, bool antiAlias) const override;
|
|
void onDraw(SkCanvas*, const SkPaint&) const override;
|
|
|
|
SkRect onRevalidate(InvalidationController*, const SkMatrix&) override;
|
|
SkPath onAsPath() const override;
|
|
|
|
private:
|
|
explicit RRect(const SkRRect&);
|
|
|
|
SkRRect fRRect;
|
|
|
|
struct AttrContainer {
|
|
uint8_t fDirection : 1;
|
|
uint8_t fInitialPointIndex : 2;
|
|
|
|
SkPath::Direction getDirection() const {
|
|
return static_cast<SkPath::Direction>(fDirection);
|
|
}
|
|
void setDirection(SkPath::Direction dir) { fDirection = SkTo<uint8_t>(dir); }
|
|
|
|
uint8_t getInitialPointIndex() const { return fInitialPointIndex; }
|
|
void setInitialPointIndex(uint8_t idx) { fInitialPointIndex = idx; }
|
|
};
|
|
AttrContainer fAttrContaier = { SkPath::kCW_Direction, 0 };
|
|
|
|
using INHERITED = GeometryNode;
|
|
};
|
|
|
|
} // namespace sksg
|
|
|
|
#endif // SkSGRect_DEFINED
|