commit 2f0edd5c9a9130566596413298a89a55f0328b9a
author Mike Reed <reed@google.com> Thu May 31 14:22:30 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 31 19:09:24 2018 +0000
tree afb10cbf2dd29df06362d63bc2e7643be6108bb5
parent c7ad40f76f6f23b3acd73b53e989220fd71f2da2

draw skottie in 3d

Bug: skia:
Change-Id: I6321da0d9f06b4d5637d2ce611e1c81cc75c0eb2
Reviewed-on: https://skia-review.googlesource.com/131113
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 36ab16c..0195b41 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1369,6 +1369,7 @@
       ":gpu_tool_utils",
       ":skia",
       ":tool_utils",
+      "modules/skottie",
       "modules/sksg",
     ]
   }

gm/3dgm.cpp

diff --git a/gm/3dgm.cpp b/gm/3dgm.cpp
index 37830ae..93c6f92 100644
--- a/gm/3dgm.cpp
+++ b/gm/3dgm.cpp
@@ -10,6 +10,19 @@
 #include "SkPath.h"
 #include "SkPoint3.h"
 
+#ifdef SK_ENABLE_SKOTTIE
+
+#include "SkAnimTimer.h"
+#include "Resources.h"
+#include "SkStream.h"
+#include "Skottie.h"
+
+static SkMatrix operator*(const SkMatrix& a, const SkMatrix& b) {
+    SkMatrix44 c;
+    c.setConcat(a, b);
+    return c;
+}
+
 class GM3d : public skiagm::GM {
     float   fNear = 0.5;
     float   fFar = 4;
@@ -19,15 +32,20 @@
     SkPoint3    fCOA {0,0,0};//{ 0.5f, 0.5f, 0.5f };
     SkPoint3    fUp  { 0, 1, 0 };
 
-    SkMatrix44  fMV;
-
     SkPoint3    fP3[8];
+
+    sk_sp<skottie::Animation> fAnim;
+    SkScalar fAnimT = 0;
+
 public:
-    GM3d() : fMV(SkMatrix44::kIdentity_Constructor) {}
+    GM3d() {}
     ~GM3d() override {}
 
 protected:
     void onOnceBeforeDraw() override {
+        auto stream = GetResourceAsStream("skotty/skotty_sample_2.json");
+        fAnim = skottie::Animation::Make(stream.get());
+
         int index = 0;
         for (float x = 0; x <= 1; ++x) {
             for (float y = 0; y <= 1; ++y) {
@@ -36,7 +54,6 @@
                 }
             }
         }
-        fMV.setIdentity();
     }
 
     static void draw_viewport(SkCanvas* canvas, const SkMatrix& viewport) {
@@ -53,10 +70,38 @@
         canvas->restore();
     }
 
+    static void draw_skia(SkCanvas* canvas, const SkMatrix44& m4, const SkMatrix& vp,
+                          skottie::Animation* anim) {
+        auto proc = [canvas, vp, anim](SkColor c, const SkMatrix44& m4) {
+            SkPaint p;
+            p.setColor(c);
+            SkRect r = { 0, 0, 1, 1 };
+            canvas->save();
+            canvas->concat(vp * SkMatrix(m4));
+            anim->render(canvas, &r);
+//            canvas->drawRect({0, 0, 1, 1}, p);
+            canvas->restore();
+        };
+
+        SkMatrix44 tmp(SkMatrix44::kIdentity_Constructor);
+
+        proc(0x400000FF, m4);
+        tmp.setTranslate(0, 0, 1);
+        proc(0xC00000FF, m4 * tmp);
+        tmp.setRotateAboutUnit(1, 0, 0, SK_ScalarPI/2);
+        proc(0x4000FF00, m4 * tmp);
+        tmp.postTranslate(0, 1, 0);
+        proc(0xC000FF00, m4 * tmp);
+        tmp.setRotateAboutUnit(0, 1, 0, -SK_ScalarPI/2);
+        proc(0x40FF0000, m4 * tmp);
+        tmp.postTranslate(1, 0, 0);
+        proc(0xC0FF0000, m4 * tmp);
+    }
+
     void onDraw(SkCanvas* canvas) override {
         SkMatrix44  camera(SkMatrix44::kIdentity_Constructor),
                     perspective(SkMatrix44::kIdentity_Constructor),
-                    mv = fMV;
+                    mv(SkMatrix44::kIdentity_Constructor);
         SkMatrix    viewport;
 
         {
@@ -118,13 +163,20 @@
                 canvas->drawText(&str[i-1], 1, dst[i].fX, dst[i].fY, paint);
             }
         }
+
+        fAnim->seek(fAnimT);
+        draw_skia(canvas, mv, viewport, fAnim.get());
     }
 
     SkISize onISize() override { return { 1024, 768 }; }
 
     SkString onShortName() override { return SkString("3dgm"); }
 
-    bool onAnimate(const SkAnimTimer&) override { return false; }
+    bool onAnimate(const SkAnimTimer& timer) override {
+        SkScalar dur = fAnim->duration();
+        fAnimT = fmod(timer.secs(), dur) / dur;
+        return true;
+    }
     bool onHandleKey(SkUnichar uni) override {
         switch (uni) {
             case 'a': fEye.fX += 0.125f; return true;
@@ -145,3 +197,6 @@
 };
 
 DEF_GM(return new GM3d;)
+
+#endif
+