mark all exerimental (3d) apis as such
Bug: skia:9768
Change-Id: I10d8d3507df15ad45d827d2210d5bf2250ac1aaf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264778
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index abeadf6..43b53f4 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -756,7 +756,7 @@
*/
int saveLayer(const SaveLayerRec& layerRec);
- int saveCamera(const SkMatrix44& projection, const SkMatrix44& camera);
+ int experimental_saveCamera(const SkMatrix44& projection, const SkMatrix44& camera);
/** Removes changes to SkMatrix and clip since SkCanvas state was
last saved. The state is removed from the stack.
@@ -880,8 +880,8 @@
*/
void concat(const SkMatrix& matrix);
- void concat(const SkMatrix44&);
- void concat44(const SkScalar[]); // column-major
+ void experimental_concat(const SkMatrix44&);
+ void experimental_concat44(const SkScalar[]); // column-major
/** Replaces SkMatrix with matrix.
Unlike concat(), any prior matrix state is overwritten.
@@ -2508,9 +2508,9 @@
*/
SkMatrix getTotalMatrix() const;
- SkM44 getLocalToDevice() const; // entire matrix stack
- SkM44 getLocalToWorld() const; // up to but not including top-most camera, else localToDevice
- SkM44 getLocalToCamera() const; // top-most camera, else localToDevice
+ SkM44 experimental_getLocalToDevice() const; // entire matrix stack
+ SkM44 experimental_getLocalToWorld() const; // up to but not including top-most camera
+ SkM44 experimental_getLocalToCamera() const; // up to and including top-most camera
///////////////////////////////////////////////////////////////////////////
diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 828cf99..df3fab1 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -57,7 +57,7 @@
viewport.setScale(area.width()*0.5f, area.height()*0.5f, zscale)
.postTranslate(area.centerX(), area.centerY(), 0);
- canvas->saveCamera(viewport * perspective, camera * inv(viewport));
+ canvas->experimental_saveCamera(viewport * perspective, camera * inv(viewport));
}
bool onChar(SkUnichar uni) override {
@@ -150,7 +150,7 @@
static SkV3 normalize(SkV3 v) { return v * (1.0f / v.length()); }
static SkColorMatrix comput_planar_lighting(SkCanvas* canvas, SkV3 lightDir) {
- SkM44 l2w = canvas->getLocalToWorld();
+ SkM44 l2w = canvas->experimental_getLocalToWorld();
auto normal = normalize(l2w * SkV3{0, 0, 1});
float dot = -normal * lightDir;
@@ -229,12 +229,12 @@
canvas->concat(trans * fRot * m * inv(trans));
- if (!front(canvas->getLocalToDevice())) {
+ if (!front(canvas->experimental_getLocalToDevice())) {
return;
}
SkPaint paint;
- paint.setAlphaf(front(canvas->getLocalToDevice()) ? 1 : 0.25f);
+ paint.setAlphaf(front(canvas->experimental_getLocalToDevice()) ? 1 : 0.25f);
paint.setShader(fShader);
SkColorMatrix cm = comput_planar_lighting(canvas, fLight.getDir());
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index cc46277..3f49f0c 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -733,7 +733,7 @@
this->internalSave();
}
-int SkCanvas::saveCamera(const SkMatrix44& projection, const SkMatrix44& camera) {
+int SkCanvas::experimental_saveCamera(const SkMatrix44& projection, const SkMatrix44& camera) {
// TODO: add a virtual for this, and update clients (e.g. chrome)
int n = this->save();
this->concat(projection * camera);
@@ -1504,7 +1504,7 @@
this->didConcat(matrix);
}
-void SkCanvas::concat44(const SkScalar m[16]) {
+void SkCanvas::experimental_concat44(const SkScalar m[16]) {
this->checkForDeferredSave();
fMCRec->fMatrix.preConcat16(m);
@@ -1516,8 +1516,8 @@
this->didConcat44(m);
}
-void SkCanvas::concat(const SkMatrix44& m) {
- this->concat44(m.values());
+void SkCanvas::experimental_concat(const SkMatrix44& m) {
+ this->experimental_concat44(m.values());
}
void SkCanvas::internalSetMatrix(const SkMatrix& matrix) {
@@ -1822,25 +1822,25 @@
return fMCRec->fMatrix;
}
-SkM44 SkCanvas::getLocalToDevice() const {
+SkM44 SkCanvas::experimental_getLocalToDevice() const {
return fMCRec->fMatrix;
}
-SkM44 SkCanvas::getLocalToWorld() const {
+SkM44 SkCanvas::experimental_getLocalToWorld() const {
if (fCameraStack.empty()) {
- return this->getLocalToDevice();
+ return this->experimental_getLocalToDevice();
} else {
const auto& top = fCameraStack.back();
- return top.fInvPostCamera * this->getLocalToDevice();
+ return top.fInvPostCamera * this->experimental_getLocalToDevice();
}
}
-SkM44 SkCanvas::getLocalToCamera() const {
+SkM44 SkCanvas::experimental_getLocalToCamera() const {
if (fCameraStack.empty()) {
- return this->getLocalToDevice();
+ return this->experimental_getLocalToDevice();
} else {
const auto& top = fCameraStack.back();
- return top.fCamera * top.fInvPostCamera * this->getLocalToDevice();
+ return top.fCamera * top.fInvPostCamera * this->experimental_getLocalToDevice();
}
}
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 3150498..6592495 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -177,7 +177,7 @@
case CONCAT44: {
const SkScalar* colMaj = reader->skipT<SkScalar>(16);
BREAK_ON_READ_ERROR(reader);
- canvas->concat44(colMaj);
+ canvas->experimental_concat44(colMaj);
SkMatrix44 m;
m.setColMajor(colMaj);
diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp
index a3e998a..7b8b0bb 100644
--- a/src/core/SkRecordDraw.cpp
+++ b/src/core/SkRecordDraw.cpp
@@ -93,7 +93,7 @@
}
DRAW(SetMatrix, setMatrix(SkMatrix::Concat(fInitialCTM, r.matrix)));
-DRAW(Concat44, concat44(r.matrix.asColMajor()));
+DRAW(Concat44, experimental_concat44(r.matrix.asColMajor()));
DRAW(Concat, concat(r.matrix));
DRAW(Translate, translate(r.dx, r.dy));
DRAW(Scale, scale(r.sx, r.sy));
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index bdd9b72..3d3af61 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -95,7 +95,7 @@
void SkNWayCanvas::didConcat44(const SkScalar m[16]) {
Iter iter(fList);
while (iter.next()) {
- iter->concat44(m);
+ iter->experimental_concat44(m);
}
}