diff --git a/Assets/Environment/Prefabs/FortusRoom.prefab b/Assets/Environment/Prefabs/FortusRoom.prefab index 3c3492d..e83fc75 100644 --- a/Assets/Environment/Prefabs/FortusRoom.prefab +++ b/Assets/Environment/Prefabs/FortusRoom.prefab @@ -218,6 +218,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5741860179393267535, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} insertIndex: -1 addedObject: {fileID: 1905471977410855824} + - targetCorrespondingSourceObject: {fileID: 5741860179393267535, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} + insertIndex: -1 + addedObject: {fileID: 7190789450967490770} m_SourcePrefab: {fileID: 100100000, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} --- !u!1 &2802984800076200956 stripped GameObject: @@ -245,6 +248,118 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 53.427174, y: 53.427174, z: 3.7410493} m_Center: {x: 0, y: 0, z: -26.870525} +--- !u!114 &7190789450967490770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802984800076200956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38f6bf3d943ac7945842268c9ef1dca6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: + - {fileID: 1905471977410855824} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 0 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 0 + m_MatchDirectionalInput: 1 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] --- !u!4 &4213704193420156802 stripped Transform: m_CorrespondingSourceObject: {fileID: 5995145536042165041, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions index 2370410..8d38c6b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions @@ -578,6 +578,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "1b27919b-0985-427a-8385-5dd56e6959ec", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f577a5b8-cc58-4b91-93da-aa016958778b", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim Position", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "2623b909-75bd-40da-97bd-ae1ecfb0a89b", @@ -589,6 +611,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "3314707a-2d17-41f3-82ae-3b7684ca9d60", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim Rotation", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "22d81441-4569-4d83-9371-d2ca9a200aab", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim Rotation", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "f7a37505-52bd-4a96-8f88-c761a62a71e7", @@ -1374,6 +1418,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "cbd561d7-03fd-456a-9a25-159dcac04fd6", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Aim Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "729a8437-22a3-41d1-8225-42880b97f5f3", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Aim Position", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "2bb1158a-2d78-446b-9351-6f9b3f1364cb", @@ -1385,6 +1451,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "2eb055b1-a32c-4744-b603-6ac79dccf809", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Aim Rotation", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0ad54b3f-43ca-4133-8316-529946d242c2", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Aim Rotation", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "21413a94-0048-4112-b433-a770f183f592", diff --git a/ProjectSettings/BurstAotSettings_WSAPlayer.json b/ProjectSettings/BurstAotSettings_WSAPlayer.json new file mode 100644 index 0000000..58cf25f --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WSAPlayer.json @@ -0,0 +1,18 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +}