From 6f27dca011675c44243f81de9fdb412b612b90d5 Mon Sep 17 00:00:00 2001 From: Juan Chong Date: Sat, 7 Dec 2024 16:24:05 -0800 Subject: [PATCH] Updated README, updated AndroidManifest, changed build organization, removed Git from the repository, and removed controller support from the app --- README.md | 22 +- .../Plugins/Android/AndroidManifest.xml | 7 +- unity/Assets/Scenes/QuestNav.unity | 438 ++++++++++++++++++ ...niversalRenderPipelineGlobalSettings.asset | 44 +- unity/Packages/manifest.json | 2 - unity/Packages/packages-lock.json | 23 - unity/ProjectSettings/GraphicsSettings.asset | 2 +- unity/ProjectSettings/ProjectSettings.asset | 8 +- 8 files changed, 477 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index b0ab436..fba3166 100644 --- a/README.md +++ b/README.md @@ -85,9 +85,11 @@ At it's heart, QuestNav is merely a VR app designed to push data to Network Tabl 3. Configure the following settings on your Quest headset: - Enable travel mode ([link](https://www.meta.com/help/quest/articles/in-vr-experiences/oculus-features/travel-mode/) to instructions) - Set the display timeout to 4 hours in `Settings > General > Power > Display off` + - Enable battery saver mode in `Settings > General > Power > Battery saver mode` - Disable WiFi in `Settings > WiFi` - - **NOTE:** Be sure to completely turn off WiFi, otherwise the headset will constantly disconnect from the robot network as it tries to look for the internet. + - **NOTE:** Be sure to completely turn off WiFi, otherwise the headset will constantly disconnect from the robot network as it tries to look for the internet - Disable Bluetooth in `Settings > Bluetooth` + - **NOTE:** Disabling Bluetooth will break the companion app functionality - Disable the guardian for development purposes `Settings > Advanced > Experimental Settings > Enable Custom Settings` and **TURN OFF** `Physical Space Features`, `MTP Notification`, and `Link Auto Connect` - These settings might also be located in `Settings > Developer > Experimental Settings > Enable Custom Settings` on some older OS builds 4. Plug the headset into your PC and install the example .apk using MQDH or adb (`adb install QuestNav.apk`) @@ -136,15 +138,6 @@ The main editing window will only open if a project is active. - Click on the newly imported project - Wait for Unity to compile assets and open the main interface -### Install the Git for Unity plugin - -Git for Unity is included in the project, but you may need to re-initialize it the first time that the project is imported. - -- Open the asset manager by selecting `Asset Store > My Assets` -- Remove and reinstall the `Git for Unity` and `Git for Unity UI` packages -- Close and open Unity -- Git for Unity should now detect your forked repository - ### Install the MessagePack plugin for Unity This package is required by the C# Network Tables library. @@ -157,11 +150,12 @@ This package is required by the C# Network Tables library. Be sure to resolve any Project Setup Tool warnings that appear in the `Console` tab! You need to look for warnings in both the `PC` and `Android` tabs to successfully build your Unity project. -### Change the build target to Android and ttempt to build the project +### Build your project using the OVR build tool -- You may need to change the build target to Android in `File > Build Profiles` -- Click `Build` and cross your fingers -- If everything works, then you should be good to go! +- The build tool is located in `Meta > OVR Build > OVR Build APK...` +- Set your desired OVR build path and click `Build` + - This tool prioritizes build speed above all else, so it will consume all CPU resources for a few minutes! +- If everything works, then upload the .apk to your headset! ### Link Unity to Visual Studio for debugging diff --git a/unity/Assets/Plugins/Android/AndroidManifest.xml b/unity/Assets/Plugins/Android/AndroidManifest.xml index 571c1ee..5d6316e 100644 --- a/unity/Assets/Plugins/Android/AndroidManifest.xml +++ b/unity/Assets/Plugins/Android/AndroidManifest.xml @@ -11,9 +11,12 @@ - + - + + + + \ No newline at end of file diff --git a/unity/Assets/Scenes/QuestNav.unity b/unity/Assets/Scenes/QuestNav.unity index 26956f2..f30a21b 100644 --- a/unity/Assets/Scenes/QuestNav.unity +++ b/unity/Assets/Scenes/QuestNav.unity @@ -256,6 +256,37 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!1 &207147540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 207147541} + m_Layer: 0 + m_Name: RightHandOnControllerAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &207147541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 207147540} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 845719445} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &231773613 GameObject: m_ObjectHideFlags: 0 @@ -695,6 +726,101 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!1 &476427103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 476427104} + m_Layer: 0 + m_Name: LeftHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &476427104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476427103} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1546513617} + - {fileID: 1636572262} + m_Father: {fileID: 815795998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &730769970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 730769971} + m_Layer: 0 + m_Name: LeftHandOnControllerAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &730769971 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730769970} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1546513617} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &773190229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773190230} + m_Layer: 0 + m_Name: LeftHandAnchorDetached + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &773190230 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773190229} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815795998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &815795997 GameObject: m_ObjectHideFlags: 0 @@ -728,6 +854,10 @@ Transform: - {fileID: 74435934} - {fileID: 1792095501} - {fileID: 1082111581} + - {fileID: 476427104} + - {fileID: 871263447} + - {fileID: 773190230} + - {fileID: 1964602098} m_Father: {fileID: 1878679371} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832575517 @@ -779,6 +909,188 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &845719444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 845719445} + m_Layer: 0 + m_Name: RightControllerInHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &845719445 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845719444} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 207147541} + m_Father: {fileID: 871263447} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &871263446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 871263447} + m_Layer: 0 + m_Name: RightHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &871263447 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871263446} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 845719445} + - {fileID: 1375737369} + m_Father: {fileID: 815795998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1079470477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079470480} + - component: {fileID: 1079470479} + - component: {fileID: 1079470478} + m_Layer: 0 + m_Name: '[BuildingBlock] Passthrough' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1079470478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079470477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 555725d48e9051a4bb6b8d45178c2fdd, type: 3} + m_Name: + m_EditorClassIdentifier: + projectionSurfaceType: 0 + overlayType: 1 + compositionDepth: 0 + hidden: 0 + overridePerLayerColorScaleAndOffset: 0 + colorScale: {x: 1, y: 1, z: 1, w: 1} + colorOffset: {x: 0, y: 0, z: 0, w: 0} + passthroughLayerResumed: + m_PersistentCalls: + m_Calls: [] + colorMapEditorType_: 0 + colorMapEditorGradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorMapEditorContrast: 0 + colorMapEditorBrightness: 0 + colorMapEditorPosterize: 0 + colorMapEditorSaturation: 0 + _colorLutSourceTexture: {fileID: 0} + _colorLutTargetTexture: {fileID: 0} + _lutWeight: 1 + _flipLutY: 1 + serializedSurfaceGeometry: [] + textureOpacity_: 1 + edgeRenderingEnabled_: 0 + edgeColor_: {r: 1, g: 1, b: 1, a: 1} + colorMapType: 0 +--- !u!114 &1079470479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079470477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b023183069df224080314a560e6e1ff, type: 3} + m_Name: + m_EditorClassIdentifier: + blockId: f0540b20-dfd6-420e-b20d-c270f88dc77e + instanceId: e3c704f7-9ea5-4fec-89f7-773f28116e85 + version: 1 + installationRoutineCheckpoint: + _installationRoutineId: + _installationVariants: [] +--- !u!4 &1079470480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079470477} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1082111580 GameObject: m_ObjectHideFlags: 0 @@ -810,6 +1122,100 @@ Transform: m_Children: [] m_Father: {fileID: 815795998} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1375737368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1375737369} + m_Layer: 0 + m_Name: RightControllerAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1375737369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375737368} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 871263447} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1546513616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1546513617} + m_Layer: 0 + m_Name: LeftControllerInHandAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1546513617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546513616} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 730769971} + m_Father: {fileID: 476427104} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1636572261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1636572262} + m_Layer: 0 + m_Name: LeftControllerAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1636572262 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636572261} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 476427104} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1792095500 GameObject: m_ObjectHideFlags: 0 @@ -1100,6 +1506,37 @@ Transform: - {fileID: 815795998} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1964602097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1964602098} + m_Layer: 0 + m_Name: RightHandAnchorDetached + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1964602098 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964602097} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815795998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1108,4 +1545,5 @@ SceneRoots: - {fileID: 410087041} - {fileID: 832575519} - {fileID: 1878679371} + - {fileID: 1079470480} - {fileID: 336173539} diff --git a/unity/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/unity/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 66c5bae..0d6813e 100644 --- a/unity/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/unity/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,24 +33,24 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 5628412212108853370 - - rid: 5628412212108853371 + - rid: 2975471060666810368 + - rid: 2975471060666810369 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 5628412212108853372 - - rid: 5628412212108853373 + - rid: 2975471060666810370 + - rid: 2975471060666810371 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 5628412212108853374 - - rid: 5628412212108853375 - - rid: 5628412212108853376 - - rid: 5628412212108853377 - - rid: 5628412212108853378 - - rid: 5628412212108853379 + - rid: 2975471060666810372 + - rid: 2975471060666810373 + - rid: 2975471060666810374 + - rid: 2975471060666810375 + - rid: 2975471060666810376 + - rid: 2975471060666810377 - rid: 6852985685364965392 - - rid: 5628412212108853380 + - rid: 2975471060666810378 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 7815359781915852800 @@ -96,14 +96,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 5628412212108853370 + - rid: 2975471060666810368 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 5628412212108853371 + - rid: 2975471060666810369 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -115,7 +115,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 5628412212108853372 + - rid: 2975471060666810370 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -130,7 +130,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 5628412212108853373 + - rid: 2975471060666810371 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -138,7 +138,7 @@ MonoBehaviour: m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - - rid: 5628412212108853374 + - rid: 2975471060666810372 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -151,13 +151,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 5628412212108853375 + - rid: 2975471060666810373 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 5628412212108853376 + - rid: 2975471060666810374 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -170,12 +170,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 5628412212108853377 + - rid: 2975471060666810375 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 5628412212108853378 + - rid: 2975471060666810376 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -185,14 +185,14 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 5628412212108853379 + - rid: 2975471060666810377 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 5628412212108853380 + - rid: 2975471060666810378 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 diff --git a/unity/Packages/manifest.json b/unity/Packages/manifest.json index 2989e9e..fac9e37 100644 --- a/unity/Packages/manifest.json +++ b/unity/Packages/manifest.json @@ -1,8 +1,6 @@ { "dependencies": { "com.meta.xr.mrutilitykit": "69.0.1", - "com.spoiledcat.git": "1.0.44", - "com.spoiledcat.git.ui": "1.0.44", "com.unity.ai.navigation": "2.0.4", "com.unity.collab-proxy": "2.5.2", "com.unity.ide.rider": "3.0.31", diff --git a/unity/Packages/packages-lock.json b/unity/Packages/packages-lock.json index dc6d6f0..ae9c499 100644 --- a/unity/Packages/packages-lock.json +++ b/unity/Packages/packages-lock.json @@ -19,29 +19,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.spoiledcat.git": { - "version": "1.0.44", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://registry.spoiledcat.com" - }, - "com.spoiledcat.git.api": { - "version": "1.0.44", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://registry.spoiledcat.com" - }, - "com.spoiledcat.git.ui": { - "version": "1.0.44", - "depth": 0, - "source": "registry", - "dependencies": { - "com.spoiledcat.git.api": "1.0.44" - }, - "url": "https://registry.spoiledcat.com" - }, "com.unity.ai.navigation": { "version": "2.0.4", "depth": 0, diff --git a/unity/ProjectSettings/GraphicsSettings.asset b/unity/ProjectSettings/GraphicsSettings.asset index a148e49..fe3b265 100644 --- a/unity/ProjectSettings/GraphicsSettings.asset +++ b/unity/ProjectSettings/GraphicsSettings.asset @@ -37,7 +37,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} + m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 diff --git a/unity/ProjectSettings/ProjectSettings.asset b/unity/ProjectSettings/ProjectSettings.asset index 8a222d3..39597fd 100644 --- a/unity/ProjectSettings/ProjectSettings.asset +++ b/unity/ProjectSettings/ProjectSettings.asset @@ -140,12 +140,10 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.2.0 + bundleVersion: 0.3.0 preloadedAssets: - {fileID: 11400000, guid: a3acedfb9d10ebb4980afb2325590b51, type: 2} - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - - {fileID: -2134709449523983886, guid: 1ba2bee52a945594c9a9f310bc44469f, type: 2} - - {fileID: 11400000, guid: c1de0065df926df4e9b73f8c9e739146, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -167,7 +165,7 @@ PlayerSettings: androidMaxAspectRatio: 2.4 androidMinAspectRatio: 1 applicationIdentifier: - Android: com.UnityTechnologies.com.unity.template.urpblank + Android: com.FIRSTRobotics.QuestNav Standalone: com.Unity-Technologies.com.unity.template.urp-blank iPhone: com.Unity-Technologies.com.unity.template.urp-blank buildNumber: @@ -175,7 +173,7 @@ PlayerSettings: VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 1 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 29 AndroidTargetSdkVersion: 32