1d - XRI simulator for desktop testing, CI build without HVR, docs: physics hands skipped

.github/workflows/test_and_build.yml

@@ -10,31 +10,79 @@ env:
   HVRversion: 'v2.9.3.a-Unity-6'
 
 jobs:
-  #########
-  # DEV COMPILE WITHOUT HVR #
-  #########
-  testCompileWithoutHVR:
-    name: Compile test without HVR installation
+  ##########################
+  # BUILD WITHOUT HVR (XRI) #
+  ##########################
+  # Builds the VR targets without the private HVR repo and without GOTHIC_HVR_INSTALLED. The DeveloperConfig
+  # still requests the Hvr backend; VRContextBootstrap falls back to the Xri backend (XR Interaction Toolkit) when
+  # HVR isn't compiled in. Same label as the HVR build, or "pipeline-test-build-xri" for this job only.
+  buildWithoutHVR:
+    if: ${{ github.event.label.name == 'pipeline-test-build' || github.event.label.name == 'pipeline-test-build-xri' }}
+    name: Build Gothic without HVR (Xri backend)
     runs-on: ubuntu-latest
-    # disabled - Let's re-enable once we implement Flat implementation.
-    if: false && github.event.pull_request.draft == false
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - targetPlatform: StandaloneWindows64
+            targetDevice: Windows64
+          - targetPlatform: Android
+            targetDevice: Pico
+          - targetPlatform: Android
+            targetDevice: Quest
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           clean: true
-      - name: Remove PlayerSetting HVR symbol temporarily
-        run: sed -i 's/GOTHIC_HVR_INSTALLED/GOTHIC_PLACEHOLDER/g' ProjectSettings/ProjectSettings.asset
+      # Own cache key: the Library compiled with HVR must not be reused here (and the other way round).
+      - uses: actions/cache@v4
+        with:
+          path: Library
+          key: Library-Xri-${{ matrix.targetPlatform }}
+          restore-keys: Library-Xri-
+
+      - name: Remove PlayerSetting HVR symbol
+        run: |
+          sed -i 's/GOTHIC_HVR_INSTALLED;\?//g' ProjectSettings/ProjectSettings.asset
+          if grep -q 'GOTHIC_HVR_INSTALLED' ProjectSettings/ProjectSettings.asset; then
+            echo "GOTHIC_HVR_INSTALLED is still set in ProjectSettings.asset"
+            exit 1
+          fi
+          if [ -d Assets/HurricaneVR ]; then
+            echo "Assets/HurricaneVR must not exist for this build"
+            exit 1
+          fi
+
       - name: Build project
         uses: game-ci/unity-builder@v4
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          targetPlatform: StandaloneWindows64
+          targetPlatform: ${{ matrix.targetPlatform }}
           allowDirtyBuild: true
-          buildMethod: Gothic.VR.Editor.VRBuilderActions.PerformWindows64Build
+          buildMethod: Gothic.VR.Editor.VRBuilderActions.Perform${{ matrix.targetDevice }}Build
+          # Android Keystore settings
+          androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          androidKeystoreName: Gothic.keystore
+          customParameters: >
+            -keystoreName "Gothic.keystore"
+            -keystorePass "${{ secrets.ANDROID_KEYSTORE_PASS }}"
+            -keyaliasName "${{ secrets.ANDROID_KEYALIAS_NAME }}"
+            -keyaliasPass "${{ secrets.ANDROID_KEYALIAS_PASS }}"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Gothic-Unity-${{ matrix.targetDevice }}-Xri
+          path: Builds/${{ matrix.targetDevice }}
+          retention-days: 7
 
 
 

Assets/Gothic-Lab/Scenes/Lab.unity

@@ -7004,6 +7004,67 @@ MonoBehaviour:
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1001 &824432547
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8135023674665499069, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_Name
+      value: VR - XR Interaction Simulator
+      objectReference: {fileID: 0}
+    - target: {fileID: 8135023674665499069, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8518324294302271954, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 46fcf28ff6eb0db4d9951a3d7a830b58, type: 3}
 --- !u!1 &826442470
 GameObject:
   m_ObjectHideFlags: 0
@@ -20461,6 +20522,7 @@ SceneRoots:
   - {fileID: 1042196316}
   - {fileID: 1122706743}
   - {fileID: 1020358201}
+  - {fileID: 824432547}
   - {fileID: 1620998804}
   - {fileID: 1046231032}
   - {fileID: 905288120}

Assets/Gothic-VR/Resources/VR/Input/GothicVR.inputactions

@@ -408,7 +408,7 @@
                     "path": "<XRController>{LeftHand}/{SecondaryButton}",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "XR",
                     "action": "Menu",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -419,7 +419,7 @@
                     "path": "<Keyboard>/escape",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "Simulator",
                     "action": "Menu",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -430,7 +430,7 @@
                     "path": "<XRController>{RightHand}/{PrimaryButton}",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "XR",
                     "action": "Jump",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -441,7 +441,7 @@
                     "path": "<Keyboard>/space",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "Simulator",
                     "action": "Jump",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -452,18 +452,7 @@
                     "path": "<XRController>{RightHand}/{SecondaryButton}",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
-                    "action": "Crouch",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "e3f30bb9-cd1c-4fc6-9531-d5d9421cc255",
-                    "path": "<Keyboard>/z",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
+                    "groups": "XR",
                     "action": "Crouch",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -474,7 +463,7 @@
                     "path": "<Keyboard>/x",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "Simulator",
                     "action": "Crouch",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -485,18 +474,18 @@
                     "path": "<XRController>{LeftHand}/{Primary2DAxisClick}",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "XR",
                     "action": "Sprint",
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
                 {
                     "name": "",
                     "id": "8810bed4-d1c4-48a4-972b-93cc6086cafe",
-                    "path": "<Keyboard>/leftShift",
+                    "path": "<Keyboard>/f",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": "Simulator",
                     "action": "Sprint",
                     "isComposite": false,
                     "isPartOfComposite": false