Move temporary MathUtil wrappers to permanent home in gfx::Transform

cc/math_util_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/math_util.h"
 
 #include <cmath>
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 TEST(MathUtilTest, verifyBackfaceVisibilityBasicCases)
 {
     gfx::Transform transform;
 
     transform.MakeIdentity();
-    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
+    EXPECT_FALSE(transform.IsBackFaceVisible());
 
     transform.MakeIdentity();
     MathUtil::rotateEulerAngles(&transform, 0, 80, 0);
-    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
+    EXPECT_FALSE(transform.IsBackFaceVisible());
 
     transform.MakeIdentity();
     MathUtil::rotateEulerAngles(&transform, 0, 100, 0);
-    EXPECT_TRUE(MathUtil::isBackFaceVisible(transform));
+    EXPECT_TRUE(transform.IsBackFaceVisible());
 
     // Edge case, 90 degree rotation should return false.
     transform.MakeIdentity();
     MathUtil::rotateEulerAngles(&transform, 0, 90, 0);
-    EXPECT_FALSE(MathUtil::isBackFaceVisible(transform));
+    EXPECT_FALSE(transform.IsBackFaceVisible());
 }
 
 TEST(MathUtilTest, verifyBackfaceVisibilityForPerspective)
 {
     gfx::Transform layerSpaceToProjectionPlane;
 
-    // This tests if isBackFaceVisible works properly under perspective transforms.
+    // This tests if IsBackFaceVisible works properly under perspective transforms.
     // Specifically, layers that may have their back face visible in orthographic
     // projection, may not actually have back face visible under perspective projection.
 
     // Case 1: Layer is rotated by slightly more than 90 degrees, at the center of the
     //         prespective projection. In this case, the layer's back-side is visible to
     //         the camera.
     layerSpaceToProjectionPlane.MakeIdentity();
     layerSpaceToProjectionPlane.ApplyPerspectiveDepth(1);
     layerSpaceToProjectionPlane.Translate3d(0, 0, 0);
     MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 100, 0);
-    EXPECT_TRUE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
+    EXPECT_TRUE(layerSpaceToProjectionPlane.IsBackFaceVisible());
 
     // Case 2: Layer is rotated by slightly more than 90 degrees, but shifted off to the
     //         side of the camera. Because of the wide field-of-view, the layer's front
     //         side is still visible.
     //
     //                       |<-- front side of layer is visible to perspective camera
     //                    \  |            /
     //                     \ |           /
     //                      \|          /
     //                       |         /
     //                       |\       /<-- camera field of view
     //                       | \     /
     // back side of layer -->|  \   /
     //                           \./ <-- camera origin
     //
     layerSpaceToProjectionPlane.MakeIdentity();
     layerSpaceToProjectionPlane.ApplyPerspectiveDepth(1);
     layerSpaceToProjectionPlane.Translate3d(-10, 0, 0);
     MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 100, 0);
-    EXPECT_FALSE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
+    EXPECT_FALSE(layerSpaceToProjectionPlane.IsBackFaceVisible());
 
     // Case 3: Additionally rotating the layer by 180 degrees should of course show the
     //         opposite result of case 2.
     MathUtil::rotateEulerAngles(&layerSpaceToProjectionPlane, 0, 180, 0);
