Implementation of elbow model for the controller position and rotation.

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/elbow_model.h"
 #include "chrome/browser/android/vr_shell/vr_controller_model.h"
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.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;
 }
 
 namespace vr_shell {
 
+// Angle (radians) the beam down from the controller axis, for wrist comfort.
+static constexpr float kErgoAngleOffset = 0.26f;

[asimjour1, 2017/04/19 18:58:12]

Why does it need to be static and outside of controller?

[acondor_, 2017/04/21 21:04:32]

Removed the static, but it's also used in VrShellGl to determine laser direction
and in vr_controller to displace the starting point of the beam.

+
 class VrController {
  public:
   // Controller API entry point.
   explicit VrController(gvr_context* gvr_context);
   ~VrController();
 
   // Must be called when the Activity gets OnResume().
   void OnResume();
 
   // Must be called when the Activity gets OnPause().
   void OnPause();
 
   // Must be called when the GL renderer gets OnSurfaceCreated().
   void Initialize(gvr_context* gvr_context);
 
   device::GvrGamepadData GetGamepadData();
 
   // Must be called when the GL renderer gets OnDrawFrame().
-  void UpdateState();
+  void UpdateState(const gvr::Vec3f& head_direction);
 
   std::vector<std::unique_ptr<WebGestureEvent>> DetectGestures();
 
   bool IsTouching();
 
   float TouchPosX();
 
   float TouchPosY();
 
   gvr::Quatf Orientation() const;
-
   gvr::Mat4f GetTransform() const;
+  float GetOpacity() const;
+  gvr::Vec3f GetPointerStart() const;
 
   VrControllerModel::State GetModelState() const;
 
   bool TouchDownHappened();
 
   bool TouchUpHappened();
 
   bool ButtonUpHappened(gvr::ControllerButton button);
   bool ButtonDownHappened(gvr::ControllerButton button);
   bool ButtonState(gvr::ControllerButton button) const;
@@ skipping 94 matching lines @@
 
   // Displacement of the touch point from the previews to the current touch
   gvr::Vec2f displacement_;
 
   int64_t last_touch_timestamp_ = 0;
   int64_t last_timestamp_nanos_ = 0;
 
   // Number of consecutively extrapolated touch points
   int extrapolated_touch_ = 0;
 
+  std::unique_ptr<ElbowModel> elbow_model_;
+
   DISALLOW_COPY_AND_ASSIGN(VrController);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_