Refactor VR math off of GVR types, onto gfx types where possible.

chrome/browser/android/vr_shell/ui_scene_unittest.cc

 // Copyright (c) 2016 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 "chrome/browser/android/vr_shell/ui_scene.h"
 
 #define _USE_MATH_DEFINES  // For M_PI in MSVC.
 #include <cmath>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/android/vr_shell/animation.h"
 #include "chrome/browser/android/vr_shell/easing.h"
 #include "chrome/browser/android/vr_shell/ui_elements.h"
-#include "chrome/browser/android/vr_shell/vr_math.h"
+#include "device/vr/vr_math.h"
+#include "device/vr/vr_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define TOLERANCE 0.0001
 
-#define EXPECT_VEC3F_NEAR(a, b)     \
-  EXPECT_NEAR(a.x, b.x, TOLERANCE); \
-  EXPECT_NEAR(a.y, b.y, TOLERANCE); \
-  EXPECT_NEAR(a.z, b.z, TOLERANCE);
+#define EXPECT_VEC3F_NEAR(a, b)         \
+  EXPECT_NEAR(a.x(), b.x(), TOLERANCE); \
+  EXPECT_NEAR(a.y(), b.y(), TOLERANCE); \
+  EXPECT_NEAR(a.z(), b.z(), TOLERANCE);
 
 namespace vr_shell {
 
 namespace {
 
 base::TimeTicks usToTicks(uint64_t us) {
   return base::TimeTicks::FromInternalValue(us);
 }
 
 base::TimeDelta usToDelta(uint64_t us) {
@@ skipping 89 matching lines @@
   element = base::MakeUnique<ContentRectangle>();
   element->id = 1;
   element->parent_id = 0;
   element->size = {1, 1, 1};
   element->scale = {2, 2, 1};
   element->rotation = {0, 0, 1, M_PI / 2};
   element->translation = {3, 0, 0};
   scene.AddUiElement(std::move(element));
   const ContentRectangle* child = scene.GetUiElementById(1);
 
-  const gvr::Vec3f origin({0, 0, 0});
-  const gvr::Vec3f point({1, 0, 0});
+  const gfx::Vector3dF origin(0, 0, 0);
+  const gfx::Vector3dF point(1, 0, 0);
 
   scene.UpdateTransforms(usToTicks(0));
-  auto new_origin = MatrixVectorMul(child->TransformMatrix(), origin);
-  auto new_point = MatrixVectorMul(child->TransformMatrix(), point);
-  EXPECT_VEC3F_NEAR(gvr::Vec3f({6, 10, 0}), new_origin);
-  EXPECT_VEC3F_NEAR(gvr::Vec3f({0, 10, 0}), new_point);
+  auto new_origin = vr::MatrixVectorMul(child->TransformMatrix(), origin);
+  auto new_point = vr::MatrixVectorMul(child->TransformMatrix(), point);
+  EXPECT_VEC3F_NEAR(gfx::Vector3dF(6, 10, 0), new_origin);
+  EXPECT_VEC3F_NEAR(gfx::Vector3dF(0, 10, 0), new_point);
 }
 
 TEST(UiScene, Opacity) {
   UiScene scene;
 
   auto element = base::MakeUnique<ContentRectangle>();
   element->id = 0;
   element->opacity = 0.5;
   scene.AddUiElement(std::move(element));
 
@@ skipping 49 matching lines @@
   // Add a child to the parent, with anchoring.
   element = base::MakeUnique<ContentRectangle>();
   element->id = 1;
   element->parent_id = 0;
   element->x_anchoring = GetParam().x_anchoring;
   element->y_anchoring = GetParam().y_anchoring;
   scene.AddUiElement(std::move(element));
 
   scene.UpdateTransforms(usToTicks(0));
   const ContentRectangle* child = scene.GetUiElementById(1);
-  EXPECT_NEAR(child->GetCenter().x, GetParam().expected_x, TOLERANCE);
-  EXPECT_NEAR(child->GetCenter().y, GetParam().expected_y, TOLERANCE);
+  EXPECT_NEAR(child->GetCenter().x(), GetParam().expected_x, TOLERANCE);
+  EXPECT_NEAR(child->GetCenter().y(), GetParam().expected_y, TOLERANCE);
   scene.RemoveUiElement(1);
 }
 
 const std::vector<AnchoringTestCase> anchoring_test_cases = {
     {XAnchoring::XNONE, YAnchoring::YNONE, 0, 0},
     {XAnchoring::XLEFT, YAnchoring::YNONE, -2, 0},
     {XAnchoring::XRIGHT, YAnchoring::YNONE, 2, 0},
     {XAnchoring::XNONE, YAnchoring::YTOP, 0, 2},
     {XAnchoring::XNONE, YAnchoring::YBOTTOM, 0, -2},
     {XAnchoring::XLEFT, YAnchoring::YTOP, -2, 2},
@@ skipping 47 matching lines @@
   EXPECT_EQ(element->id, 10);
   EXPECT_EQ(element->name, "abc");
   EXPECT_EQ(element->parent_id, 11);
   EXPECT_EQ(element->visible, false);
   EXPECT_EQ(element->hit_testable, false);
   EXPECT_EQ(element->fill, Fill::SPRITE);
   EXPECT_EQ(element->x_anchoring, XAnchoring::XLEFT);
   EXPECT_EQ(element->y_anchoring, YAnchoring::YTOP);
   EXPECT_FLOAT_EQ(element->opacity, 0.357);
 
-  EXPECT_EQ(element->copy_rect.x, 100);
-  EXPECT_EQ(element->copy_rect.y, 101);
-  EXPECT_EQ(element->copy_rect.width, 102);
-  EXPECT_EQ(element->copy_rect.height, 103);
+  EXPECT_EQ(element->copy_rect.x(), 100);
+  EXPECT_EQ(element->copy_rect.y(), 101);
+  EXPECT_EQ(element->copy_rect.width(), 102);
+  EXPECT_EQ(element->copy_rect.height(), 103);
 
-  EXPECT_FLOAT_EQ(element->size.x, 200);
-  EXPECT_FLOAT_EQ(element->size.y, 201);
-  EXPECT_FLOAT_EQ(element->size.z, 1);
+  EXPECT_FLOAT_EQ(element->size.x(), 200);
+  EXPECT_FLOAT_EQ(element->size.y(), 201);
+  EXPECT_FLOAT_EQ(element->size.z(), 1);
 
-  EXPECT_FLOAT_EQ(element->scale.x, 300);
-  EXPECT_FLOAT_EQ(element->scale.y, 301);
-  EXPECT_FLOAT_EQ(element->scale.z, 302);
+  EXPECT_FLOAT_EQ(element->scale.x(), 300);
+  EXPECT_FLOAT_EQ(element->scale.y(), 301);
+  EXPECT_FLOAT_EQ(element->scale.z(), 302);
 
   EXPECT_FLOAT_EQ(element->rotation.x, 400);
   EXPECT_FLOAT_EQ(element->rotation.y, 401);
   EXPECT_FLOAT_EQ(element->rotation.z, 402);
   EXPECT_FLOAT_EQ(element->rotation.angle, 403);
 
-  EXPECT_FLOAT_EQ(element->translation.x, 500);
-  EXPECT_FLOAT_EQ(element->translation.y, 501);
-  EXPECT_FLOAT_EQ(element->translation.z, 502);
+  EXPECT_FLOAT_EQ(element->translation.x(), 500);
+  EXPECT_FLOAT_EQ(element->translation.y(), 501);
+  EXPECT_FLOAT_EQ(element->translation.z(), 502);
 
   dict.Clear();
   dict.SetInteger("id", 12);
   dict.SetBoolean("lockToFov", true);
 
   scene.AddUiElementFromDict(dict);
   element = scene.GetUiElementById(12);
   EXPECT_NE(element, nullptr);
 
   EXPECT_EQ(element->id, 12);
@@ skipping 21 matching lines @@
   center_color.SetDouble("b", 0.7);
   center_color.SetDouble("a", 0.8);
 
   // Test SPRITE filling.
   dict.SetInteger("id", 9);
   dict.SetInteger("fillType", Fill::SPRITE);
   scene.AddUiElementFromDict(dict);
   const auto* element = scene.GetUiElementById(9);
 
   EXPECT_EQ(element->fill, Fill::SPRITE);
-  EXPECT_EQ(element->copy_rect.x, 1);
-  EXPECT_EQ(element->copy_rect.y, 2);
-  EXPECT_EQ(element->copy_rect.width, 3);
-  EXPECT_EQ(element->copy_rect.height, 4);
+  EXPECT_EQ(element->copy_rect.x(), 1);
+  EXPECT_EQ(element->copy_rect.y(), 2);
+  EXPECT_EQ(element->copy_rect.width(), 3);
+  EXPECT_EQ(element->copy_rect.height(), 4);
 
   // Test OPAQUE_GRADIENT filling.
   dict.Clear();
   dict.SetInteger("id", 10);
   dict.SetInteger("fillType", Fill::OPAQUE_GRADIENT);
   dict.Set("edgeColor", edge_color.DeepCopy());
   dict.Set("centerColor", center_color.DeepCopy());
   scene.AddUiElementFromDict(dict);
   element = scene.GetUiElementById(10);
 
@@ skipping 87 matching lines @@
   EXPECT_FLOAT_EQ(300, animation->from[0]);
   EXPECT_FLOAT_EQ(301, animation->from[1]);
   EXPECT_FLOAT_EQ(302, animation->from[2]);
   EXPECT_FLOAT_EQ(303, animation->from[3]);
 
   EXPECT_EQ(usToTicks(22345000), animation->start);
   EXPECT_EQ(usToDelta(54321000), animation->duration);
 }
 
 }  // namespace vr_shell