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

chrome/browser/android/vr_shell/ui_elements.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/android/vr_shell/vr_math.h"
-#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
+#include "device/vr/vr_types.h"
 
 namespace vr_shell {
 
 class Animation;
 
 enum XAnchoring {
   XNONE = 0,
   XLEFT,
   XRIGHT,
 };
@@ skipping 17 matching lines @@
   // The element is filled with the content web site. Only one content element
   // may be added to the
   // scene.
   CONTENT = 4,
 };
 
 struct Transform {
   Transform();
 
   void MakeIdentity();
-  void Rotate(gvr::Quatf quat);
-  void Rotate(float ax, float ay, float az, float rad);
-  void Translate(float tx, float ty, float tz);
-  void Scale(float sx, float sy, float sz);
+  void Rotate(const vr::Quatf& quat);
+  void Rotate(const vr::RotationAxisAngle& axis_angle);
+  void Translate(const gfx::Vector3dF& translation);
+  void Scale(const gfx::Vector3dF& scale);
 
-  gvr::Mat4f to_world;
+  vr::Matf to_world;
 };
 
 class WorldRectangle {
  public:
-  const gvr::Mat4f& TransformMatrix() const;
+  const vr::Matf& TransformMatrix() const;
   Transform* mutable_transform() { return &transform_; }
 
-  gvr::Vec3f GetCenter() const;
-  gvr::Vec3f GetNormal() const;
+  gfx::Point3F GetCenter() const;
+  gfx::Vector3dF GetNormal() const;
 
   // Computes the distance from |ray_origin| to this rectangles's plane, along
   // |ray_vector|. Returns true and populates |distance| if the calculation is
   // possible, and false if the ray is parallel to the plane.
-  bool GetRayDistance(const gvr::Vec3f& ray_origin,
-                      const gvr::Vec3f& ray_vector,
+  bool GetRayDistance(const gfx::Point3F& ray_origin,
+                      const gfx::Vector3dF& ray_vector,
                       float* distance) const;
 
   // Projects a 3D world point onto the X and Y axes of the transformed
   // rectangle, returning 2D coordinates relative to the un-transformed unit
   // rectangle. This allows beam intersection points to be mapped to sprite
   // pixel coordinates. Points that fall onto the rectangle will generate X and
   // Y values on the interval [-0.5, 0.5].
-  gvr::Vec2f GetUnitRectangleCoordinates(const gvr::Vec3f& world_point);
+  gfx::PointF GetUnitRectangleCoordinates(const gfx::Point3F& world_point);
 
  private:
   Transform transform_;
 };
 
 struct ContentRectangle : public WorldRectangle {
   ContentRectangle();
   ~ContentRectangle();
 
   void Animate(int64_t time);
@@ skipping 18 matching lines @@
   bool visible = true;
 
   // If false, the reticle will not hit the element, even if visible.
   bool hit_testable = true;
 
   // If true, transformations will be applied relative to the field of view,
   // rather than the world.
   bool lock_to_fov = false;
 
   // Specifies the region (in pixels) of a texture to render.
-  Recti copy_rect = {0, 0, 0, 0};
+  gfx::Rect copy_rect = {0, 0, 0, 0};
 
   // The size of the object.  This does not affect children.
-  gvr::Vec3f size = {1.0f, 1.0f, 1.0f};
+  gfx::Vector3dF size = {1.0f, 1.0f, 1.0f};
 
   // The scale of the object, and its children.
-  gvr::Vec3f scale = {1.0f, 1.0f, 1.0f};
+  gfx::Vector3dF scale = {1.0f, 1.0f, 1.0f};
 
   // The rotation of the object, and its children.
-  RotationAxisAngle rotation = {1.0f, 0.0f, 0.0f, 0.0f};
+  vr::RotationAxisAngle rotation = {1.0f, 0.0f, 0.0f, 0.0f};
 
   // The translation of the object, and its children.  Translation is applied
   // after rotation and scaling.
-  gvr::Vec3f translation = {0.0f, 0.0f, 0.0f};
+  gfx::Vector3dF translation = {0.0f, 0.0f, 0.0f};
 
   // The opacity of the object (between 0.0 and 1.0).
   float opacity = 1.0f;
 
   // The computed opacity, incorporating opacity of parent objects.
   float computed_opacity;
 
   // The computed lock to the FoV, incorporating lock of parent objects.
   bool computed_lock_to_fov;
 
   // If anchoring is specified, the translation will be relative to the
   // specified edge(s) of the parent, rather than the center.  A parent object
   // must be specified when using anchoring.
   XAnchoring x_anchoring = XAnchoring::XNONE;
   YAnchoring y_anchoring = YAnchoring::YNONE;
 
   // Animations that affect the properties of the object over time.
   std::vector<std::unique_ptr<Animation>> animations;
 
   Fill fill = Fill::NONE;
 
-  Colorf edge_color = {1.0f, 1.0f, 1.0f, 1.0f};
-  Colorf center_color = {1.0f, 1.0f, 1.0f, 1.0f};
+  vr::Colorf edge_color = {1.0f, 1.0f, 1.0f, 1.0f};
+  vr::Colorf center_color = {1.0f, 1.0f, 1.0f, 1.0f};
 
   int gridline_count = 1;
 
   int draw_phase = 1;
 
   // This transform can be used by children to derive position of its parent.
   Transform inheritable_transform;
 
   // A flag usable during transformation calculates to avoid duplicate work.
   bool dirty;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentRectangle);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_