From 7622b0fa8d8aa2e442ac7cf4d6619d7a482141d9 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Thu, 18 Jan 2024 14:27:13 -0500 Subject: [PATCH 1/4] Updating to 3.17 update --- Packages/manifest.json | 1 + Packages/packages-lock.json | 47 ++++++++++++++++++++++++++---- ProjectSettings/ProjectVersion.txt | 4 +-- 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 752e7c7..c9c678c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.render-pipelines.universal": "14.0.9", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.visualscripting": "1.9.1", "com.unity.xr.hands": "1.3.0", "com.unity.xr.interaction.toolkit": "2.5.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e2aaf0c..316fe00 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.9", + "version": "1.8.11", "depth": 1, "source": "registry", "dependencies": { @@ -36,7 +36,7 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.27", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", @@ -49,12 +49,12 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.xr.oculus": "4.1.1", + "com.unity.xr.oculus": "4.1.2", "com.unity.xr.openxr": "1.9.1" } }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.27", "depth": 1, "source": "registry", "dependencies": { @@ -130,7 +130,16 @@ "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", "com.unity.render-pipelines.core": "14.0.9", - "com.unity.shadergraph": "14.0.9" + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -156,6 +165,22 @@ "com.unity.searcher": "4.9.2" } }, + "com.unity.sysroot": { + "version": "2.0.7", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 1, @@ -198,6 +223,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7", + "com.unity.sysroot.linux-x86_64": "2.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 1, @@ -277,7 +312,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.oculus": { - "version": "4.1.1", + "version": "4.1.2", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 91206fd..396831e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.13f1 -m_EditorVersionWithRevision: 2022.3.13f1 (5f90a5ebde0f) +m_EditorVersion: 2022.3.17f1 +m_EditorVersionWithRevision: 2022.3.17f1 (4fc78088f837) From aefb1c6e2c915a9f9cdbc2857da4c241f4943809 Mon Sep 17 00:00:00 2001 From: kip Date: Mon, 22 Jan 2024 08:12:55 -0500 Subject: [PATCH 2/4] Fixed teleportation bug the teleportation now functions Issues needed for next PR - Workout the ray, distance and fix its locked state on distance from target - Make walls and other objects non teleportable through - Did not do any ui/ux / ease of use , saving that for next PR as to limit amount of possible bugs or changes --- Assets/Scenes/BasicScene.unity | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 80de5a2..25e8d5f 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -859,6 +859,10 @@ PrefabInstance: propertyPath: m_text value: objectReference: {fileID: 0} + - target: {fileID: 7636121662771443157, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_RequestedTrackingOriginMode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7782730797006555982, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} propertyPath: m_Enabled value: 0 From f8e93bec59bf1908556c17672639cac8c39ecf8f Mon Sep 17 00:00:00 2001 From: kip Date: Tue, 23 Jan 2024 16:52:27 -0500 Subject: [PATCH 3/4] Fixed ray showing up Ray now shows up , had to move the ray interactor a tad --- Assets/Scenes/BasicScene.unity | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 25e8d5f..6e24f2d 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -324,7 +324,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -432,7 +432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -460,7 +460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -648,7 +648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -739,6 +739,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -0.0321 objectReference: {fileID: 0} + - target: {fileID: 1693138946238447057, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_EnableFreeYMovement + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} propertyPath: m_LocalRotation.w value: 0.5 @@ -839,6 +843,14 @@ PrefabInstance: propertyPath: textMeshPro value: objectReference: {fileID: 0} + - target: {fileID: 4883245426080499922, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4883245426080499922, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0.04 + objectReference: {fileID: 0} - target: {fileID: 5199386814634172582, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} propertyPath: watchOffsetRotation.y value: 0 From fdb869973774b83e273c1a8f069199339e85d9c4 Mon Sep 17 00:00:00 2001 From: kip Date: Wed, 24 Jan 2024 10:53:28 -0500 Subject: [PATCH 4/4] Hand tracking Added fields and tracking with references so teleport works from right hand not shoudler --- Assets/Scenes/BasicScene.unity | 71 ++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 6e24f2d..c32a943 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -324,7 +324,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -432,7 +432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -460,7 +460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -648,7 +648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -719,6 +719,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} +--- !u!114 &1920805969 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1652381695448977783, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + m_PrefabInstance: {fileID: 9070320327174004474} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &9070320327174004474 PrefabInstance: m_ObjectHideFlags: 0 @@ -843,6 +854,42 @@ PrefabInstance: propertyPath: textMeshPro value: objectReference: {fileID: 0} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_PositionAction.m_Reference + value: + objectReference: {fileID: 9126875591944302883, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_RotationAction.m_Reference + value: + objectReference: {fileID: -3870559572202308136, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_IsTrackedAction.m_Reference + value: + objectReference: {fileID: -7044516463258014562, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_PositionAction.m_UseReference + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_RotationAction.m_UseReference + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_IsTrackedAction.m_UseReference + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_TrackingStateAction.m_Reference + value: + objectReference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_TrackingStateAction.m_UseReference + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4678866017896952928, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 1920805969} - target: {fileID: 4883245426080499922, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} propertyPath: m_LocalPosition.x value: -0 @@ -867,6 +914,22 @@ PrefabInstance: propertyPath: m_text value: objectReference: {fileID: 0} + - target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_LineType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_Velocity + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_ReferenceFrame + value: + objectReference: {fileID: 0} + - target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 1920805969} - target: {fileID: 7434633696072330849, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} propertyPath: m_text value: