Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating for ARFoundation 6 support #8

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Updating for ARFoundation 6 support #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...les/ARFoundationTrackableImagesLibrary.cs → ...ons/ARFoundationTrackableImagesLibrary.cs
View file
Open in desktop
File renamed without changes.
0 ...RFoundationTrackableImagesLibrary.cs.meta → ...RFoundationTrackableImagesLibrary.cs.meta
View file
Open in desktop
File renamed without changes.
0 ...e/Modules/ARFoundationTrackedImageData.cs → ...finitions/ARFoundationTrackedImageData.cs
View file
Open in desktop
File renamed without changes.
0 ...ules/ARFoundationTrackedImageData.cs.meta → ...ions/ARFoundationTrackedImageData.cs.meta
View file
Open in desktop
File renamed without changes.
25 changes: 22 additions & 3 deletions Runtime/Modules/ARFoundationSpatialPersistenceServiceImageTrackingModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class ARFoundationSpatialPersistenceServiceImageTrackingModule : BaseSpat
private bool isStarted = false;
private bool isStarting = false;

private bool hasValidTrackingProfile => profile.IsNotNull() && profile.TrackedImagesLibrary.IsNotNull();

private ARTrackedImageManager TrackedImageManager
{
get
Expand Down Expand Up @@ -107,7 +109,12 @@ public override Task StartSpatialPersistenceModule()
runtimeImageLibrary = TrackedImageManager.referenceLibrary as MutableRuntimeReferenceImageLibrary;
DynamicLibraryManager.OnImageLoaded += OnImageLoaded;
DynamicLibraryManager.OnImageLoadFailed += OnImageLoadFailed;

#if ARFOUNDATION_6
TrackedImageManager.trackablesChanged.AddListener(OnTrackedImagesChanged);
#else
TrackedImageManager.trackedImagesChanged += OnTrackedImagesChanged;
#endif
if (profile.TrackedImagesLibrary.IsNotNull() && profile.TrackedImagesLibrary.TrackedImages != null)
{
DynamicLibraryManager.ProcessImages(runtimeImageLibrary, profile.TrackedImagesLibrary.TrackedImages);
Expand All @@ -125,7 +132,11 @@ public override void StopSpatialPersistenceModule()
{
if (TrackedImageManager != null)
{
#if ARFOUNDATION_6
TrackedImageManager.trackablesChanged.RemoveListener(OnTrackedImagesChanged);
#else
TrackedImageManager.trackedImagesChanged -= OnTrackedImagesChanged;
#endif
}
OnSessionEnded();
}
Expand Down Expand Up @@ -172,7 +183,7 @@ private IEnumerator AddToLibrary(MutableRuntimeReferenceImageLibrary mutableLibr
{
if (mutableLibrary is null)
{
OnSpatialPersistenceError($"Library is inaccessble.");
OnSpatialPersistenceError($"Library is inaccessible.");
yield return null;
}
if (trackedImageIds.Contains(anchorGuid))
Expand All @@ -194,7 +205,11 @@ private IEnumerator AddToLibrary(MutableRuntimeReferenceImageLibrary mutableLibr
dynamicLibraryManager.ProcessImage(mutableLibrary, anchorGuid, texture, url);
}

#if ARFOUNDATION_6
private void OnTrackedImagesChanged(ARTrackablesChangedEventArgs<ARTrackedImage> trackedImage)
#else
private void OnTrackedImagesChanged(ARTrackedImagesChangedEventArgs trackedImage)
#endif
{
foreach (var newImage in trackedImage.added)
{
Expand Down Expand Up @@ -223,7 +238,7 @@ private void OnTrackedImagesChanged(ARTrackedImagesChangedEventArgs trackedImage
if (trackedImageIds.Contains(updatedImage.referenceImage.guid))
{
Guid refGuid = updatedImage.referenceImage.guid;
if(trackedImageReferences.TryGetValue(updatedImage.referenceImage.guid, out var trackedGuid))
if (trackedImageReferences.TryGetValue(updatedImage.referenceImage.guid, out var trackedGuid))
{
refGuid = trackedGuid;
}
Expand All @@ -235,7 +250,11 @@ private void OnTrackedImagesChanged(ARTrackedImagesChangedEventArgs trackedImage
}
}

#if ARFOUNDATION_6
foreach (var (id, removedImage) in trackedImage.removed)
#else
foreach (var removedImage in trackedImage.removed)
#endif
{
if (trackedImageIds.Contains(removedImage.referenceImage.guid))
{
Expand All @@ -256,7 +275,7 @@ private void OnTrackedImagesChanged(ARTrackedImagesChangedEventArgs trackedImage

private void OnImageLoaded(ARFoundationTrackedImageData data)
{
if(profile.TrackedImagesLibrary.GetTrackedImageByName(data.Name) == null)
if (hasValidTrackingProfile && profile.TrackedImagesLibrary.GetTrackedImageByName(data.Name) == null)
{
profile.TrackedImagesLibrary.AddTrackedImageData(data);
}
Expand Down
16 changes: 14 additions & 2 deletions Runtime/RealityToolkit.SpatialPersistence.ARFoundation.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"GUID:b2d046948d6452a4b8485efc9ce0f88c",
"GUID:c148ca4f0506aba4bb7c9e15a44bf2e3",
"GUID:a9420e37d7990b54abdef6688edbe313",
"GUID:92703082f92b41ba80f0d6912de66115"
"GUID:92703082f92b41ba80f0d6912de66115",
"GUID:dc960734dc080426fa6612f1c5fe95f3"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand All @@ -16,6 +17,17 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.xr.arfoundation",
"expression": "6.0.0",
"define": "ARFOUNDATION_6"
},
{
"name": "com.unity.xr.arfoundation",
"expression": "[4.0.0,5.2.0]",
"define": "ARFOUNDATION_4"
}
],
"noEngineReferences": false
}
Loading