Controller support for VrShell

chrome/browser/android/vr_shell/vr_controller_manager.cc

Index: chrome/browser/android/vr_shell/vr_controller_manager.cc
diff --git a/chrome/browser/android/vr_shell/vr_controller_manager.cc b/chrome/browser/android/vr_shell/vr_controller_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3e5d725f22862d57d09c4faea173b77e15da041f
--- /dev/null
+++ b/chrome/browser/android/vr_shell/vr_controller_manager.cc
@@ -0,0 +1,123 @@
+// 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 "base/logging.h"
+#include "chrome/browser/android/vr_shell/vr_controller_manager.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace vr_shell {
+
+VrControllerManager::VrControllerManager() {}
+
+VrControllerManager::~VrControllerManager() {}
+
+void VrControllerManager::OnResume() {
+  if (vr_controller_)
+    vr_controller_->OnResume();
+}
+
+void VrControllerManager::SetContentViewCore(
+    content::ContentViewCore* content_cvc_ptr,
+    content::ContentViewCore* ui_cvc_ptr) {
+  vr_content_ptr =
+      content::VrInputManager::FromContentViewCore(content_cvc_ptr);
+  vr_ui_ptr = content::VrInputManager::FromContentViewCore(ui_cvc_ptr);
+}
+
+void VrControllerManager::OnPause() {
+  if (vr_controller_)
+    vr_controller_->OnPause();
+}
+
+void VrControllerManager::Initialize(gvr_context_* gvr_context) {

[mthiesse, 2016/09/22 16:20:11]

gvr_context*

[asimjour, 2016/09/22 22:55:16]

Done.

+  vr_controller_.reset(new VrController(gvr_context));
+  vr_controller_->Initialize(gvr_context);
+}
+
+VrGesture VrControllerManager::Update() {
+  if (!vr_controller_)
+    return VrGesture();
+  vr_controller_->UpdateState();
+  VrGesture gesture = vr_controller_->DetectGesture();
+  return gesture;
+}
+
+void VrControllerManager::ProcessUpdatedGesture(VrGesture gesture) {
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI))
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&VrControllerManager::SendGesture, this, gesture,
+                   vr_content_ptr));
+  else
+    SendGesture(gesture, vr_content_ptr);
+}
+
+void VrControllerManager::ProcessUpdatedUIGesture(VrGesture gesture) {
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI))
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&VrControllerManager::SendGesture, this, gesture,
+                   vr_ui_ptr));
+  else
+    SendGesture(gesture, vr_ui_ptr);
+}
+
+void VrControllerManager::SendGesture(VrGesture gesture,
+                                      content::VrInputManager* vr_cvc_ptr) {
+  int64_t event_time = gesture.start_time;
+  long event_time_milliseconds = (long)(event_time / 1000000);
+
+  if (gesture.type == kGestureTypeScroll) {
+    vr_cvc_ptr->SendScrollEvent(
+        event_time_milliseconds, 0.0f, 0.0f, gesture.details.scroll.dx,
+        gesture.details.scroll.dy, gesture.details.scroll.state);
+  } else if (gesture.type == kGestureTypeButtonsChange) {
+    vr_cvc_ptr->SendClickEvent(event_time_milliseconds,
+                               gesture.details.buttons.x,
+                               gesture.details.buttons.y);
+  } else if (gesture.type == kGestureTypeAngularMove) {
+    vr_cvc_ptr->SendMouseMoveEvent(
+        event_time_milliseconds, gesture.details.move.x, gesture.details.move.y,
+        gesture.details.move.type);
+  }
+  return;
+}
+
+bool VrControllerManager::IsTouching() {
+  return vr_controller_->IsTouching();
+}
+
+float VrControllerManager::TouchPosX() {
+  return vr_controller_->TouchPosX();
+}
+
+float VrControllerManager::TouchPosY() {
+  return vr_controller_->TouchPosY();
+}
+
+const gvr::Quatf VrControllerManager::Orientation() {
+  return vr_controller_->Orientation();
+}
+
+bool VrControllerManager::IsTouchDown() {
+  return vr_controller_->IsTouchDown();
+}
+
+bool VrControllerManager::IsTouchUp() {
+  return vr_controller_->IsTouchUp();
+}
+
+bool VrControllerManager::ButtonDown(const int32_t button) {
+  return vr_controller_->ButtonDown(button);
+}
+
+bool VrControllerManager::ButtonUp(const int32_t button) {
+  return vr_controller_->ButtonUp(button);
+}
+
+bool VrControllerManager::IsConnected() {
+  return vr_controller_->IsConnected();
+}
+
+}  // namespace vr_shell