Pico v10 Preview 2

MozillaReality · Apr 17, 2020 · 9b36c14 · 9b36c14
1 parent 73707a7
commit 9b36c14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -49,7 +49,7 @@ android {
         minSdkVersion build_versions.min_sdk
         targetSdkVersion build_versions.target_sdk
         versionCode 1
-        versionName "10"
+        versionName "10-p2"
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
         buildConfigField "Boolean", "DISABLE_CRASH_RESTART", getCrashRestartDisabled()
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/picovr/cpp/DeviceDelegatePicoVR.cpp b/app/src/picovr/cpp/DeviceDelegatePicoVR.cpp
@@ -168,9 +168,9 @@ struct DeviceDelegatePicoVR::State {
       }
       auto& controller = controllers[i];
       device::CapabilityFlags flags = device::Orientation;
-      if (controller.is6DoF) {
+      //if (controller.is6DoF) {
         flags |= device::Position;
-      }
+      //}
       controllerDelegate->SetCapabilityFlags(i, flags);
       const bool appPressed = (controller.buttonsState & kButtonApp) > 0;
       const bool triggerPressed = (controller.buttonsState & kButtonTrigger) > 0;
@@ -231,12 +231,17 @@ struct DeviceDelegatePicoVR::State {
       }
 
       vrb::Matrix transform = controller.transform;
-      if ((renderMode == device::RenderMode::StandAlone) && (i != gazeIndex)) {
+      //if ((renderMode == device::RenderMode::StandAlone) && (i != gazeIndex)) {
+      if (i != gazeIndex) {
         if (type == k6DofHeadSet) {
-          transform.TranslateInPlace(headOffset);
+          if(renderMode == device::RenderMode::StandAlone) {
+            transform.TranslateInPlace(headOffset);
+          }
         } else {
           vrb::Matrix head = vrb::Matrix::Rotation(orientation);
-          head.PreMultiplyInPlace(vrb::Matrix::Position(headOffset));
+          if (renderMode == device::RenderMode::StandAlone) {
+            head.PreMultiplyInPlace(vrb::Matrix::Position(headOffset));
+          }
           transform = elbow->GetTransform(controller.hand, head, transform);
         }
       }
@@ -293,6 +298,8 @@ DeviceDelegatePicoVR::RegisterImmersiveDisplay(ImmersiveDisplayPtr aDisplay) {
           device::ImmersiveVRSession | device::InlineSession;
   if (m.type == k6DofHeadSet) {
     flags |= device::Position | device::StageParameters;
+  } else {
+    flags |= device::Position;
   }
   m.immersiveDisplay->SetSittingToStandingTransform(vrb::Matrix::Translation(kAverageSittingToStanding));
   m.immersiveDisplay->SetCapabilityFlags(flags);