diff options
author | Ruiqi Mao <ruiqimao@google.com> | 2018-06-29 14:32:21 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-29 19:34:28 +0000 |
commit | f510149da8d32f60f08d0a809eb037496079af3c (patch) | |
tree | 13b3670a481f3bae652968165d04f9ca4890d9bf /src/core/SkColorSpaceXformCanvas.cpp | |
parent | 38f118a2e7f986b06d69d0af41ec2d1af53dac39 (diff) |
skeletal animation support added to API and software backend
SkCanvas::drawVertices now supports overloads that take an array of bone deformation matrices.
SkVertices::MakeCopy and SkVertices::Builder now support two additional optional attributes, boneIndices and boneWeights.
Bug: skia:
Change-Id: I30a3b11691e7cdb13924907cc1401ff86d127aea
Reviewed-on: https://skia-review.googlesource.com/137221
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
Diffstat (limited to 'src/core/SkColorSpaceXformCanvas.cpp')
-rw-r--r-- | src/core/SkColorSpaceXformCanvas.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/SkColorSpaceXformCanvas.cpp b/src/core/SkColorSpaceXformCanvas.cpp index 3ef4d6d00d..caf07fb5d9 100644 --- a/src/core/SkColorSpaceXformCanvas.cpp +++ b/src/core/SkColorSpaceXformCanvas.cpp @@ -90,8 +90,8 @@ public: const SkPaint& paint) override { fTarget->drawPoints(mode, count, pts, fXformer->apply(paint)); } - void onDrawVerticesObject(const SkVertices* vertices, SkBlendMode mode, - const SkPaint& paint) override { + void onDrawVerticesObject(const SkVertices* vertices, const SkMatrix* bones, int boneCount, + SkBlendMode mode, const SkPaint& paint) override { sk_sp<SkVertices> copy; if (vertices->hasColors()) { int count = vertices->vertexCount(); @@ -99,11 +99,12 @@ public: fXformer->apply(xformed.begin(), vertices->colors(), count); copy = SkVertices::MakeCopy(vertices->mode(), count, vertices->positions(), vertices->texCoords(), xformed.begin(), + vertices->boneIndices(), vertices->boneWeights(), vertices->indexCount(), vertices->indices()); vertices = copy.get(); } - fTarget->drawVertices(vertices, mode, fXformer->apply(paint)); + fTarget->drawVertices(vertices, bones, boneCount, mode, fXformer->apply(paint)); } void onDrawText(const void* ptr, size_t len, |