commit e50167091c264a26f6b6c89716c341d27e3cb55f
author Michael Ludwig <michaelludwig@google.com> Tue Mar 23 15:42:59 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 24 15:47:22 2021 +0000
tree 8385d921eeb2fe65fe736529ebb5ce50d263c435
parent 1546053269bb95a3fc1dd037dc62dd1e2247a7cd

Move Sk3Perspective and Sk3Lookat into SkM44

Sk3Perspective -> SkM44::Perspective
Sk3LookAt -> SkM44::LookAt

Also adds some SK_API tags to the SkV[2,3,4] structs. Also fixes
linkage issues around Sk3Perspective/LookAt by moving them into the
exported SkM44 (if we don't like them as SkM44 factories, will just need
to add SK_API tags to old Sk3Perspective/Lookat directly).

Change-Id: I3f125211b76899f216e63cc8d587776004516e36
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388476
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

samplecode/Sample3D.cpp

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 5bfb00c..575110a 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -86,8 +86,8 @@
 
 public:
     void concatCamera(SkCanvas* canvas, const SkRect& area, SkScalar zscale) {
-        SkM44 camera = Sk3LookAt(fEye, fCOA, fUp),
-              perspective = Sk3Perspective(fNear, fFar, fAngle),
+        SkM44 camera = SkM44::LookAt(fEye, fCOA, fUp),
+              perspective = SkM44::Perspective(fNear, fFar, fAngle),
               viewport = SkM44::Translate(area.centerX(), area.centerY(), 0) *
                          SkM44::Scale(area.width()*0.5f, area.height()*0.5f, zscale);
 

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 115071b..5b4a708 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -456,8 +456,8 @@
         SkScalar w = r.width();
         SkScalar h = r.height();
 
-        SkM44 camera = Sk3LookAt(fEye, fCOA, fUp),
-              perspective = Sk3Perspective(fNear, fFar, fAngle),
+        SkM44 camera = SkM44::LookAt(fEye, fCOA, fUp),
+              perspective = SkM44::Perspective(fNear, fFar, fAngle),
               translate = SkM44::Translate(fTrans.x, fTrans.y, fTrans.z),
               viewport = SkM44::Translate(r.centerX(), r.centerY(), 0) *
                          SkM44::Scale(w*0.5f, h*0.5f, 1);