Add helper SkMatrix44::hasPerspective()
BUG=skia:1017
R=danakj@chromium.org, reed@google.com
Author: tomhudson@google.com
Review URL: https://codereview.chromium.org/513343002
diff --git a/include/utils/SkMatrix44.h b/include/utils/SkMatrix44.h
index 26247a0..83b5443 100644
--- a/include/utils/SkMatrix44.h
+++ b/include/utils/SkMatrix44.h
@@ -198,6 +198,10 @@
return !(this->getType() & ~(kScale_Mask | kTranslate_Mask));
}
+ inline bool hasPerspective() const {
+ return SkToBool(this->getType() & kPerspective_Mask);
+ }
+
void setIdentity();
inline void reset() { this->setIdentity();}
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index 443086d..0bd4a8b 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -521,6 +521,35 @@
REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[3], vec4transformed2[3]));
}
+static void test_has_perspective(skiatest::Reporter* reporter) {
+ SkMatrix44 transform(SkMatrix44::kIdentity_Constructor);
+
+ transform.set(3, 2, -0.1);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+
+ transform.reset();
+ REPORTER_ASSERT(reporter, !transform.hasPerspective());
+
+ transform.set(3, 0, -1.0);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+
+ transform.reset();
+ transform.set(3, 1, -1.0);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+
+ transform.reset();
+ transform.set(3, 2, -0.3);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+
+ transform.reset();
+ transform.set(3, 3, 0.5);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+
+ transform.reset();
+ transform.set(3, 3, 0.0);
+ REPORTER_ASSERT(reporter, transform.hasPerspective());
+}
+
DEF_TEST(Matrix44, reporter) {
SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor);
@@ -626,4 +655,5 @@
test_scale(reporter);
test_map2(reporter);
test_3x3_conversion(reporter);
+ test_has_perspective(reporter);
}