diff options
| author |  Cary Clark <caryclark@skia.org> | 2017-10-18 11:46:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-18 16:09:46 +0000 |
| commit | e4442cb0b537720ab32106b3b5353dbb78f11b26 (patch) | |
| tree | c96d6669865bc85ef278a178d501bd60d29cc2eb /tests/Matrix44Test.cpp | |
| parent | b4379132d12cd11e52944331487b045f1f32989d (diff) | |
convert mapHomogeneousPoints to SkPoint3
SkMatrix::mapHomogeneousPoints takes an array of SkScalar,
but expects essentially SkPoint3, so make it so.
R: robertphillips@google.com, reed@google.com
Bug: skia:6898
Change-Id: Ibaf8b05c08b7df16c67d6a77d914667ace9a70da
Reviewed-on: https://skia-review.googlesource.com/58380
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/Matrix44Test.cpp')
| -rw-r--r-- | tests/Matrix44Test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp index 382cd2175f..6a42a44058 100644 --- a/tests/Matrix44Test.cpp +++ b/tests/Matrix44Test.cpp @@ -6,6 +6,7 @@ */ #include "SkMatrix44.h" +#include "SkPoint3.h" #include "Test.h" static bool nearly_equal_double(double a, double b) { @@ -554,17 +555,17 @@ static void test_3x3_conversion(skiatest::Reporter* reporter) { // Test that a point with a Z value of 0 is transformed the same way. SkScalar vec4[4] = { 2, 4, 0, 8 }; - SkScalar vec3[3] = { 2, 4, 8 }; + SkPoint3 vec3 = { 2, 4, 8 }; SkScalar vec4transformed[4]; - SkScalar vec3transformed[3]; + SkPoint3 vec3transformed; SkScalar vec4transformed2[4]; a44.mapScalars(vec4, vec4transformed); - a33.mapHomogeneousPoints(vec3transformed, vec3, 1); + a33.mapHomogeneousPoints(&vec3transformed, &vec3, 1); a44flattened.mapScalars(vec4, vec4transformed2); - REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[0], vec3transformed[0])); - REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[1], vec3transformed[1])); - REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[3], vec3transformed[2])); + REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[0], vec3transformed.fX)); + REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[1], vec3transformed.fY)); + REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[3], vec3transformed.fZ)); REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[0], vec4transformed2[0])); REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[1], vec4transformed2[1])); REPORTER_ASSERT(reporter, !nearly_equal_scalar(vec4transformed[2], vec4transformed2[2])); |