-    EXPECT_TRUE(MathUtil::isBackFaceVisible(layerSpaceToProjectionPlane));
+    EXPECT_TRUE(layerSpaceToProjectionPlane.IsBackFaceVisible());
 }
 
 TEST(MathUtilTest, verifyProjectionOfPerpendicularPlane)
 {
     // In this case, the m33() element of the transform becomes zero, which could cause a
     // divide-by-zero when projecting points/quads.
 
     gfx::Transform transform;
     transform.MakeIdentity();
     transform.matrix().setDouble(2, 2, 0);
@@ skipping 635 matching lines @@
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForAlignedAxes)
 {
     gfx::Transform A;
 
     // Check rotation about z-axis
     A.MakeIdentity();
-    MathUtil::rotateAxisAngle(&A, 0, 0, 1, 90);
+    A.RotateAboutZAxis(90);

[danakj, 2012/11/28 20:52:17]

I think you should duplicate this test with RotateAbout(), as now that function
is only tested with 1,1,1 and 0,0,0

     EXPECT_ROW1_NEAR(0, -1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 1, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about x-axis
     A.MakeIdentity();
-    MathUtil::rotateAxisAngle(&A, 1, 0, 0, 90);
+    A.RotateAboutXAxis(90);
     EXPECT_ROW1_EQ(1, 0, 0, 0, A);
     EXPECT_ROW2_NEAR(0, 0, -1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_NEAR(0, 1, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Check rotation about y-axis.
     // Note carefully, the expected pattern is inverted compared to rotating about x axis or z axis.
     A.MakeIdentity();
-    MathUtil::rotateAxisAngle(&A, 0, 1, 0, 90);
+    A.RotateAboutYAxis(90);
     EXPECT_ROW1_NEAR(0, 0, 1, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_EQ(0, 1, 0, 0, A);
     EXPECT_ROW3_NEAR(-1, 0, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 
     // Verify that rotate3d(axis, angle) post-multiplies the existing matrix.
     A.MakeIdentity();
     A.Scale3d(6, 7, 8);
-    MathUtil::rotateAxisAngle(&A, 0, 0, 1, 90);
+    A.RotateAboutZAxis(90);
     EXPECT_ROW1_NEAR(0, -6, 0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(7, 0,  0, 0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_EQ(0, 0, 8, 0, A);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForArbitraryAxis)
 {
     // Check rotation about an arbitrary non-axis-aligned vector.
     gfx::Transform A;
-    MathUtil::rotateAxisAngle(&A, 1, 1, 1, 90);
+    A.RotateAbout(gfx::Vector3dF(1, 1, 1), 90);
     EXPECT_ROW1_NEAR(0.3333333333333334258519187,
                      -0.2440169358562924717404030,
                      0.9106836025229592124219380,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW2_NEAR(0.9106836025229592124219380,
                      0.3333333333333334258519187,
                      -0.2440169358562924717404030,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW3_NEAR(-0.2440169358562924717404030,
                      0.9106836025229592124219380,
                      0.3333333333333334258519187,
                      0, A, ERROR_THRESHOLD);
     EXPECT_ROW4_EQ(0, 0, 0, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyRotateAxisAngleForDegenerateAxis)
 {
     // Check rotation about a degenerate zero vector.
     // It is expected to skip applying the rotation.
     gfx::Transform A;
 
-    MathUtil::rotateAxisAngle(&A, 0, 0, 0, 45);
+    A.RotateAbout(gfx::Vector3dF(0, 0, 0), 45);

[danakj, 2012/11/28 20:42:59]

I guess in my previous comment, I was also wondering why we need these tests,
and this API for arbitrary axis values at all? Since there's no users of it
except these tests.

[danakj, 2012/11/28 20:52:17]

To answer my own question, I see this being used in transform interpolation in
ui/gfx.

     // Verify that A remains unchanged.
     EXPECT_TRUE(A.IsIdentity());
 
     initializeTestMatrix(&A);
-    MathUtil::rotateAxisAngle(&A, 0, 0, 0, 35);
+    A.RotateAbout(gfx::Vector3dF(0, 0, 0), 35);
 
     // Verify that A remains unchanged.
     EXPECT_ROW1_EQ(10, 14, 18, 22, A);
     EXPECT_ROW2_EQ(11, 15, 19, 23, A);
     EXPECT_ROW3_EQ(12, 16, 20, 24, A);
     EXPECT_ROW4_EQ(13, 17, 21, 25, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifySkewX)
 {
@@ skipping 51 matching lines @@
     EXPECT_ROW1_EQ(1, 0, -2, 2, A);
     EXPECT_ROW2_EQ(0, 1, -3, 3, A);
     EXPECT_ROW3_EQ(0, 0, -3, 4, A);
     EXPECT_ROW4_EQ(0, 0, -1, 1, A);
 }
 
 TEST(MathUtilGfxTransformTest, verifyHasPerspective)
 {
     gfx::Transform A;
     A.ApplyPerspectiveDepth(1);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 
     A.MakeIdentity();
     A.ApplyPerspectiveDepth(0);
-    EXPECT_FALSE(MathUtil::hasPerspective(A));
+    EXPECT_FALSE(A.HasPerspective());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 0, -1);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 1, -1);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 2, -0.3);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 3, 0.5);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 3, 0);
-    EXPECT_TRUE(MathUtil::hasPerspective(A));
+    EXPECT_TRUE(A.HasPerspective());
 }
 
 TEST(MathUtilGfxTransformTest, verifyIsInvertible)
 {
     gfx::Transform A;
 
     // Translations, rotations, scales, skews and arbitrary combinations of them are invertible.
     A.MakeIdentity();
     EXPECT_TRUE(A.IsInvertible());
 
@@ skipping 119 matching lines @@
     A.MakeIdentity();
     A.matrix().setDouble(3, 3, 2);
     EXPECT_FALSE(A.IsIdentity());
 }
 
 TEST(MathUtilGfxTransformTest, verifyIsIdentityOrTranslation)
 {
     gfx::Transform A;
 
     initializeTestMatrix(&A);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
-    EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_TRUE(A.IsIdentityOrTranslation());
 
-    // Modifying any non-translation components should cause isIdentityOrTranslation() to
+    // Modifying any non-translation components should cause IsIdentityOrTranslation() to
     // return false. NOTE: (0, 3), (1, 3), and (2, 3) are the translation components, so
-    // modifying them should still return true for isIdentityOrTranslation().
+    // modifying them should still return true.
     A.MakeIdentity();
     A.matrix().setDouble(0, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(1, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(2, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
-    A.matrix().setDouble(0, 0, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    A.matrix().setDouble(0, 1, 2);
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(1, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(2, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 1, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(0, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(1, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(2, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 2, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
 
     // Note carefully - expecting true here.
     A.MakeIdentity();
     A.matrix().setDouble(0, 3, 2);
-    EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_TRUE(A.IsIdentityOrTranslation());
 
     // Note carefully - expecting true here.
     A.MakeIdentity();
     A.matrix().setDouble(1, 3, 2);
-    EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_TRUE(A.IsIdentityOrTranslation());
 
     // Note carefully - expecting true here.
     A.MakeIdentity();
     A.matrix().setDouble(2, 3, 2);
-    EXPECT_TRUE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_TRUE(A.IsIdentityOrTranslation());
 
     A.MakeIdentity();
     A.matrix().setDouble(3, 3, 2);
-    EXPECT_FALSE(MathUtil::isIdentityOrTranslation(A));
+    EXPECT_FALSE(A.IsIdentityOrTranslation());
+}
+
+TEST(MathUtilGfxTransformTest, verifyIsScaleOrTranslation)
+{
+    gfx::Transform A;
+
+    initializeTestMatrix(&A);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    // Modifying any non-scale or non-translation components should cause
+    // IsScaleOrTranslation() to return false. (0, 0), (1, 1), (2, 2), (0, 3),
+    // (1, 3), and (2, 3) are the scale and translation components, so
+    // modifying them should still return true.
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(0, 0, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(1, 0, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(2, 0, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(3, 0, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(0, 1, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(1, 1, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(2, 1, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(3, 1, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(0, 2, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(1, 2, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(2, 2, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(3, 2, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(0, 3, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(1, 3, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    // Note carefully - expecting true here.
+    A.MakeIdentity();
+    A.matrix().setDouble(2, 3, 2);
+    EXPECT_TRUE(A.IsScaleOrTranslation());
+
+    A.MakeIdentity();
+    A.matrix().setDouble(3, 3, 2);
+    EXPECT_FALSE(A.IsScaleOrTranslation());
 }
 
 }  // namespace
 }  // namespace cc