VR: Refresh controller handedness when resuming the controller.

chrome/browser/android/vr_shell/elbow_model.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.
 
 // Adapted from:
 // https://github.com/googlevr/gvr-unity-sdk/blob/master/Samples/DaydreamLabsControllerPlayground/Assets/GoogleVR/Scripts/Controller/GvrArmModel.cs
 
 #include "chrome/browser/android/vr_shell/elbow_model.h"
 
 #include <cmath>
@@ skipping 14 matching lines @@
 constexpr gfx::Vector3dF kDefaultArmExtensionOffset = {-0.13f, 0.14f, -0.08f};
 constexpr float kMinExtensionAngle = 7.0f;
 constexpr float kMaxExtenstionAngle = 60.0f;
 constexpr float kExtensionWeight = 0.4f;
 constexpr float kDeltaAlpha = 3.0f;
 constexpr float kDefaultElbowRotationRatio = 0.4f;
 
 }  // namespace
 
 ElbowModel::ElbowModel(gvr::ControllerHandedness handedness)
-    : handedness_(handedness),
-      alpha_value_(1.0f),
-      torso_direction_{0.0f, 0.0f, 0.0f} {}
+    : alpha_value_(1.0f), torso_direction_{0.0f, 0.0f, 0.0f} {
+  UpdateHandedness(handedness);
+}
 
 ElbowModel::~ElbowModel() = default;
 
-void ElbowModel::UpdateHandedness() {
+void ElbowModel::UpdateHandedness(gvr::ControllerHandedness handedness) {
+  if (handedness == handedness_)

[acondor_, 2017/05/02 14:18:34]

We might need an invalid default handedness value so this is always false on
construction.

[mthiesse, 2017/05/02 15:23:37]

Done.

+    return;
+  handedness_ = handedness;
   handed_multiplier_ = {
       handedness_ == GVR_CONTROLLER_RIGHT_HANDED ? 1.0f : -1.0f, 1.0f, 1.0f};
   shoulder_rotation_ = kNoRotation;
   shoulder_position_ =
       vr::ScalePoint(kDefaultShoulderRight, handed_multiplier_);
 }
 
 void ElbowModel::Update(const UpdateData& update) {
-  UpdateHandedness();
   UpdateTorsoDirection(update);
   ApplyArmModel(update);
   UpdateTransparency(update);
 }
 
 void ElbowModel::UpdateTorsoDirection(const UpdateData& update) {
   auto head_direction = update.head_direction;
   head_direction.set_y(0);
   vr::NormalizeVector(&head_direction);
 
@@ skipping 72 matching lines @@
 void ElbowModel::UpdateTransparency(const UpdateData& update) {
   float distance_to_face = vr::ToVector(wrist_position_).Length();
   float alpha_change = kDeltaAlpha * update.delta_time_seconds;
   alpha_value_ = vr::Clampf(distance_to_face < kFadeDistanceFromFace
                                 ? alpha_value_ - alpha_change
                                 : alpha_value_ + alpha_change,
                             0.0f, 1.0f);
 }
 
 }  // namespace vr_shell