aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Ruiqi Mao <ruiqimao@google.com>2018-07-03 21:18:07 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-03 21:18:18 +0000
commitc05aa7d163fd0b930fa450d2e4c7f2497f036254 (patch)
treed741730ca4b88ade1f73f4f2c20dec0ad1789464 /tools
parent5ffcb4d20e3f9798daa013f2b4d00bfb4a9a01da (diff)
Revert "added skeletal animation support to GPU backend"
This reverts commit b6307340e8a6a9d3a7517def7f5eaaadffd07d14. Reason for revert: patch/atlas failing in gold Original change's description: > added skeletal animation support to GPU backend > > added caching of SkVertices > > Docs-Preview: https://skia.org/?cl=138596 > Bug: skia: > Change-Id: Ia750f55f5f6d0de250d9e9c5619f4d1ac856f9f5 > Reviewed-on: https://skia-review.googlesource.com/138596 > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Ruiqi Mao <ruiqimao@google.com> TBR=robertphillips@google.com,brianosman@google.com,reed@google.com,ruiqimao@google.com Change-Id: Idfaf016a7ff4cdd8af2543d510706f489d04417a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/139281 Reviewed-by: Ruiqi Mao <ruiqimao@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/viewer/NIMASlide.cpp38
1 files changed, 17 insertions, 21 deletions
diff --git a/tools/viewer/NIMASlide.cpp b/tools/viewer/NIMASlide.cpp
index 25d023f67b..c13ff2f11d 100644
--- a/tools/viewer/NIMASlide.cpp
+++ b/tools/viewer/NIMASlide.cpp
@@ -62,7 +62,7 @@ public:
this->updateBones();
// Update the vertices object.
- this->updateVerticesObject(false, false);
+ this->updateVerticesObject(false);
}
void renderBackend(SkCanvas* canvas) {
@@ -70,13 +70,16 @@ public:
if (fRenderMode != kBackend_RenderMode) {
fRenderMode = kBackend_RenderMode;
this->updateVertices();
- this->updateVerticesObject(false, false);
+ this->updateVerticesObject(false);
}
+ canvas->save();
+
// Update the vertex data.
- if (fActorImage->doesAnimationVertexDeform()) {
+ if (fActorImage->doesAnimationVertexDeform() && fActorImage->isVertexDeformDirty()) {
this->updateVertices();
- this->updateVerticesObject(false, true);
+ this->updateVerticesObject(false);
+ fActorImage->isVertexDeformDirty(false);
}
// Update the bones.
@@ -84,6 +87,8 @@ public:
// Draw the vertices object.
this->drawVerticesObject(canvas, true);
+
+ canvas->restore();
}
void renderImmediate(SkCanvas* canvas) {
@@ -91,7 +96,7 @@ public:
if (fRenderMode != kImmediate_RenderMode) {
fRenderMode = kImmediate_RenderMode;
this->updateVertices();
- this->updateVerticesObject(true, true);
+ this->updateVerticesObject(true);
}
// Update the vertex data.
@@ -101,7 +106,7 @@ public:
}
// Update the vertices object.
- this->updateVerticesObject(true, true);
+ this->updateVerticesObject(true);
// Draw the vertices object.
this->drawVerticesObject(canvas, false);
@@ -193,7 +198,7 @@ private:
nima_to_skmatrix(fActorImage->worldTransform().values(), fBones[0]);
}
- void updateVerticesObject(bool applyDeforms, bool isVolatile) {
+ void updateVerticesObject(bool applyDeforms) {
std::vector<SkPoint>* positions = &fPositions;
// Apply deforms if requested.
@@ -224,8 +229,7 @@ private:
fBoneIdx.data(),
fBoneWgt.data(),
fIndices.size(),
- fIndices.data(),
- isVolatile);
+ fIndices.data());
}
void drawVerticesObject(SkCanvas* canvas, bool useBones) const {
@@ -417,19 +421,11 @@ NIMASlide::~NIMASlide() {}
void NIMASlide::draw(SkCanvas* canvas) {
canvas->save();
- for (int i = 0; i < 10; i ++) {
- for (int j = 0; j < 10; j ++) {
- canvas->save();
+ canvas->translate(500, 500);
+ canvas->scale(1, -1);
- canvas->translate(1250 - 250 * i, 1250 - 250 * j);
- canvas->scale(0.5, -0.5);
-
- // Render the actor.
- fActor->render(canvas, fRenderMode);
-
- canvas->restore();
- }
- }
+ // Render the actor.
+ fActor->render(canvas, fRenderMode);
canvas->restore();