From 5f61cfcca082064c1a6ba40122e31da82cd5a599 Mon Sep 17 00:00:00 2001 From: Simon Jackson Date: Wed, 25 Oct 2023 23:05:10 +0100 Subject: [PATCH 1/3] Add default profile configuration to the ARFoundation Module --- ...rsistenceServiceImageTrackingProfile.asset | 16 +++++++++++ ...enceServiceImageTrackingProfile.asset.meta | 8 ++++++ ...RFoundationTrackedImagesLibraryAsset.asset | 15 ++++++++++ ...dationTrackedImagesLibraryAsset.asset.meta | 8 ++++++ ..._ARFoundationPackageInstallerProfile.asset | 28 +++++++++++++++++++ ...undationPackageInstallerProfile.asset.meta | 8 ++++++ ...onPlatformServiceConfigurationsProfile.txt | 1 - ...Persistence_ARFoundationPlatformAssets.txt | 1 - 8 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset create mode 100644 Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset.meta create mode 100644 Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset create mode 100644 Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset.meta create mode 100644 Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset create mode 100644 Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset.meta delete mode 100644 Assets~/Profiles/SpatialPersistence_ARFoundationPlatformServiceConfigurationsProfile.txt delete mode 100644 Assets~/StandardAssets/SpatialPersistence_ARFoundationPlatformAssets.txt diff --git a/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset b/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset new file mode 100644 index 0000000..23dc303 --- /dev/null +++ b/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset @@ -0,0 +1,16 @@ +%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: 273deaca576d67240b6253f5266a1ad2, type: 3} + m_Name: ARFoundationSpatialPersistenceServiceImageTrackingProfile + m_EditorClassIdentifier: + configurations: [] + trackedImagesLibrary: {fileID: 11400000, guid: 5b8711bcd0b7af1419fd9095bfa0c7f6, type: 2} diff --git a/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset.meta b/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset.meta new file mode 100644 index 0000000..8b6a52d --- /dev/null +++ b/Assets~/Profiles/ARFoundationSpatialPersistenceServiceImageTrackingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83a2ebc9897784e4e92f24f3231c51f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset b/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset new file mode 100644 index 0000000..ca5fffc --- /dev/null +++ b/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset @@ -0,0 +1,15 @@ +%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: 5c8c7c00a2a670b4ba4deaf7c7fbdc31, type: 3} + m_Name: ARFoundationTrackedImagesLibraryAsset + m_EditorClassIdentifier: + trackedImages: [] diff --git a/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset.meta b/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset.meta new file mode 100644 index 0000000..f9baae6 --- /dev/null +++ b/Assets~/Profiles/ARFoundationTrackedImagesLibraryAsset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b8711bcd0b7af1419fd9095bfa0c7f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset b/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset new file mode 100644 index 0000000..e1b86a0 --- /dev/null +++ b/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset @@ -0,0 +1,28 @@ +%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: da64fb88269149f8a95f1fb969d6a0b4, type: 3} + m_Name: SpatialPersistence_ARFoundationPackageInstallerProfile + m_EditorClassIdentifier: + platformEntries: + runtimePlatforms: + - reference: e0d70d45-a52a-4b03-bcdf-8fe367555516 + - reference: 99428b70-e46a-4a1a-82b3-4e29bac872bd + configurations: + - instancedType: + reference: 94813e3d-1625-4836-8589-210a11252830 + name: AR Foundation Spatial Persistence Service Image Tracking Module + priority: 0 + profile: {fileID: 11400000, guid: 83a2ebc9897784e4e92f24f3231c51f8, type: 2} + platformEntries: + runtimePlatforms: + - reference: e0d70d45-a52a-4b03-bcdf-8fe367555516 + - reference: 99428b70-e46a-4a1a-82b3-4e29bac872bd \ No newline at end of file diff --git a/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset.meta b/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset.meta new file mode 100644 index 0000000..027e887 --- /dev/null +++ b/Assets~/Profiles/SpatialPersistence_ARFoundationPackageInstallerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a383ca300bd3604a99b6d3c1c12cbc5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets~/Profiles/SpatialPersistence_ARFoundationPlatformServiceConfigurationsProfile.txt b/Assets~/Profiles/SpatialPersistence_ARFoundationPlatformServiceConfigurationsProfile.txt deleted file mode 100644 index 10b2f57..0000000 --- a/Assets~/Profiles/SpatialPersistence_ARFoundationPlatformServiceConfigurationsProfile.txt +++ /dev/null @@ -1 +0,0 @@ -PlatformServiceConfigurationsProfile goes here \ No newline at end of file diff --git a/Assets~/StandardAssets/SpatialPersistence_ARFoundationPlatformAssets.txt b/Assets~/StandardAssets/SpatialPersistence_ARFoundationPlatformAssets.txt deleted file mode 100644 index 5459fdb..0000000 --- a/Assets~/StandardAssets/SpatialPersistence_ARFoundationPlatformAssets.txt +++ /dev/null @@ -1 +0,0 @@ -Any shared assets go here \ No newline at end of file From e6d26be8496a034c93b19a7fe670fdcc7fe8642f Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Thu, 26 Oct 2023 11:45:21 +0100 Subject: [PATCH 2/3] bump build version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ec68c4..c099260 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Mixed Reality" ], "version": "1.0.0-pre.3", - "unity": "2020.3", + "unity": "2021.3", "homepage": "https://github.com/realitycollective", "bugs": { "url": "https://github.com/realitycollective/realitytoolkit.dev/issues" From a5e4fc957e3ab7c748970bd7d79f81e531f6d3a3 Mon Sep 17 00:00:00 2001 From: "Simon (Darkside) Jackson" Date: Thu, 26 Oct 2023 12:21:00 +0100 Subject: [PATCH 3/3] bump arfoundation version for Unity 2021 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c099260..a969978 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "url": "https://github.com/realitycollective" }, "dependencies": { - "com.unity.xr.arfoundation": "4.1.13", + "com.unity.xr.arfoundation": "5.1.0", "com.realitytoolkit.spatial-persistence": "1.0.0-pre.5" }, "assets": [