Refactor VR Shell Input. Locks input to click/scroll targets.

chrome/browser/android/vr_shell/ui_elements/ui_element.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_UI_ELEMENT_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_UI_ELEMENT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 64 matching lines @@
   // possible, and false if the ray is parallel to the plane.
   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].
-  gfx::PointF GetUnitRectangleCoordinates(const gfx::Point3F& world_point);
+  gfx::PointF GetUnitRectangleCoordinates(
+      const gfx::Point3F& world_point) const;
 
  private:
   Transform transform_;
 };
 
 class UiElement : public WorldRectangle {
  public:
   UiElement();
   virtual ~UiElement();
 
   void Animate(const base::TimeTicks& time);
 
   // Indicates whether the element should be visually rendered.
   bool IsVisible() const;
 
   // Indicates whether the element should be tested for cursor input.
   bool IsHitTestable() const;
 
   virtual void Render(VrShellRenderer* renderer,
                       vr::Mat4f view_proj_matrix) const;
 
   virtual void Initialize();
 
   // Controller interaction methods.
-  virtual void OnHoverEnter();
+  virtual void OnHoverEnter(gfx::PointF position);
   virtual void OnHoverLeave();
-  virtual void OnButtonDown();
-  virtual void OnButtonUp();
+  virtual void OnMove(gfx::PointF position);
+  virtual void OnButtonDown(gfx::PointF position);
+  virtual void OnButtonUp(gfx::PointF position);
 
   int id() const { return id_; }
   void set_id(int id) { id_ = id; }
 
   // If a non-negative parent ID is specified, applicable transformations
   // are applied relative to the parent, rather than absolutely.
   int parent_id() const { return parent_id_; }
   void set_parent_id(int id) { parent_id_ = id; }
 
   // If true, this object will be visible.
@@ skipping 107 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;
 
   // The computed lock to the FoV, incorporating lock of parent objects.
-  bool computed_lock_to_fov_;
+  bool computed_lock_to_fov_ = false;
 
   // The size of the object.  This does not affect children.
   gfx::Vector3dF size_ = {1.0f, 1.0f, 1.0f};
 
   // The scale of the object, and its children.
   gfx::Vector3dF scale_ = {1.0f, 1.0f, 1.0f};
 
   // The rotation of the object, and its children.
   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.
   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_;
+  float computed_opacity_ = 1.0f;
 
   // 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;
 
   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_;
+  bool dirty_ = false;
 
   Transform transform_;
 
   DISALLOW_COPY_AND_ASSIGN(UiElement);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_UI_ELEMENT_H_