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

chrome/browser/android/vr_shell/vr_controller.cc

 // 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.
 
 #include "chrome/browser/android/vr_shell/vr_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "chrome/browser/android/vr_shell/vr_math.h"
+#include "device/vr/vr_math.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_controller.h"
 
 namespace vr_shell {
 
 namespace {
 
 constexpr float kDisplacementScaleFactor = 300.0f;
 
 // A slop represents a small rectangular region around the first touch point of
@@ skipping 10 matching lines @@
 // not equal. Also, minimum time distance needed to call two timestamps
 // not equal.
 constexpr float kDelta = 1.0e-7f;
 
 constexpr float kCutoffHz = 10.0f;
 constexpr float kRC = static_cast<float>(1.0 / (2.0 * M_PI * kCutoffHz));
 constexpr float kNanoSecondsPerSecond = 1.0e9f;
 
 constexpr int kMaxNumOfExtrapolations = 2;
 
-static constexpr gvr::Vec3f kControllerPosition = {0.2f, -0.5f, -0.15f};
+static constexpr gfx::Point3F kControllerPosition = {0.2f, -0.5f, -0.15f};
 
-class Vector {
- public:
-  static inline void ClampTouchpadPosition(gvr::Vec2f* position) {
-    position->x = std::min(std::max(0.0f, position->x), 1.0f);
-    position->y = std::min(std::max(0.0f, position->y), 1.0f);
-  }
-
-  static inline void SetZero(gvr::Vec2f* v) {
-    v->x = 0;
-    v->y = 0;
-  }
-
-  static inline gvr::Vec2f Subtract(gvr::Vec2f v1, gvr::Vec2f v2) {
-    gvr::Vec2f result;
-    result.x = v1.x - v2.x;
-    result.y = v1.y - v2.y;
-    return result;
-  }
-
-  static inline gvr::Vec2f Add(gvr::Vec2f v1, gvr::Vec2f v2) {
-    gvr::Vec2f result;
-    result.x = v1.x + v2.x;
-    result.y = v1.y + v2.y;
-    return result;
-  }
-
-  static inline bool Equal(const gvr::Vec2f v1, const gvr::Vec2f v2) {
-    return (std::abs(v1.x - v2.x) < kDelta) && (std::abs(v1.y - v2.y) < kDelta);
-  }
-
-  static inline gvr::Vec2f ScalarMult(gvr::Vec2f v, float scalar) {
-    gvr::Vec2f vect_prod;
-    vect_prod.x = v.x * scalar;
-    vect_prod.y = v.y * scalar;
-    return vect_prod;
-  }
-
-};  // Vector
+void ClampTouchpadPosition(gfx::Vector2dF* position) {
+  position->set_x(std::min(std::max(0.0f, position->x()), 1.0f));
+  position->set_y(std::min(std::max(0.0f, position->y()), 1.0f));
+}
 
 }  // namespace
 
 VrController::VrController(gvr_context* vr_context) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
   Initialize(vr_context);
   Reset();
 }
 
 VrController::~VrController() {
   DVLOG(1) << __FUNCTION__ << "=" << this;
 }
 
 void VrController::OnResume() {
   if (controller_api_)
     controller_api_->Resume();
 }
 
 void VrController::OnPause() {
   if (controller_api_)
     controller_api_->Pause();
 }
 
 device::GvrGamepadData VrController::GetGamepadData() {
   device::GvrGamepadData pad;
 
   pad.timestamp = controller_state_->GetLastOrientationTimestamp();
-  pad.touch_pos = controller_state_->GetTouchPos();
-  pad.orientation = controller_state_->GetOrientation();
+  pad.touch_pos.set_x(TouchPosX());
+  pad.touch_pos.set_y(TouchPosY());
+  pad.orientation = Orientation();
 
   // Use orientation to rotate acceleration/gyro into seated space.
-  gvr::Mat4f pose_mat = QuatToMatrix(pad.orientation);
-  pad.accel = MatrixVectorMul(pose_mat, controller_state_->GetAccel());
-  pad.gyro = MatrixVectorMul(pose_mat, controller_state_->GetGyro());
+  vr::Matf pose_mat;
+  vr::QuatToMatrix(pad.orientation, &pose_mat);
+  const gvr::Vec3f& accel = controller_state_->GetAccel();
+  const gvr::Vec3f& gyro = controller_state_->GetGyro();
+  pad.accel =
+      vr::MatrixVectorMul(pose_mat, gfx::Vector3dF(accel.x, accel.y, accel.z));
+  pad.gyro =
+      vr::MatrixVectorMul(pose_mat, gfx::Vector3dF(gyro.x, gyro.y, gyro.z));
 
   pad.is_touching = controller_state_->IsTouching();
   pad.controller_button_pressed =
       controller_state_->GetButtonState(GVR_CONTROLLER_BUTTON_CLICK);
   pad.right_handed = handedness_ == GVR_CONTROLLER_RIGHT_HANDED;
 
   return pad;
 }
 
 bool VrController::IsTouching() {
   return controller_state_->IsTouching();
 }
 
 float VrController::TouchPosX() {
   return controller_state_->GetTouchPos().x;
 }
 
 float VrController::TouchPosY() {
   return controller_state_->GetTouchPos().y;
 }
 
