From 480f4587063916885a36a7b724e942e70a1575a4 Mon Sep 17 00:00:00 2001 From: "milan @ U1" Date: Tue, 16 May 2023 12:35:13 +0200 Subject: [PATCH] cosmos and focus3 (with wave) --- Assets/Scenes/PuzzleTest.unity | 14 +- .../XRI Default Input Actions.inputactions | 811 ++---------------- Assets/XR/Loaders/Wave XR Loader.asset | 14 + Assets/XR/Loaders/Wave XR Loader.asset.meta | 8 + .../XR/Settings/OpenXR Editor Settings.asset | 3 +- Assets/XR/Settings/Wave XR Settings.asset | 56 ++ .../XR/Settings/Wave XR Settings.asset.meta | 8 + Assets/XR/XRGeneralSettings.asset | 1 + Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + ProjectSettings/EditorBuildSettings.asset | 2 + 11 files changed, 161 insertions(+), 766 deletions(-) create mode 100644 Assets/XR/Loaders/Wave XR Loader.asset create mode 100644 Assets/XR/Loaders/Wave XR Loader.asset.meta create mode 100644 Assets/XR/Settings/Wave XR Settings.asset create mode 100644 Assets/XR/Settings/Wave XR Settings.asset.meta diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index cdb7eac..ac27b82 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1477,6 +1477,9 @@ Transform: - {fileID: 2343402481646314946} - {fileID: 9336441} - {fileID: 1976313343} + - {fileID: 1853180256} + - {fileID: 675198211105780961} + - {fileID: 538618498} m_Father: {fileID: 1340421038} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1908,7 +1911,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 1478369497145927568, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} @@ -3250,7 +3253,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -3263,9 +3266,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1853180256} - - {fileID: 675198211105780961} - - {fileID: 538618498} - {fileID: 411421604} m_Father: {fileID: 0} m_RootOrder: 4 @@ -4273,7 +4273,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -4948,7 +4948,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} diff --git a/Assets/VR/Input Actions/XRI Default Input Actions.inputactions b/Assets/VR/Input Actions/XRI Default Input Actions.inputactions index 730a842..7038ffe 100644 --- a/Assets/VR/Input Actions/XRI Default Input Actions.inputactions +++ b/Assets/VR/Input Actions/XRI Default Input Actions.inputactions @@ -31,7 +31,7 @@ "path": "/centerEyePosition", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": false @@ -42,7 +42,7 @@ "path": "/centerEyeRotation", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": false @@ -92,139 +92,7 @@ ], "bindings": [ { - "name": "Index", - "id": "61466a56-4ee4-47b1-aa6a-4806de1de5f2", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "afdcfbff-e241-4fdd-a6d1-23b0bf273360", - "path": "{LeftHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "ed03d944-4c09-4c38-8b68-5c844e18ca7c", - "path": "{LeftHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "c98fc8c8-7fc6-4909-89b6-c5b7568e7275", - "path": "{LeftHand}/devicePose/rotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive", - "id": "014f4a83-21ce-45c1-964a-552b63880ee3", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "271da624-4af4-4ff9-92bf-4df8147541fc", - "path": "{LeftHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "20b64ec3-03b8-4d1b-8137-a1d49ef8f0ee", - "path": "{LeftHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "343091a2-306a-4390-a2cc-408c40556b00", - "path": "{LeftHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Cosmos", - "id": "44f73df7-4b2f-4c63-be2d-4e706ca7cc7c", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "35d60daa-8c92-471c-8d26-1ebef6659d35", - "path": "{LeftHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "2faec01e-7d18-41e7-925c-eec1b1d81dab", - "path": "{LeftHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "38455d42-6b28-40a6-bffa-57e58a2bc271", - "path": "{LeftHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Focus3", + "name": "Vector 3 Fallback", "id": "4439b79a-fc39-453e-a742-d6ba45a79262", "path": "QuaternionFallback", "interactions": "", @@ -236,22 +104,22 @@ }, { "name": "first", - "id": "d94c2743-e8f3-46fb-8bf8-ee6321fd26b4", - "path": "{LeftHand}/pointerRotation", + "id": "dc821062-07bc-47df-8c4f-d178360b7368", + "path": "{LeftHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true }, { "name": "second", - "id": "dc821062-07bc-47df-8c4f-d178360b7368", - "path": "{LeftHand}/deviceRotation", + "id": "d94c2743-e8f3-46fb-8bf8-ee6321fd26b4", + "path": "{LeftHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true @@ -259,148 +127,16 @@ { "name": "third", "id": "8895fec1-4baa-41d9-93dd-3cbf4481a627", - "path": "{LeftHand}/deviceRotation", + "path": "{LeftHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true }, { - "name": "Index", - "id": "14aeff85-d719-43ff-a124-b1cd7ca8686d", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "abf752ec-feee-4d51-b530-f0870f48acc9", - "path": "{LeftHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "6580b669-0651-401c-9779-85ef22689130", - "path": "{LeftHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "ae101942-9eaa-4c53-a388-cafc3fd89bdf", - "path": "{LeftHand}/devicePose/position", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive", - "id": "1c77e7f3-1790-4d56-930a-3ed6f1440d49", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "9d15b045-829f-4c95-bc27-c6fc6d418d0b", - "path": "{LeftHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "2ec46745-b221-4beb-ad7e-5b7428202b92", - "path": "{LeftHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "7ba84e89-0ce1-4ebf-bc2e-982de1854007", - "path": "{LeftHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Cosmos", - "id": "7ef1a3b3-4120-446a-bc6e-cc55ad58d21e", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "ba64aee1-3160-48d2-a4a3-da38fb4cca9f", - "path": "{LeftHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "f21ceeda-4326-4cc1-8aad-8e0a01be45d0", - "path": "{LeftHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "d06e1ec8-33be-4de5-bbab-21156951d902", - "path": "{LeftHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Focus3", + "name": "Vector 3 Fallback", "id": "7918a85b-e25d-4570-8f5d-ae2f421b2262", "path": "Vector3Fallback", "interactions": "", @@ -413,10 +149,10 @@ { "name": "first", "id": "abc5b54f-66f2-412b-bfd7-f0cd807222f5", - "path": "{LeftHand}/pointerPosition", + "path": "{LeftHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -424,10 +160,10 @@ { "name": "second", "id": "96c1ae48-c89a-47af-89ee-0c62eba40a0a", - "path": "{LeftHand}/devicePosition", + "path": "{LeftHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -435,10 +171,10 @@ { "name": "third", "id": "17b89946-06e0-479d-a3b9-f52890bb2e7d", - "path": "{LeftHand}/devicePosition", + "path": "{LeftHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -449,7 +185,7 @@ "path": "{LeftHand}/*", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Haptic Device", "isComposite": false, "isPartOfComposite": false @@ -460,7 +196,7 @@ "path": "{LeftHand}/trackingState", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Tracking State", "isComposite": false, "isPartOfComposite": false @@ -510,139 +246,7 @@ ], "bindings": [ { - "name": "Index", - "id": "e85be0db-bd7f-43b3-a34b-3e5e12779839", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "63f0f4c4-adb5-4ea7-be04-5e44adf9421a", - "path": "{RightHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "f5847a22-7d53-4580-853d-7c40a653151c", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "60e5501b-fab3-4452-9dcd-b19954dfa0f8", - "path": "{RightHand}/devicePose/rotation", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive", - "id": "489f533f-ef48-455d-a490-e5bb3c62e062", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "c2a1e0bd-082b-43c0-8832-a4048b9b686e", - "path": "{RightHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "554a9fae-0e83-45ea-a28f-b6e8c5f914bb", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "21a85390-edfb-4e10-bb16-30d97ff283e9", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Cosmos", - "id": "8318076b-6839-47e4-898a-2f80a20e751f", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "e741227d-ef82-42ea-8d33-16cacb1ff629", - "path": "{RightHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "dc45b4c0-9aca-48eb-b975-ea7070192bdf", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "a433c490-69e2-49fd-837a-6ffe0c74be68", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Focus3", + "name": "Vector 3 Fallback", "id": "b0de8b2f-1890-41ee-948b-6a2891ff7a70", "path": "QuaternionFallback", "interactions": "", @@ -654,22 +258,22 @@ }, { "name": "first", - "id": "04a1f255-eb4f-4e1b-851b-9fa03ba3e268", - "path": "{RightHand}/pointerRotation", + "id": "070cb796-9a2b-46b3-b4af-e7b049a041d4", + "path": "{RightHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true }, { "name": "second", - "id": "070cb796-9a2b-46b3-b4af-e7b049a041d4", - "path": "{RightHand}/deviceRotation", + "id": "04a1f255-eb4f-4e1b-851b-9fa03ba3e268", + "path": "{RightHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true @@ -677,148 +281,16 @@ { "name": "third", "id": "776046e7-115c-474b-8b22-3d35f7ea20de", - "path": "{RightHand}/deviceRotation", + "path": "{RightHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Rotation", "isComposite": false, "isPartOfComposite": true }, { - "name": "Index", - "id": "2a940cc0-f0e9-4c45-923b-1e96f00658c2", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "dd5bb63a-f86f-45b9-9e09-32428d0af7f8", - "path": "{RightHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "ff625a0c-b0fd-4328-84cd-e5e54212f3e0", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "14f1fbc8-209d-434f-905a-7c68c1b672f3", - "path": "{RightHand}/devicePose/position", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive", - "id": "7c3c6ee7-eaf9-4e1e-ae18-bca8b19ec036", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "3d82b7fe-3f7f-4d85-ac61-087f745cb73f", - "path": "{RightHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "252dfef0-7a6f-411f-a820-2ab547965479", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "b3c8408f-3213-46a4-8ccf-4a5ae96abdb3", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Cosmos", - "id": "5ec71904-50d9-4f80-84bf-f94e4482e31b", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "e4fa1780-e3df-4013-a6e5-1f5a1aacf29c", - "path": "{RightHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "c2b16baa-09ac-44c5-9265-a14d0f8ccbf8", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "5fefadbe-4d6e-4b6a-af36-57322d629e8c", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "HTC Vive Focus3", + "name": "Vector 3 Fallback", "id": "7e9df227-1b50-4717-b19b-39de4e49949d", "path": "Vector3Fallback", "interactions": "", @@ -830,22 +302,22 @@ }, { "name": "first", - "id": "e56dc10c-59a8-4c7c-aee1-fa80c05dd5b6", - "path": "{RightHand}/pointerPosition", + "id": "6aa2f83b-45ab-48f0-aac2-2a1f1f025659", + "path": "{RightHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true }, { "name": "second", - "id": "6aa2f83b-45ab-48f0-aac2-2a1f1f025659", - "path": "{RightHand}/devicePosition", + "id": "e56dc10c-59a8-4c7c-aee1-fa80c05dd5b6", + "path": "{RightHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -853,10 +325,10 @@ { "name": "third", "id": "2b1e4e94-dcee-4d0e-8c2d-7aed60c42b1e", - "path": "{RightHand}/devicePosition", + "path": "{RightHand}/devicePosition", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -867,7 +339,7 @@ "path": "{RightHand}/trackingState", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Tracking State", "isComposite": false, "isPartOfComposite": false @@ -878,7 +350,7 @@ "path": "{RightHand}/*", "interactions": "", "processors": "", - "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "groups": "", "action": "Haptic Device", "isComposite": false, "isPartOfComposite": false @@ -924,73 +396,7 @@ "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller;Index Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "71a4d23f-3e9a-4513-923b-ba388c5e84bf", - "path": "{LeftHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "375e1a49-8284-47af-aadc-1437a489030b", - "path": "{LeftHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "6b947fe9-c3a9-4aa2-a7a1-98aa5b39021f", - "path": "{LeftHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "6a683349-7f8b-445d-b84e-45578773023a", - "path": "{LeftHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "db6f44ed-905a-4594-b7cf-fc6bc737cda2", - "path": "{LeftHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d0af70e0-853c-41dd-9a5d-74d7973cc4bb", - "path": "{LeftHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Cosmos Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -998,21 +404,21 @@ { "name": "", "id": "4bb07120-9665-4ee8-9c1f-c759259a80d9", - "path": "{LeftHand}/triggerTouched", + "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "0d8fd1ba-6095-4fd4-ad1e-637c7a14cc49", - "path": "{LeftHand}/gripPressed", + "id": "4c64f1ab-8f5e-46a8-a35b-1233723dfa77", + "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -1168,95 +574,29 @@ "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller;Index Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "efa149d4-d134-4f59-85f2-ac4e3b9c6e3b", - "path": "{RightHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c6071b2-a53e-4835-8018-434d59e8e509", - "path": "{RightHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "Index Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "6f7e9c78-1713-4857-ab81-7c6f65c32796", - "path": "{RightHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c58461fe-d408-4622-a7a1-e4b358619ac3", - "path": "{RightHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e0e2e925-6d69-4d9f-ae3e-4e16af0dc0fe", + "id": "b6821583-1155-4458-b451-fa06e5019dbf", "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Cosmos Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "b21261cb-e3a1-47fa-b57c-c756f8cbc43d", - "path": "{RightHand}/gripPressed", + "id": "745293de-0141-4f8e-b7d0-cc2de88c9ad8", + "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "HTC Vive Cosmos Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4a0bc96e-4d3c-46ed-8e50-92aba99971f4", - "path": "{RightHand}/triggerTouched", - "interactions": "", - "processors": "", - "groups": "HTC Vive Focus3 Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "731b4ad7-1074-434a-90bd-db9a3c13a82a", - "path": "{RightHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "HTC Vive Focus3 Controller", + "groups": "", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -1374,50 +714,5 @@ ] } ], - "controlSchemes": [ - { - "name": "Index Controller", - "bindingGroup": "Index Controller", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "HTC Vive Controller", - "bindingGroup": "HTC Vive Controller", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "HTC Vive Cosmos Controller", - "bindingGroup": "HTC Vive Cosmos Controller", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "HTC Vive Focus3 Controller", - "bindingGroup": "HTC Vive Focus3 Controller", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] + "controlSchemes": [] } \ No newline at end of file diff --git a/Assets/XR/Loaders/Wave XR Loader.asset b/Assets/XR/Loaders/Wave XR Loader.asset new file mode 100644 index 0000000..8b1f79c --- /dev/null +++ b/Assets/XR/Loaders/Wave XR Loader.asset @@ -0,0 +1,14 @@ +%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: diff --git a/Assets/XR/Loaders/Wave XR Loader.asset.meta b/Assets/XR/Loaders/Wave XR Loader.asset.meta new file mode 100644 index 0000000..584463f --- /dev/null +++ b/Assets/XR/Loaders/Wave XR Loader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 997d9704e2880904d82712bbf1d539d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Editor Settings.asset b/Assets/XR/Settings/OpenXR Editor Settings.asset index 8d6c175..81f6bc6 100644 --- a/Assets/XR/Settings/OpenXR Editor Settings.asset +++ b/Assets/XR/Settings/OpenXR Editor Settings.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: Keys: 01000000 Values: - - featureSets: [] + - featureSets: + - com.HTC.openxr.featureset.vive diff --git a/Assets/XR/Settings/Wave XR Settings.asset b/Assets/XR/Settings/Wave XR Settings.asset new file mode 100644 index 0000000..a4b3c0c --- /dev/null +++ b/Assets/XR/Settings/Wave XR Settings.asset @@ -0,0 +1,56 @@ +%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 diff --git a/Assets/XR/Settings/Wave XR Settings.asset.meta b/Assets/XR/Settings/Wave XR Settings.asset.meta new file mode 100644 index 0000000..f0d26d1 --- /dev/null +++ b/Assets/XR/Settings/Wave XR Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5928c446ba771434e82a52646d344638 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index 04a91b9..51c99d0 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -77,3 +77,4 @@ MonoBehaviour: m_AutomaticRunning: 0 m_Loaders: - {fileID: 11400000, guid: dfe61e10b085aa149bce80b468d7fab2, type: 2} + - {fileID: 11400000, guid: 997d9704e2880904d82712bbf1d539d6, type: 2} diff --git a/Packages/manifest.json b/Packages/manifest.json index 70f0df5..39c79aa 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,6 +2,7 @@ "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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index fac475c..b600410 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -19,6 +19,15 @@ }, "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, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index af1600e..b703e85 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -15,6 +15,8 @@ EditorBuildSettings: path: Assets/Scenes/StencilPortalScene.unity guid: 56077ec5fbc90b04985e5cfae1891968 m_configObjects: + com.htc.upm.wave.xrsdk.xrsettings: {fileID: 11400000, guid: 5928c446ba771434e82a52646d344638, + type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 5038e8a8e7bee0a44a0c2892bcbf360e, type: 2} com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 4fc8ed80f87d6b94981580316e2b7811,