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

chrome/browser/android/vr_shell/vr_controller.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_VR_CONTROLLER_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "chrome/browser/android/vr_shell/vr_controller_model.h"
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
+#include "device/vr/vr_types.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 
 namespace gvr {
 class ControllerState;
 }
@@ skipping 21 matching lines @@
   void UpdateState();
 
   std::vector<std::unique_ptr<WebGestureEvent>> DetectGestures();
 
   bool IsTouching();
 
   float TouchPosX();
 
   float TouchPosY();
 
-  gvr::Quatf Orientation() const;
+  vr::Quatf Orientation() const;
 
-  gvr::Mat4f GetTransform() const;
+  void GetTransform(vr::Matf* out) const;

[cjgrant, 2017/04/11 13:44:40]

Why not continue to return?

[mthiesse, 2017/04/11 14:46:43]

As discussed offline, for consistency we're always taking matrices as
parameters. It allows optimizations for some functions. Also gvr used a struct
with an internal c-style array so that it could be returned from functions. If
we ever changed our matrix type to c-style arrays as well we wouldn't be able to
return them from functions.

 
   VrControllerModel::State GetModelState() const;
 
   bool TouchDownHappened();
 
   bool TouchUpHappened();
 
   bool ButtonUpHappened(gvr::ControllerButton button);
   bool ButtonDownHappened(gvr::ControllerButton button);
   bool ButtonState(gvr::ControllerButton button) const;
 
   bool IsConnected();
 
  private:
   enum GestureDetectorState {
     WAITING,   // waiting for user to touch down
     TOUCHING,  // touching the touch pad but not scrolling
     SCROLLING  // scrolling on the touch pad
   };
 
   struct TouchPoint {
-    gvr::Vec2f position;
+    gfx::Vector2dF position;
     int64_t timestamp;
   };
 
   struct TouchInfo {
     TouchPoint touch_point;
     bool touch_up;
     bool touch_down;
     bool is_touching;
   };
 
@@ skipping 14 matching lines @@
 
   // Handle the detecting state.
   void HandleDetectingState(WebGestureEvent* gesture);
 
   // Handle the scrolling state.
   void HandleScrollingState(WebGestureEvent* gesture);
   void UpdateTouchInfo();
 
   // Returns true if the touch position is within the slop of the initial touch
   // point, false otherwise.
-  bool InSlop(const gvr::Vec2f touch_position);
+  bool InSlop(const gfx::Vector2dF touch_position);
 
   // Returns true if the gesture is in horizontal direction.
   bool IsHorizontalGesture();
 
   void Reset();
 
   void UpdateGestureParameters();
 
   // If the user is touching the touch pad and the touch point is different from
   // before, update the touch point and return true. Otherwise, return false.
@@ skipping 23 matching lines @@
   // A pointer storing the touch point from previous frame.
   std::unique_ptr<TouchPoint> prev_touch_point_;
 
   // A pointer storing the touch point from current frame.
   std::unique_ptr<TouchPoint> cur_touch_point_;
 
   // Initial touch point.
   std::unique_ptr<TouchPoint> init_touch_point_;
 
   // Overall velocity
-  gvr::Vec2f overall_velocity_;
+  gfx::Vector2dF overall_velocity_;
 
   // Last velocity that is used for fling and direction detection
-  gvr::Vec2f last_velocity_;
+  gfx::Vector2dF last_velocity_;
 
   // Displacement of the touch point from the previews to the current touch
-  gvr::Vec2f displacement_;
+  gfx::Vector2dF displacement_;
 
   int64_t last_touch_timestamp_ = 0;
   int64_t last_timestamp_nanos_ = 0;
 
   // Number of consecutively extrapolated touch points
   int extrapolated_touch_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(VrController);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_