-gvr::Quatf VrController::Orientation() const {
-  return controller_state_->GetOrientation();
+vr::Quatf VrController::Orientation() const {
+  const gvr::Quatf& orientation = controller_state_->GetOrientation();
+  return *reinterpret_cast<vr::Quatf*>(const_cast<gvr::Quatf*>(&orientation));
 }
 
-gvr::Mat4f VrController::GetTransform() const {
+void VrController::GetTransform(vr::Matf* out) const {
   // TODO(acondor): Position and orientation needs to be obtained
   // from an elbow model.
   // Placing the controller in a fixed position for now.
-  gvr::Mat4f mat;
-  SetIdentityM(mat);
+  vr::SetIdentityM(out);
   // Changing rotation point.
-  TranslateM(mat, mat, 0, 0, 0.05);
-  mat = MatrixMul(QuatToMatrix(Orientation()), mat);
-  TranslateM(mat, mat, kControllerPosition.x, kControllerPosition.y,
-             kControllerPosition.z - 0.05);
-  return mat;
+  vr::TranslateM(*out, gfx::Vector3dF(0, 0, 0.05), out);
+  vr::Matf quat_to_matrix;
+  vr::QuatToMatrix(Orientation(), &quat_to_matrix);
+  vr::Matf copy = *out;
+  vr::MatrixMul(quat_to_matrix, copy, out);
+  gfx::Vector3dF translation(kControllerPosition.x(), kControllerPosition.y(),
+                             kControllerPosition.z() - 0.05);
+  vr::TranslateM(*out, translation, out);
 }
 
 VrControllerModel::State VrController::GetModelState() const {
   if (ButtonState(gvr::ControllerButton::GVR_CONTROLLER_BUTTON_CLICK))
     return VrControllerModel::TOUCHPAD;
   if (ButtonState(gvr::ControllerButton::GVR_CONTROLLER_BUTTON_APP))
     return VrControllerModel::APP;
   if (ButtonState(gvr::ControllerButton::GVR_CONTROLLER_BUTTON_HOME))
     return VrControllerModel::SYSTEM;
   return VrControllerModel::IDLE;
@@ skipping 34 matching lines @@
     VLOG(1) << "Controller Connection status: "
             << gvr_controller_connection_state_to_string(
                    controller_state_->GetConnectionState());
   }
 }
 
 void VrController::UpdateTouchInfo() {
   CHECK(touch_info_ != nullptr) << "touch_info_ not initialized properly.";
   if (IsTouching() && state_ == SCROLLING &&
       (controller_state_->GetLastTouchTimestamp() == last_touch_timestamp_ ||
-       (Vector::Equal(cur_touch_point_->position,
-                      prev_touch_point_->position) &&
+       (cur_touch_point_->position == prev_touch_point_->position &&
         extrapolated_touch_ < kMaxNumOfExtrapolations))) {
     extrapolated_touch_++;
     touch_position_changed_ = true;
     // Fill the touch_info
     float duration =
         (gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos -
          last_timestamp_nanos_) /
         kNanoSecondsPerSecond;
-    touch_info_->touch_point.position.x =
-        cur_touch_point_->position.x + overall_velocity_.x * duration;
-    touch_info_->touch_point.position.y =
-        cur_touch_point_->position.y + overall_velocity_.y * duration;
+    touch_info_->touch_point.position.set_x(cur_touch_point_->position.x() +
+                                            overall_velocity_.x() * duration);
+    touch_info_->touch_point.position.set_y(cur_touch_point_->position.y() +
+                                            overall_velocity_.y() * duration);
   } else {
     if (extrapolated_touch_ == kMaxNumOfExtrapolations) {
-      Vector::SetZero(&overall_velocity_);
+      overall_velocity_ = {0, 0};
     }
     extrapolated_touch_ = 0;
   }
   last_touch_timestamp_ = controller_state_->GetLastTouchTimestamp();
   last_timestamp_nanos_ =
       gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos;
 }
 
 void VrController::Initialize(gvr_context* gvr_context) {
   CHECK(gvr_context != nullptr) << "invalid gvr_context";
@@ skipping 36 matching lines @@
       ButtonUpHappened(gvr::kControllerButtonClick)) {
     gesture->setType(WebInputEvent::GestureTapDown);
     gesture->x = 0;
     gesture->y = 0;
   }
   gesture->sourceDevice = blink::WebGestureDeviceTouchpad;
   gesture_list.push_back(std::move(gesture));
 
   if (gesture_list.back()->type() == WebInputEvent::GestureScrollEnd) {
     if (!ButtonDownHappened(gvr::kControllerButtonClick) &&
-        (last_velocity_.x != 0.0 || last_velocity_.y != 0.0)) {
+        (last_velocity_.x() != 0.0 || last_velocity_.y() != 0.0)) {
       std::unique_ptr<WebGestureEvent> fling(new WebGestureEvent(
           WebInputEvent::GestureFlingStart, WebInputEvent::NoModifiers,
           gesture_list.back()->timeStampSeconds()));
       fling->sourceDevice = blink::WebGestureDeviceTouchpad;
       if (IsHorizontalGesture()) {
         fling->data.flingStart.velocityX =
-            last_velocity_.x * kDisplacementScaleFactor;
+            last_velocity_.x() * kDisplacementScaleFactor;
       } else {
         fling->data.flingStart.velocityY =
-            last_velocity_.y * kDisplacementScaleFactor;
+            last_velocity_.y() * kDisplacementScaleFactor;
       }
       gesture_list.push_back(std::move(fling));
     }
     Reset();
   }
 
   return gesture_list;
 }
 
 void VrController::UpdateGestureFromTouchInfo(WebGestureEvent* gesture) {
@@ skipping 42 matching lines @@
 
   // Touch position is changed, the touch point moves outside of slop,
   // and the Controller's button is not down.
   if (touch_position_changed_ && touch_info_->is_touching &&
       !InSlop(touch_info_->touch_point.position) &&
       !ButtonDownHappened(gvr::kControllerButtonClick)) {
     state_ = SCROLLING;
     gesture->setType(WebInputEvent::GestureScrollBegin);
     UpdateGestureParameters();
     gesture->data.scrollBegin.deltaXHint =
-        displacement_.x * kDisplacementScaleFactor;
+        displacement_.x() * kDisplacementScaleFactor;
     gesture->data.scrollBegin.deltaYHint =
-        displacement_.y * kDisplacementScaleFactor;
+        displacement_.y() * kDisplacementScaleFactor;
     gesture->data.scrollBegin.deltaHintUnits =
         blink::WebGestureEvent::ScrollUnits::PrecisePixels;
   }
 }
 
 void VrController::HandleScrollingState(WebGestureEvent* gesture) {
   if (touch_info_->touch_up || !(touch_info_->is_touching) ||
       ButtonDownHappened(gvr::kControllerButtonClick)) {
     // Gesture ends.
     gesture->setType(WebInputEvent::GestureScrollEnd);
     UpdateGestureParameters();
   } else if (touch_position_changed_) {
     // User continues scrolling and there is a change in touch position.
     gesture->setType(WebInputEvent::GestureScrollUpdate);
     UpdateGestureParameters();
     if (IsHorizontalGesture()) {
       gesture->data.scrollUpdate.deltaX =
-          displacement_.x * kDisplacementScaleFactor;
+          displacement_.x() * kDisplacementScaleFactor;
     } else {
       gesture->data.scrollUpdate.deltaY =
-          displacement_.y * kDisplacementScaleFactor;
+          displacement_.y() * kDisplacementScaleFactor;
     }
     last_velocity_ = overall_velocity_;
   }
 }
 
 bool VrController::IsHorizontalGesture() {
-  return std::abs(last_velocity_.x) > std::abs(last_velocity_.y);
+  return std::abs(last_velocity_.x()) > std::abs(last_velocity_.y());
 }
 
-bool VrController::InSlop(const gvr::Vec2f touch_position) {
-  return (std::abs(touch_position.x - init_touch_point_->position.x) <
+bool VrController::InSlop(const gfx::Vector2dF touch_position) {
+  return (std::abs(touch_position.x() - init_touch_point_->position.x()) <
           kSlopHorizontal) &&
-         (std::abs(touch_position.y - init_touch_point_->position.y) <
+         (std::abs(touch_position.y() - init_touch_point_->position.y()) <
           kSlopVertical);
 }
 
 void VrController::Reset() {
   // Reset state.
   state_ = WAITING;
 
   // Reset the pointers.
   prev_touch_point_.reset(new TouchPoint);
   cur_touch_point_.reset(new TouchPoint);
   init_touch_point_.reset(new TouchPoint);
   touch_info_.reset(new TouchInfo);
-  Vector::SetZero(&overall_velocity_);
-  Vector::SetZero(&last_velocity_);
+  overall_velocity_ = {0, 0};
+  last_velocity_ = {0, 0};
 }
 
 void VrController::UpdateGestureParameters() {
-  displacement_ = Vector::Subtract(touch_info_->touch_point.position,
-                                   prev_touch_point_->position);
+  displacement_ =
+      touch_info_->touch_point.position - prev_touch_point_->position;
 }
 
 bool VrController::UpdateCurrentTouchpoint() {
   touch_info_->touch_up = TouchUpHappened();
   touch_info_->touch_down = TouchDownHappened();
   touch_info_->is_touching = IsTouching();
-  touch_info_->touch_point.position.x = TouchPosX();
-  touch_info_->touch_point.position.y = TouchPosY();
-  Vector::ClampTouchpadPosition(&touch_info_->touch_point.position);
+  touch_info_->touch_point.position.set_x(TouchPosX());
+  touch_info_->touch_point.position.set_y(TouchPosY());
+  ClampTouchpadPosition(&touch_info_->touch_point.position);
   touch_info_->touch_point.timestamp =
       gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos;
 
   if (IsTouching() || TouchUpHappened()) {
     // Update the touch point when the touch position has changed.
-    if (!Vector::Equal(cur_touch_point_->position,
-                       touch_info_->touch_point.position)) {
+    if (cur_touch_point_->position != touch_info_->touch_point.position) {
       prev_touch_point_.swap(cur_touch_point_);
       cur_touch_point_.reset(new TouchPoint);
       cur_touch_point_->position = touch_info_->touch_point.position;
       cur_touch_point_->timestamp = touch_info_->touch_point.timestamp;
       return true;
     }
   }
   return false;
 }
 
 void VrController::UpdateOverallVelocity() {
   float duration =
       (touch_info_->touch_point.timestamp - prev_touch_point_->timestamp) /
       kNanoSecondsPerSecond;
 
   // If the timestamp does not change, do not update velocity.
   if (duration < kDelta)
     return;
 
-  gvr::Vec2f displacement = Vector::Subtract(touch_info_->touch_point.position,
-                                             prev_touch_point_->position);
+  const gfx::Vector2dF& displacement =
+      touch_info_->touch_point.position - prev_touch_point_->position;
 
-  gvr::Vec2f velocity = Vector::ScalarMult(displacement, 1 / duration);
+  const gfx::Vector2dF& velocity = ScaleVector2d(displacement, (1 / duration));
 
   float weight = duration / (kRC + duration);
 
-  overall_velocity_ =
-      Vector::Add(Vector::ScalarMult(overall_velocity_, 1 - weight),
-                  Vector::ScalarMult(velocity, weight));
+  overall_velocity_ = ScaleVector2d(overall_velocity_, (1 - weight)) +
+                      ScaleVector2d(velocity, weight);
 }
 
 }  // namespace vr_shell