vive cosmos and index controller support

Assets/VR/Input Actions/XRI Default Input Actions.inputactions

@@ -116,7 +116,7 @@
                 {
                     "name": "second",
                     "id": "d94c2743-e8f3-46fb-8bf8-ee6321fd26b4",
-                    "path": "<ViveCosmosController>{LeftHand}/deviceRotation",
+                    "path": "<ViveController>{LeftHand}/deviceRotation",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -127,7 +127,7 @@
                 {
                     "name": "third",
                     "id": "8895fec1-4baa-41d9-93dd-3cbf4481a627",
-                    "path": "<ViveWaveController>{LeftHand}/deviceRotation",
+                    "path": "<ValveIndexController>{LeftHand}/deviceRotation",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -160,7 +160,7 @@
                 {
                     "name": "second",
                     "id": "96c1ae48-c89a-47af-89ee-0c62eba40a0a",
-                    "path": "<ViveCosmosController>{LeftHand}/devicePosition",
+                    "path": "<ViveController>{LeftHand}/devicePosition",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -171,7 +171,7 @@
                 {
                     "name": "third",
                     "id": "17b89946-06e0-479d-a3b9-f52890bb2e7d",
-                    "path": "<ViveWaveController>{LeftHand}/devicePosition",
+                    "path": "<ValveIndexController>{LeftHand}/devicePosition",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -270,7 +270,7 @@
                 {
                     "name": "second",
                     "id": "04a1f255-eb4f-4e1b-851b-9fa03ba3e268",
-                    "path": "<ViveCosmosController>{RightHand}/deviceRotation",
+                    "path": "<ViveController>{RightHand}/deviceRotation",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -281,7 +281,7 @@
                 {
                     "name": "third",
                     "id": "776046e7-115c-474b-8b22-3d35f7ea20de",
-                    "path": "<ViveWaveController>{RightHand}/deviceRotation",
+                    "path": "<ValveIndexController>{RightHand}/deviceRotation",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -314,7 +314,7 @@
                 {
                     "name": "second",
                     "id": "e56dc10c-59a8-4c7c-aee1-fa80c05dd5b6",
-                    "path": "<ViveCosmosController>{RightHand}/devicePosition",
+                    "path": "<ViveController>{RightHand}/devicePosition",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -325,7 +325,7 @@
                 {
                     "name": "third",
                     "id": "2b1e4e94-dcee-4d0e-8c2d-7aed60c42b1e",
-                    "path": "<ViveWaveController>{RightHand}/devicePosition",
+                    "path": "<ValveIndexController>{RightHand}/devicePosition",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -404,7 +404,7 @@
                 {
                     "name": "",
                     "id": "4bb07120-9665-4ee8-9c1f-c759259a80d9",
-                    "path": "<ViveCosmosController>{LeftHand}/triggerPressed",
+                    "path": "<ViveController>{LeftHand}/triggerPressed",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -415,7 +415,7 @@
                 {
                     "name": "",
                     "id": "4c64f1ab-8f5e-46a8-a35b-1233723dfa77",
-                    "path": "<ViveWaveController>{LeftHand}/triggerPressed",
+                    "path": "<ValveIndexController>{LeftHand}/triggerPressed",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -582,7 +582,7 @@
                 {
                     "name": "",
                     "id": "b6821583-1155-4458-b451-fa06e5019dbf",
-                    "path": "<ViveCosmosController>{RightHand}/triggerPressed",
+                    "path": "<ViveController>{RightHand}/triggerPressed",
                     "interactions": "",
                     "processors": "",
                     "groups": "",
@@ -593,7 +593,7 @@
                 {
                     "name": "",
                     "id": "745293de-0141-4f8e-b7d0-cc2de88c9ad8",
-                    "path": "<ViveWaveController>{RightHand}/triggerPressed",
+                    "path": "<ValveIndexController>{RightHand}/triggerPressed",
                     "interactions": "",
                     "processors": "",
                     "groups": "",

Assets/XR/Loaders/Wave XR Loader.asset

@@ -1,14 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a675179231eb4b31a3b3ad747a18a9f, type: 3}
-  m_Name: Wave XR Loader
-  m_EditorClassIdentifier: 

Assets/XR/Loaders/Wave XR Loader.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 997d9704e2880904d82712bbf1d539d6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/XR/Settings/OpenXR Editor Settings.asset

@@ -12,7 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 975057b4fdcfb8142b3080d19a5cc712, type: 3}
   m_Name: OpenXR Editor Settings
   m_EditorClassIdentifier: 
-  Keys: 01000000
+  Keys: 
-  Values:
+  Values: []
-  - featureSets:
-    - com.HTC.openxr.featureset.vive

Assets/XR/Settings/OpenXR Package Settings.asset

@@ -61,26 +61,6 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
---- !u!114 &-6295922909374069616
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83c497f94dca8f442b93bafe87fe9590, type: 3}
-  m_Name: HtcViveFocus3InputFeature Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 1
-  nameUi: HTC Vive Focus3 Controller Support
-  version: 0.0.2
-  featureIdInternal: com.htc.openxr.feature.input.htcvivefocus3
-  openxrExtensionStrings: XR_HTC_vive_focus3_controller_interaction XR_EXT_palm_pose
-  company: HTC
-  priority: 0
-  required: 0
 --- !u!114 &-5760303697926728946
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -136,10 +116,7 @@ MonoBehaviour:
   features:
   - {fileID: -5645428411790280417}
   - {fileID: -9065768356830197223}
-  - {fileID: -4063311878580091470}
   - {fileID: -2952216973661141114}
-  - {fileID: -3630208235491696974}
-  - {fileID: -6295922909374069616}
   - {fileID: -4179021495097340258}
   - {fileID: 8995873766301033308}
   - {fileID: -3465480095234910706}
@@ -147,9 +124,7 @@ MonoBehaviour:
   - {fileID: -9064719246138345788}
   - {fileID: 8829524859106569533}
   - {fileID: -2735733284642257967}
-  - {fileID: 2626892015113126974}
   - {fileID: -1692072991545479379}
-  - {fileID: 2505612726939275868}
   m_renderMode: 0
   m_depthSubmissionMode: 0
 --- !u!114 &-4179021495097340258
@@ -172,72 +147,6 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
---- !u!114 &-4063311878580091470
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2fbc139556062114b840c0209eebde8d, type: 3}
-  m_Name: HandTracking_OpenXR_API Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Hand Tracking
-  version: 0.0.1
-  featureIdInternal: com.company.openxr.handtracking.feature
-  openxrExtensionStrings: XR_EXT_hand_tracking
-  company: HTC
-  priority: 0
-  required: 0
-  m_space: 0
-  m_leftHandle: 0
-  m_rightHandle: 0
---- !u!114 &-3630208235491696974
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 78ab78586c10ef544a7086ea0dcdcf46, type: 3}
-  m_Name: HtcViveCosmosInputFeature Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 1
-  nameUi: HTC Vive Cosmos Controller Support
-  version: 0.0.2
-  featureIdInternal: com.htc.openxr.feature.input.htcvivecosmos
-  openxrExtensionStrings: XR_HTC_vive_cosmos_controller_interaction XR_EXT_palm_pose
-  company: HTC
-  priority: 0
-  required: 0
---- !u!114 &-3601545987831357755
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bb0f8bc7ffa73114397349c4888bab44, type: 3}
-  m_Name: SceneUnderstanding_OpenXR_API WSA
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Scene Understanding
-  version: 0.0.1
-  featureIdInternal: com.htc.openxr.sceneunderstanding.feature
-  openxrExtensionStrings: XR_MSFT_scene_understanding
-  company: HTC
-  priority: 0
-  required: 0
-  m_XrInstance: 0
-  m_XrSession: 0
-  m_systemid: 0
 --- !u!114 &-3596709507277034392
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -456,71 +365,6 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
---- !u!114 &2354319517743609179
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 78ab78586c10ef544a7086ea0dcdcf46, type: 3}
-  m_Name: HtcViveCosmosInputFeature WSA
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: HTC Vive Cosmos Controller Support
-  version: 0.0.2
-  featureIdInternal: com.htc.openxr.feature.input.htcvivecosmos
-  openxrExtensionStrings: XR_HTC_vive_cosmos_controller_interaction XR_EXT_palm_pose
-  company: HTC
-  priority: 0
-  required: 0
---- !u!114 &2505612726939275868
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 78a47d9a95f0613439910fb469f4ee28, type: 3}
-  m_Name: VIVE_FacialTracking_OpenXR_API Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Facial Tracking
-  version: 0.0.1
-  featureIdInternal: com.htc.openxr.facialtracking.feature
-  openxrExtensionStrings: XR_HTC_facial_tracking
-  company: HTC
-  priority: 0
-  required: 0
-  m_expressionHandle: 0
-  m_expressionHandle_Lip: 0
---- !u!114 &2626892015113126974
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bb0f8bc7ffa73114397349c4888bab44, type: 3}
-  m_Name: SceneUnderstanding_OpenXR_API Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Scene Understanding
-  version: 0.0.1
-  featureIdInternal: com.htc.openxr.sceneunderstanding.feature
-  openxrExtensionStrings: XR_MSFT_scene_understanding
-  company: HTC
-  priority: 0
-  required: 0
-  m_XrInstance: 0
-  m_XrSession: 0
-  m_systemid: 0
 --- !u!114 &3846928703558156887
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -537,15 +381,12 @@ MonoBehaviour:
   - {fileID: 2289670083675959570}
   - {fileID: 1173906867656648867}
   - {fileID: 5315868764271356596}
-  - {fileID: 2354319517743609179}
-  - {fileID: 7789757789461589872}
   - {fileID: -5760303697926728946}
   - {fileID: -3596709507277034392}
   - {fileID: -2525753227810615796}
   - {fileID: 10505211265528180}
   - {fileID: -3246497391830789495}
   - {fileID: 4642398570395311329}
-  - {fileID: -3601545987831357755}
   - {fileID: -8052587150971810870}
   m_renderMode: 1
   m_depthSubmissionMode: 0
@@ -591,26 +432,6 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
---- !u!114 &7789757789461589872
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83c497f94dca8f442b93bafe87fe9590, type: 3}
-  m_Name: HtcViveFocus3InputFeature WSA
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: HTC Vive Focus3 Controller Support
-  version: 0.0.2
-  featureIdInternal: com.htc.openxr.feature.input.htcvivefocus3
-  openxrExtensionStrings: XR_HTC_vive_focus3_controller_interaction XR_EXT_palm_pose
-  company: HTC
-  priority: 0
-  required: 0
 --- !u!114 &8610061585994297492
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/XR/Settings/Wave XR Settings.asset

@@ -1,56 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c76bebe14424446cca62c6e29db5054f, type: 3}
-  m_Name: Wave XR Settings
-  m_EditorClassIdentifier: 
-  preferedStereoRenderingPath: 1
-  useDoubleWidth: 0
-  useRenderMask: 1
-  enableTimeWarpStabilizedMode: 2
-  adaptiveQualityMode: 2
-  AQ_SendQualityEvent: 1
-  AQ_AutoFoveation: 0
-  useAQDynamicResolution: 1
-  DR_DefaultIndex: 0
-  DR_TextSize: 20
-  DR_ResolutionScaleList: []
-  foveationMode: 2
-  leftClearVisionFOV: 38
-  rightClearVisionFOV: 38
-  leftPeripheralQuality: 2
-  rightPeripheralQuality: 2
-  overridePixelDensity: 0
-  pixelDensity: 1
-  resolutionScale: 1
-  debugLogFlagForNative: 1048335
-  debugLogFlagForUnity: 1048335
-  overrideLogFlagForNative: 0
-  useCMPChecker: 0
-  amcMode: 0
-  amcModeConfirm: 0
-  fadeOut: 0
-  enableFSE: 0
-  FSE_Level: 0.5
-  supportedFPS: 0
-  waveXRFolder: Assets/Wave/XR
-  waveEssenceFolder: Assets/Wave/Essence
-  displayGamutPreferences: 000000000100000002000000
-  enableAutoFallbackForMultiLayer: 1
-  allowSpectatorCamera: 0
-  EnableTracker: 0
-  EnableNaturalHand: 0
-  EnableElectronicHand: 0
-  EnableEyeTracking: 0
-  EnableEyeExpression: 0
-  EnableLipExpression: 0
-  EnableScenePerception: 0
-  EnableSceneMesh: 0

Assets/XR/Settings/Wave XR Settings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5928c446ba771434e82a52646d344638
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/manifest.json

@@ -1,8 +1,6 @@
 {
   "dependencies": {
     "com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm",
-    "com.htc.upm.vive.openxr": "1.0.10",
-    "com.htc.upm.wave.xrsdk": "5.2.1-r.1",
     "com.unity.ide.rider": "3.0.21",
     "com.unity.render-pipelines.universal": "14.0.7",
     "com.unity.textmeshpro": "3.0.6",
@@ -51,13 +49,6 @@
       "scopes": [
         "io.realm.unity"
       ]
-    },
-    {
-      "name": "VIVE",
-      "url": "https://npm-registry.vive.com",
-      "scopes": [
-        "com.htc.upm"
-      ]
     }
   ]
 }

Packages/packages-lock.json

@@ -7,27 +7,6 @@
       "dependencies": {},
       "hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7"
     },
-    "com.htc.upm.vive.openxr": {
-      "version": "1.0.10",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.xr.management": "3.2.16",
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.1.0-preview.1",
-        "com.unity.xr.openxr": "1.4.2"
-      },
-      "url": "https://npm-registry.vive.com"
-    },
-    "com.htc.upm.wave.xrsdk": {
-      "version": "5.2.1-r.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.xr.management": "3.2.4"
-      },
-      "url": "https://npm-registry.vive.com"
-    },
     "com.unity.burst": {
       "version": "1.8.4",
       "depth": 1,

ProjectSettings/PackageManagerSettings.asset

@@ -34,15 +34,7 @@ MonoBehaviour:
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
-  - m_Id: scoped:project:VIVE
+  m_UserSelectedRegistryName: NPM
-    m_Name: VIVE
-    m_Url: https://npm-registry.vive.com
-    m_Scopes:
-    - com.htc.upm
-    m_IsDefault: 0
-    m_Capabilities: 0
-    m_ConfigSource: 4
-  m_UserSelectedRegistryName: VIVE
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
     m_Modified: 0