[Pico] Add an OS version check

app/src/aosp/java/com/igalia/wolvic/PlatformSystemCheck.java

@@ -0,0 +1,10 @@
+package com.igalia.wolvic;
+
+public class PlatformSystemCheck extends SystemCheck {
+
+ @Override
+ public boolean isOSVersionCompatible() { return true; }
+
+ @Override
+ public String minSupportedVersion() { return ""; }
+}

app/src/common/shared/com/igalia/wolvic/SystemCheck.java

@@ -0,0 +1,24 @@
+package com.igalia.wolvic;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public abstract class SystemCheck {
+ public abstract boolean isOSVersionCompatible();
+ public abstract String minSupportedVersion();
+
+ protected String getSystemProperty(String key) {
+ String value = null;
+ try {
+ Process process = Runtime.getRuntime().exec("getprop " + key);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ value = reader.readLine();
+ reader.close();
+ process.waitFor();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
+ }
+ return value;
+ }
+}

app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java

@@ -196,9 +196,6 @@ public void run() {
  static final long RESET_CRASH_COUNT_DELAY = 5000;
  static final int UPDATE_NATIVE_WIDGETS_DELAY = 50; // milliseconds
 
- // Passthrough was enabled on Pico version 5.7.1, via XR_FB_passthrough extension
- static final String kPicoVersionPassthroughUpdate = "5.7.1";
-
  static final String LOGTAG = SystemUtils.createLogtag(VRBrowserActivity.class);
  ConcurrentHashMap<Integer, Widget> mWidgets;
  private int mWidgetHandleIndex = 1;
@@ -2015,8 +2012,7 @@ public boolean isPassthroughEnabled() {
  }
  @Override
  public boolean isPassthroughSupported() {
- return DeviceType.isOculusBuild() || DeviceType.isLynx() || DeviceType.isSnapdragonSpaces() ||
- (DeviceType.isPicoXR() && Build.ID.compareTo(kPicoVersionPassthroughUpdate) >= 0);
+ return DeviceType.isOculusBuild() || DeviceType.isLynx() || DeviceType.isSnapdragonSpaces() || DeviceType.isPicoXR();
  }
 
  @Override

app/src/common/shared/com/igalia/wolvic/VersionCheckActivity.java

@@ -14,17 +14,14 @@
 import java.util.Properties;
 
 public class VersionCheckActivity extends Activity {
- private static final String META_OS_VERSION = "ro.vros.build.version";
- private static final int MIN_META_OS_VERSION_WITH_KHR_LOADER = 62;
- static final String LOGTAG = SystemUtils.createLogtag(VersionCheckActivity.class);
- private int minSupportedVersion = 0;
  private boolean browserActivityStarted = false;
+ private PlatformSystemCheck platformSystemCheck = new PlatformSystemCheck();
 
  @Override
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
 
- if (isOSVersionCompatible()) {
+ if (platformSystemCheck.isOSVersionCompatible()) {
  Intent receivedIntent = getIntent();
  Bundle extras = receivedIntent.getExtras();
 
@@ -49,40 +46,11 @@ protected void onDestroy() {
  System.exit(0);
  }
 
- private static String getSystemProperty(String key) {
- String value = null;
- try {
- Process process = Runtime.getRuntime().exec("getprop " + key);
- BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
- value = reader.readLine();
- reader.close();
- process.waitFor();
- } catch (IOException | InterruptedException e) {
- e.printStackTrace();
- }
- return value;
- }
-
- private boolean isOSVersionCompatible() {
- if (BuildConfig.FLAVOR_platform.equals("oculusvr")) {
- minSupportedVersion = MIN_META_OS_VERSION_WITH_KHR_LOADER;
- String osVersion = getSystemProperty(META_OS_VERSION);
- Log.i(LOGTAG, "Checking that OS version is at least " + minSupportedVersion + " (found " + osVersion + ")");
- try {
- if (osVersion == null || Integer.parseInt(osVersion) < MIN_META_OS_VERSION_WITH_KHR_LOADER)
- return false;
- } catch (NumberFormatException e) {
- Log.e(LOGTAG, "Failed to parse OS version: " + osVersion);
- return false;
- }
- }
- return true;
- }
 
  private void showIncompatibleOSDialog() {
  new AlertDialog.Builder(this)
  .setTitle(R.string.incompatible_os_version_title)
- .setMessage(getString(R.string.incompatible_os_version_message, minSupportedVersion))
+ .setMessage(getString(R.string.incompatible_os_version_message, platformSystemCheck.minSupportedVersion()))
  .setOnDismissListener((dialog) -> finish())
  .setPositiveButton("OK", (dialog, which) -> dialog.dismiss())
  .setIcon(android.R.drawable.ic_dialog_alert)

app/src/hvr/java/com/igalia/wolvic/PlatformSystemCheck.java

@@ -0,0 +1,10 @@
+package com.igalia.wolvic;
+
+public class PlatformSystemCheck extends SystemCheck {
+
+ @Override
+ public boolean isOSVersionCompatible() { return true; }
+
+ @Override
+ public String minSupportedVersion() { return ""; }
+}

app/src/lynx/java/com/igalia/wolvic/PlatformSystemCheck.java

@@ -0,0 +1,10 @@
+package com.igalia.wolvic;
+
+public class PlatformSystemCheck extends SystemCheck {
+
+ @Override
+ public boolean isOSVersionCompatible() { return true; }
+
+ @Override
+ public String minSupportedVersion() { return ""; }
+}

app/src/main/cpp/HandMeshRenderer.cpp

@@ -38,75 +38,6 @@ vrb::RenderStatePtr GetHandMeshDefaultRenderState(vrb::CreationContextPtr create
  return state;
 }
 
-// HandMeshRendererSpheres
-
-struct HandMeshSpheres {
- vrb::TogglePtr toggle;
- std::vector<vrb::TransformPtr> sphereTransforms;
-};
-
-struct HandMeshRendererSpheres::State {
- std::vector<HandMeshSpheres> handMeshState;
-};
-
-HandMeshRendererSpheres::HandMeshRendererSpheres(State& aState, vrb::CreationContextPtr& aContext)
- : m(aState) {
- context = aContext;
-}
-
-HandMeshRendererPtr HandMeshRendererSpheres::Create(vrb::CreationContextPtr& aContext) {
- return std::make_unique<vrb::ConcreteClass<HandMeshRendererSpheres, HandMeshRendererSpheres::State> >(aContext);
-}
-
-void HandMeshRendererSpheres::Update(const uint32_t aControllerIndex, const std::vector<vrb::Matrix>& handJointTransforms,
- const vrb::GroupPtr& aRoot, HandMeshBufferPtr& buffer, const bool aEnabled, const bool leftHanded) {
- assert(!buffer);
-
- if (aControllerIndex >= m.handMeshState.size())
- m.handMeshState.resize(aControllerIndex + 1);
- auto& handMesh = m.handMeshState.at(aControllerIndex);
-
- // We need to call ToggleAll() even if aEnabled is false, to be able to hide the
- // hand mesh.
- if (handMesh.toggle)
- handMesh.toggle->ToggleAll(aEnabled);
-
- if (!aEnabled)
- return;
-
- // Lazily create toggle and spheres' geometry and transform nodes.
- if (!handMesh.toggle) {
- vrb::CreationContextPtr create = context.lock();
- handMesh.toggle = vrb::Toggle::Create(create);
-
- assert(handJointTransforms.size() > 0);
-
- auto state = GetHandMeshDefaultRenderState(create);
-
- float radius = 0.65;
- vrb::GeometryPtr sphere = DeviceUtils::GetSphereGeometry(create, 36, radius);
- sphere->SetRenderState(state);
-
- handMesh.sphereTransforms.resize(handJointTransforms.size());
- for (uint32_t i = 0; i < handMesh.sphereTransforms.size(); i++) {
- vrb::TransformPtr transform = vrb::Transform::Create(create);
- transform->AddNode(sphere);
- handMesh.toggle->AddNode(transform);
- handMesh.sphereTransforms[i] = transform;
- }
- }
-
- // Check that the toggle node has been added to the scene graph
- std::vector<vrb::GroupPtr> parents;
- handMesh.toggle->GetParents(parents);
- if (parents.size() == 0)
- aRoot->AddNode(handMesh.toggle);
-
- assert(handMesh.sphereTransforms.size() == handJointTransforms.size());
- for (int i = 0; i < handMesh.sphereTransforms.size(); i++)
- handMesh.sphereTransforms[i]->SetTransform(handJointTransforms[i]);
-}
-
 // HandMeshRendererGeometry
 
 struct HandMeshGeometry {

app/src/main/cpp/HandMeshRenderer.h

@@ -35,21 +35,6 @@ class HandMeshRenderer {
 };
 
 
-// HandMeshRendererSpheres
-
-class HandMeshRendererSpheres: public HandMeshRenderer {
-protected:
- struct State;
- State& m;
- HandMeshRendererSpheres(State&, vrb::CreationContextPtr&);
-public:
- static HandMeshRendererPtr Create(vrb::CreationContextPtr&);
-private:
- void Update(const uint32_t aControllerIndex, const std::vector<vrb::Matrix>& handJointTransforms,
- const vrb::GroupPtr& aRoot, HandMeshBufferPtr& aBuffer, const bool aEnabled, const bool leftHanded) override;
-};
-
-
 // HandMeshRendererSkinned
 
 struct HandMeshSkinned;

app/src/main/res/values/strings.xml

@@ -2567,6 +2567,6 @@ the Select` button. When clicked it closes all the previously selected tabs -->
 
  <!-- Shown when starting the application if the OS version is not compatible -->
  <string name="incompatible_os_version_title">Incompatible OS Version</string>
- <string name="incompatible_os_version_message">Your OS version is not supported. This version of Wolvic requires at least version %1$d</string>
+ <string name="incompatible_os_version_message">Your OS version is not supported. This version of Wolvic requires at least version %1$s</string>
 
 </resources>

app/src/noapi/java/com/igalia/wolvic/PlatformSystemCheck.java

@@ -0,0 +1,10 @@
+package com.igalia.wolvic;
+
+public class PlatformSystemCheck extends SystemCheck {
+
+ @Override
+ public boolean isOSVersionCompatible() { return true; }
+
+ @Override
+ public String minSupportedVersion() { return ""; }
+}

app/src/oculusvr/java/com/igalia/wolvic/PlatformSystemCheck.java

@@ -0,0 +1,30 @@
+package com.igalia.wolvic;
+
+import android.util.Log;
+
+import com.igalia.wolvic.utils.SystemUtils;
+
+public class PlatformSystemCheck extends SystemCheck {
+ private static final String META_OS_VERSION = "ro.vros.build.version";
+ private static final int MIN_META_OS_VERSION_WITH_KHR_LOADER = 62;
+ private static final String LOGTAG = SystemUtils.createLogtag(PlatformSystemCheck.class);
+
+ @Override
+ public boolean isOSVersionCompatible() {
+ String osVersion = getSystemProperty(META_OS_VERSION);
+ Log.i(LOGTAG, "Checking that OS version is at least " + MIN_META_OS_VERSION_WITH_KHR_LOADER + " (found " + osVersion + ")");
+ try {
+ if (osVersion == null || Integer.parseInt(osVersion) < MIN_META_OS_VERSION_WITH_KHR_LOADER)
+ return false;
+ } catch (NumberFormatException e) {
+ Log.e(LOGTAG, "Failed to parse OS version: " + osVersion);
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String minSupportedVersion() {
+ return String.valueOf(MIN_META_OS_VERSION_WITH_KHR_LOADER);
+ }
+}

app/src/openxr/cpp/DeviceDelegateOpenXR.cpp

@@ -1672,13 +1672,6 @@ DeviceDelegateOpenXR::EnterVR(const crow::BrowserEGLContext& aEGLContext) {
  if (m.handMeshProperties) {
  m.handMeshRenderer = HandMeshRendererGeometry::Create(create);
  m.input->SetHandMeshBufferSizes(m.handMeshProperties->indexCount, m.handMeshProperties->vertexCount);
- } else {
-#if defined(PICOXR)
- // Due to unreliable hand-tracking orientation data on Pico devices running system
- // versions earlier than 5.7.1, we use the Spheres strategy.
- if (CompareBuildIdString(kPicoVersionHandTrackingUpdate))
- m.handMeshRenderer = HandMeshRendererSpheres::Create(create);
-#endif
  }
 
  if (!m.handMeshRenderer)

app/src/openxr/cpp/OpenXRGestureManager.cpp

@@ -29,11 +29,6 @@ OpenXRGestureManager::handFacesHead(const vrb::Matrix &hand, const vrb::Matrix &
  // For the hand we take the Y axis because that corresponds to head's Z axis when
  // the hand is in upright position facing head (the gesture we want to detect).
  auto handDirection = hand.MultiplyDirection({0, 1, 0}).Normalize();
-#ifdef PICOXR
- // Axis are inverted in Pico system versions prior to 5.7.1
- if (CompareBuildIdString(kPicoVersionHandTrackingUpdate))
- handDirection = hand.MultiplyDirection({0, 0, -1});
-#endif
  auto headDirection = head.MultiplyDirection({0, 0, -1}).Normalize();
 
  // First check that vector directions align

app/src/openxr/cpp/OpenXRHelpers.h

@@ -20,14 +20,6 @@ namespace crow {
  const vrb::Vector kAverageHeight(0.0f, 1.7f, 0.0f);
 #endif
 
-// Hand tracking was thoroughly updated on Pico version 5.7.1
-static const std::string kPicoVersionHandTrackingUpdate = "5.7.1";
-
-inline bool CompareBuildIdString(const std::string str) {
- char buildId[128];
- return CompareSemanticVersionStrings(GetBuildIdString(buildId), str);
-}
-
 inline std::string GetXrVersionString(XrVersion ver) {
  return Fmt("%d.%d.%d", XR_VERSION_MAJOR(ver), XR_VERSION_MINOR(ver), XR_VERSION_PATCH(ver));
 }

app/src/openxr/cpp/OpenXRInputSource.cpp

@@ -633,21 +633,6 @@ OpenXRInputSource::PopulateHandJointLocations(device::RenderMode renderMode, std
  jointTransforms[i] = transform;
  jointRadii[i] = mHandJoints[i].radius;
  }
-#if defined(PICOXR)
- // Scale joints according to their radius (for rendering). This is currently only
- // relevant on Pico with system version earlier than 5.7.1, where we are using spheres
- // to render the hands instead of a proper hand model due to incorrect joint orientation.
- if (CompareBuildIdString(kPicoVersionHandTrackingUpdate)) {
- for (int i = 0; i < mHandJoints.size(); i++) {
- if (IsHandJointPositionValid((XrHandJointEXT) i, mHandJoints)) {
- float radius = mHandJoints[i].radius;
- vrb::Matrix scale = vrb::Matrix::Identity().ScaleInPlace(
- vrb::Vector(radius, radius, radius));
- jointTransforms[i].PostMultiplyInPlace(scale);
- }
- }
- }
-#endif
 }
 
 void OpenXRInputSource::EmulateControllerFromHand(device::RenderMode renderMode, XrTime predictedDisplayTime, const vrb::Matrix& head, const vrb::Matrix& handJointForAim, DeviceDelegate::PointerMode pointerMode, bool usingEyeTracking, ControllerDelegate& delegate)
@@ -717,14 +702,6 @@ void OpenXRInputSource::EmulateControllerFromHand(device::RenderMode renderMode,
  correctionAngle);
  pointerTransform = pointerTransform.PostMultiply(correctionMatrix);
  }
-#elif defined(PICOXR)
- // On Pico, this only affects system versions earlier than 5.7.1
- if (CompareBuildIdString(kPicoVersionHandTrackingUpdate)) {
- float correctionAngle = -M_PI_2;
- pointerTransform
- .PostMultiplyInPlace(vrb::Matrix::Rotation(vrb::Vector(0.0, 1.0, 0.0),correctionAngle)
- .PostMultiply(vrb::Matrix::Rotation(vrb::Vector(0.0, 0.0, 1.0), correctionAngle)));
- }
 #endif
 
  device::CapabilityFlags flags = device::Orientation | device::Position;

app/src/openxr/cpp/OpenXRLayers.h

@@ -189,14 +189,6 @@ class OpenXRLayerBase : public OpenXRLayer {
  info.width = width;
  info.height = height;
  bool shouldZeroInitialize = aSurfaceType == VRLayerSurface::SurfaceType::AndroidSurface;
-#if defined(PICOXR)
- // Circumvent a bug in the pico OpenXR runtime in versions below 5.4.0.
- char buildId[128] = {0};
- if (CompareSemanticVersionStrings(GetBuildIdString(buildId), "5.4.0")) {
- // System version is < 5.4.0
- shouldZeroInitialize = false;
- }
-#endif
  if (shouldZeroInitialize) {
  // These members must be zero
  // See https://www.khronos.org/registry/OpenXR/specs/1.0/man/html/xrCreateSwapchainAndroidSurfaceKHR.html#XR_KHR_android_surface_swapchain

app/src/picoxr/AndroidManifest.xml

@@ -10,8 +10,8 @@
  <application android:requestLegacyExternalStorage="true">
  <activity android:name=".VRBrowserActivity">
  <meta-data android:name="android.app.lib_name" android:value="native-lib" />
+ <meta-data android:name="pvr.app.type" android:value="vr" />
  </activity>
- <meta-data android:name="pvr.app.type" android:value="vr" />
  <meta-data android:name="handtracking" android:value="1" />
  <meta-data android:name="picovr.software.eye_tracking" android:value="true" />
  </application>