commit 3ef77ddf9ec435d781cf65f40b08df3b86b414c6
author Mike Reed <reed@google.com> Mon Apr 06 10:41:09 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 06 15:34:17 2020 +0000
tree 60c46d324cdcb90a945fad8b338e97cda303c779
parent 6d3bc2951dd61e25752a7370b56880222517654e

clean up public m44 and camera api

saveCamera() is no longer experimental

In a separate CL, will stage changes to concat virtual to take M44.

Change-Id: Iaf37ce2f24ab1223c54aeb1e79eaebf18f87fece
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281589
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/Sample3D.cpp

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 16e22cc..d8a6150 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -90,7 +90,7 @@
 
         // want "world" to be in our big coordinates (e.g. area), so apply this inverse
         // as part of our "camera".
-        canvas->experimental_saveCamera(viewport * perspective, camera * inv(viewport));
+        canvas->saveCamera(viewport * perspective, camera * inv(viewport));
     }
 };
 
@@ -289,7 +289,7 @@
                 SkM44 trans = SkM44::Translate(200, 200, 0);   // center of the rotation
                 SkM44 m = fRotateAnimator.rotation() * fRotation * f.asM44(200);
 
-                canvas->concat44(trans * m * inv(trans));
+                canvas->concat(trans * m * inv(trans));
                 this->drawContent(canvas, f.fColor, index++, drawFront);
             }
         }

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 4f4ff25..a7c8e78 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -527,7 +527,7 @@
 
         if (fShowUnclipped) {
             canvas->save();
-            canvas->concat44(mx);
+            canvas->concat(mx);
             paint.setAlphaf(0.33f);
             canvas->drawPath(fPath, paint);
             paint.setAlphaf(1.f);
@@ -542,7 +542,7 @@
             planeColor = SK_ColorRED;
         }
         canvas->save();
-        canvas->concat44(mx);
+        canvas->concat(mx);
         canvas->drawPath(*path, paint);
         canvas->restore();
 
@@ -585,7 +585,7 @@
         SkPaint paint;
 
         canvas->save();
-        canvas->concat44(this->get44({0, 0, 300, 300}));
+        canvas->concat(this->get44({0, 0, 300, 300}));
 
         const SkPoint* tex = nullptr;
         const SkColor* col = nullptr;