diff --git a/ReferenceProject/Assets/Build/ucrp_base_version.txt b/ReferenceProject/Assets/Build/ucrp_base_version.txt index 4bb222aa..1f21073c 100644 --- a/ReferenceProject/Assets/Build/ucrp_base_version.txt +++ b/ReferenceProject/Assets/Build/ucrp_base_version.txt @@ -1 +1 @@ -ucrp-20240222 \ No newline at end of file +ucrp-20240501 \ No newline at end of file diff --git a/ReferenceProject/Assets/_Application/AssemblyInfo.cs b/ReferenceProject/Assets/_Application/AssemblyInfo.cs index 8eedbe93..0fda25db 100644 --- a/ReferenceProject/Assets/_Application/AssemblyInfo.cs +++ b/ReferenceProject/Assets/_Application/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System; using Unity.Cloud.Common; -[assembly: ApiSourceVersion("Unity Cloud Reference Project", "0.4.1")] +[assembly: ApiSourceVersion("Unity Cloud Reference Project", "0.4.2")] diff --git a/ReferenceProject/Assets/_Application/NavigationModes/WalkMode/Runtime/Scripts/WalkModeMoveController.cs b/ReferenceProject/Assets/_Application/NavigationModes/WalkMode/Runtime/Scripts/WalkModeMoveController.cs index abf0ebf6..18c5772e 100644 --- a/ReferenceProject/Assets/_Application/NavigationModes/WalkMode/Runtime/Scripts/WalkModeMoveController.cs +++ b/ReferenceProject/Assets/_Application/NavigationModes/WalkMode/Runtime/Scripts/WalkModeMoveController.cs @@ -97,7 +97,7 @@ public float CharacterHeight CharacterController m_Controller; IObjectPicker m_Picker; Task m_GetGroundTask; - PickerResult m_DownCastResult; + IPickerResult m_DownCastResult; Vector3 m_MoveDirectionInput; Vector3 m_PlayerVelocity; IAppMessaging m_AppMessaging; diff --git a/ReferenceProject/Assets/_Modules/AssetList/Runtime/Scripts/TransformationWorkflow/TransformationWorkflowController.cs b/ReferenceProject/Assets/_Modules/AssetList/Runtime/Scripts/TransformationWorkflow/TransformationWorkflowController.cs index 43176ccb..59da647e 100644 --- a/ReferenceProject/Assets/_Modules/AssetList/Runtime/Scripts/TransformationWorkflow/TransformationWorkflowController.cs +++ b/ReferenceProject/Assets/_Modules/AssetList/Runtime/Scripts/TransformationWorkflow/TransformationWorkflowController.cs @@ -46,7 +46,7 @@ public TransformationWorkflowController(IServiceHttpClient serviceHttpClient, IS public async Task StartTransformation(IDataset dataset, string file) { var descriptor = dataset.Descriptor; - var url = ConstructUrl($"projects/{descriptor.ProjectId}/assets/{descriptor.AssetId}/versions/1/datasets/{descriptor.DatasetId}/transformations/start/3d-data-streaming"); + var url = ConstructUrl($"projects/{descriptor.ProjectId}/assets/{descriptor.AssetId}/versions/{descriptor.AssetVersion}/datasets/{descriptor.DatasetId}/transformations/start/3d-data-streaming"); try { diff --git a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/DataStreamPicker.cs b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/DataStreamPicker.cs index 7183da59..b988541d 100644 --- a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/DataStreamPicker.cs +++ b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/DataStreamPicker.cs @@ -28,13 +28,13 @@ void Setup(IDataStreamerProvider dataStreamerProvider) dataStreamerProvider.DataStreamer.StageDestroyed.Subscribe(() => m_Stage = null); } - public async Task PickAsync(Ray ray, float maxDistance = k_MaxDistance) + public async Task PickAsync(Ray ray, float maxDistance = k_MaxDistance) { var raycastResult = new PickerResult(await m_Stage.RaycastAsync(ray, maxDistance)); return raycastResult; } - public async Task PickFromPathAsync(Vector3[] points) + public async Task PickFromPathAsync(Vector3[] points) { List rays = new List(); for (int i = 0; i < points.Length - 2; i++) diff --git a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/IObjectPicker.cs b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/IObjectPicker.cs index b84ce6b3..2c4c04d7 100644 --- a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/IObjectPicker.cs +++ b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/IObjectPicker.cs @@ -1,18 +1,33 @@ using System; using System.Threading.Tasks; using Unity.Cloud.Common; -using Unity.Cloud.DataStreaming.Runtime; using UnityEngine; +using RaycastResult = Unity.Cloud.DataStreaming.Runtime.RaycastResult; namespace Unity.ReferenceProject.ObjectSelection { - public struct PathPickerResult + public interface IPickerResult + { + public Vector3 Point { get; } + public Vector3 Normal { get; } + public bool HasIntersected { get; } + public InstanceId InstanceId { get; } + public float Distance { get; } + } + + public interface IPathPickerResult + { + public int Index { get; } + public IPickerResult PickerResult { get; } + } + + public struct PathPickerResult : IPathPickerResult { public int Index { get; set; } - public PickerResult PickerResult { get; set; } + public IPickerResult PickerResult { get; set; } } - public readonly struct PickerResult + public readonly struct PickerResult : IPickerResult { public static readonly PickerResult Invalid = new(RaycastResult.Invalid); @@ -34,7 +49,7 @@ public PickerResult(RaycastResult raycastResult) public interface IObjectPicker { - Task PickAsync(Ray ray, float maxDistance = 1000f); - Task PickFromPathAsync(Vector3[] points); + Task PickAsync(Ray ray, float maxDistance = 1000f); + Task PickFromPathAsync(Vector3[] points); } } diff --git a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/ObjectSelectionController.cs b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/ObjectSelectionController.cs index f247e9b8..0edecb94 100644 --- a/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/ObjectSelectionController.cs +++ b/ReferenceProject/Assets/_Modules/ObjectSelection/Runtime/Scripts/ObjectSelectionController.cs @@ -196,7 +196,7 @@ async Task PickFromRayAsync(Ray ray) } } - void DispatchSelection(PickerResult pickResult) + void DispatchSelection(IPickerResult pickResult) { var data = new ObjectSelectionInfo(pickResult.HasIntersected, pickResult.InstanceId, pickResult.Point, pickResult.Normal); diff --git a/ReferenceProject/ProjectSettings/ProjectSettings.asset b/ReferenceProject/ProjectSettings/ProjectSettings.asset index 8e95094a..3509aaa2 100644 --- a/ReferenceProject/ProjectSettings/ProjectSettings.asset +++ b/ReferenceProject/ProjectSettings/ProjectSettings.asset @@ -135,7 +135,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.4.1 + bundleVersion: 0.4.2 preloadedAssets: - {fileID: 8482996352975396597, guid: 5e000526ecb2d4747bf4ce80327ff334, type: 2} - {fileID: 11400000, guid: 0d693cc65d1393c4dbeb41e11b77f445, type: 2} @@ -164,10 +164,10 @@ PlayerSettings: Standalone: com.UnityTechnologies.com.unity.template-starter-kit iPhone: com.unity.cloud.reference-project buildNumber: - Standalone: 20240202 - VisionOS: 20240202 - iPhone: 20240202 - tvOS: 20240202 + Standalone: 20240501 + VisionOS: 20240501 + iPhone: 20240501 + tvOS: 20240501 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22