Release 0.1.2

develop @0333c838ac517ca5da0523f2b841a763837d25a2

Author: ChafikUnity

README.md

@@ -14,12 +14,12 @@ The Unity Reference Project is a fully functional collaborative design review to
 
 To connect and find support, join the [Unity forum](https://forum.unity.com/forums/unity-cloud.868/).
 
-### Supported platforms and files
+### Supported platforms
 
-The Unity Reference Project is compatible with the [latest Unity Long Term Support](https://unity.com/releases/2021-lts) (LTS)  and tested on the following platforms:
+The Unity Reference Project is currently compatible with [Unity Editor 2021.3.15f1](https://unity.com/releases/editor/qa/lts-releases?version=2021.3) (LTS) and will occassionally be updated to support newer versions. Builds are tested on the following platforms:
 
 - Windows
-- MacOS
+- MacOS (Intel and Apple Silicon)
 - iOS
 - Android
 - WebGL
@@ -30,9 +30,10 @@ The Unity Reference Project is compatible with the [latest Unity Long Term Suppo
 - [Unity Reference Project](#unity-reference-project)
   - [A Unity project for building a collaborative 3D design review tool](#a-unity-project-for-building-a-collaborative-3d-design-review-tool)
   - [Get support](#get-support)
-    - [Supported platforms and files](#supported-platforms-and-files)
+    - [Supported platforms and files](#supported-platforms)
   - [Contents](#contents)
   - [Overview](#overview)
+  - [Prerequisites](#prerequisites)
   - [Get the project](#get-the-project)
   - [Configure Unity services](#configure-unity-services)
     - [Sign into your Unity account](#sign-into-your-unity-account)
@@ -67,9 +68,18 @@ It also leverages Unity services that make it easier to:
 - Authenticate with your Unity account.
 - List and select an asset from cloud storage.
 - Stream a large 3D asset from cloud storage (vast support for 3D formats).
-- Collaborate online with voice chat and user avatars.
+- Online multiplayer collaboration.
 - Share a deep-link to an asset for others to view.
 
+## Prerequisites
+
+### MacOS
+
+To open this Unity project on MacOS, you must have the Xcode commnand line tools installed. 
+
+1. Open the `Terminal` app on MacOS
+2. Enter the following command `xcode-select --install`
+
 ## Get the project
 
 * To get the Reference project, you can clone or download it.
@@ -80,6 +90,8 @@ Configuring Unity services typically involves signing into your Unity account an
 
 ### Sign into your Unity account
 
+> **Important**: The packages used in this project currently point to services hosted on GCP. When you sign in, ensure the toggle next to the `Sign In` button says `Using GCP`. This will change in an upcoming release that uses newer packages pointing to Azure.
+
 * To sign in, go to the [Asset Manager](https://dashboard.unity3d.com/digital-twins/).
 
 ### Create an ID for your application

ReferenceProject/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset

@@ -20,7 +20,7 @@ public class EmptyConsoleTests
             "With test categories:",
             "With test settings file:",
             "Executing tests with settings:",
-            "Packages/com.unity.dt.app-ui/PackageResources/Styles/Components/ColorWheel.uss"
+            "[Code Coverage]"
         };
         LogEntriesWrapper m_LogEntriesWrapper;
 

ReferenceProject/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset

@@ -1,4 +1,4 @@
 using System;
 using Unity.Cloud.Common;
 
-[assembly: ApiSourceVersion("Unity Cloud Reference Project", "0.1.1")]
+[assembly: ApiSourceVersion("Unity Cloud Reference Project", "0.1.2")]

ReferenceProject/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset

@@ -1,8 +1,11 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.Cloud.Common;
 using Unity.Cloud.DataStreaming.Runtime;
+using Unity.Cloud.DeepLinking;
 using Unity.ReferenceProject.DataStreaming;
+using Unity.ReferenceProject.DeepLinking;
 using Unity.ReferenceProject.Navigation;
 using UnityEngine;
 using Zenject;
@@ -16,23 +19,23 @@ class CameraDefaultPositionController : MonoBehaviour
 
         [SerializeField]
         float m_BoundsFillRatio = 0.9f;
-        
-        [SerializeField]
-        int m_VolumeProcessingIterations = 5;
-        
-        [SerializeField]
-        int m_VolumeProcessingDelay = 50;
 
         IDataStreamer m_DataStreamer;
         INavigationManager m_NavigationManager;
         Camera m_StreamingCamera;
 
         ISceneEvents m_SceneEvents;
+        IDataStreamBound m_DataStreamBound;
 
         bool m_IsProcessing;
 
+        IQueryArgumentsProcessor m_QueryArgumentsProcessor;
+        QueryArgumentHandler<string> m_QueryArgumentCameraTransformHandler;
+        DeepLinkCameraInfo m_SetDeepLinkCamera;
+
         [Inject]
-        void Setup(ISceneEvents sceneEvents, IDataStreamerProvider dataStreamerProvider, Camera streamingCamera, INavigationManager navigationManager)
+        void Setup(ISceneEvents sceneEvents, IDataStreamerProvider dataStreamerProvider, Camera streamingCamera, INavigationManager navigationManager, IDataStreamBound dataStreamBound,
+            IQueryArgumentsProcessor queryArgumentsProcessor, DeepLinkCameraInfo deepLinkCameraInfo)
         {
             m_SceneEvents = sceneEvents;
             m_SceneEvents.SceneOpened += OnSceneOpened;
@@ -42,12 +45,48 @@ void Setup(ISceneEvents sceneEvents, IDataStreamerProvider dataStreamerProvider,
 
             m_StreamingCamera = streamingCamera;
             m_NavigationManager = navigationManager;
+            m_DataStreamBound = dataStreamBound;
+            
+            m_QueryArgumentsProcessor = queryArgumentsProcessor;
+            m_SetDeepLinkCamera = deepLinkCameraInfo;
+        }
+
+        void Awake()
+        {
+            m_QueryArgumentCameraTransformHandler = new QueryArgumentHandler<string>(
+                "Camera Position",
+                GetCameraPosition,
+                SetCameraPosition
+            );
+            
+            m_QueryArgumentsProcessor.Register(m_QueryArgumentCameraTransformHandler, DeepLinkResourceType.Scene);
         }
 
         void OnDestroy()
         {
             m_SceneEvents.SceneOpened -= OnSceneOpened;
             m_SceneEvents.SceneClosed -= OnSceneClosed;
+            m_QueryArgumentsProcessor.Unregister(m_QueryArgumentCameraTransformHandler, DeepLinkResourceType.Scene);
+        }
+        
+        static string Vector3UrlFormat(Vector3 v)
+        {
+            return $"{v.x},{v.y},{v.z}";
+        }
+        public string GetCameraPosition()
+        {
+            return $"{Vector3UrlFormat(m_StreamingCamera.transform.position)}, {Vector3UrlFormat(m_StreamingCamera.transform.rotation.eulerAngles)}";
+        }
+        
+        void SetCameraPosition(string cameraString)
+        {
+            var splitValue = cameraString.Split(',').Select(i => float.TryParse(i, out float result) ? result : 0.0f).ToList();
+            if (splitValue.Count > 5)
+            {
+                var newPosition = new Vector3(splitValue[0], splitValue[1], splitValue[2]);
+                var newEulerAngle = new Vector3(splitValue[3], splitValue[4], splitValue[5]);
+                m_NavigationManager.TryTeleport(newPosition, newEulerAngle);
+            }
         }
 
         void OnSceneOpened(IScene scene)
@@ -64,9 +103,17 @@ async void OnStreamingStateChanged(StreamingState state)
         {
             if (m_IsProcessing)
                 return;
-            
+
             m_IsProcessing = true;
 
+            if (m_SetDeepLinkCamera.SetDeepLinkCamera) 
+            {
+                m_SetDeepLinkCamera.SetCameraReady?.Invoke(); // Process Deeplink QueryArguments
+                m_DataStreamer.StreamingStateChanged -= OnStreamingStateChanged;
+                m_IsProcessing = false;
+                return; 
+            }
+            
             if (await ProcessDefaultVolumeOfInterestAsync())
             {
                 m_DataStreamer.StreamingStateChanged -= OnStreamingStateChanged;
@@ -77,77 +124,21 @@ async void OnStreamingStateChanged(StreamingState state)
 
         async Task<bool> ProcessDefaultVolumeOfInterestAsync()
         {
-            var result = false;
-            VolumeOfInterest prevVolume = new();
+            var v = await m_DataStreamer.GetDefaultVolumeOfInterestAsync();
+            
+            if (m_StreamingCamera == null) // Camera might have been destroyed since last loop.
+                return false;
 
-            for (var i = 0; i < m_VolumeProcessingIterations; ++i)
-            {
-                var v = await m_DataStreamer.GetDefaultVolumeOfInterestAsync();
-                if (v != prevVolume)
-                {
-                    prevVolume = v;
-
-                    if (m_StreamingCamera == null) // Camera might have been destroyed since last loop.
-                        return false;
-
-                    SetView(v.Bounds, m_StreamingCamera);
-
-                    await Task.Delay(m_VolumeProcessingDelay);
-                }
-                else
-                {
-                    result = true;
-                }
-            }
+            SetView(v.Bounds, m_StreamingCamera);
 
-            return result;
+            return true;
         }
 
         void SetView(Bounds bounds, Camera cam)
         {
-            var (position, rotation) = CameraUtilities.CalculateViewFitPosition(bounds, m_PitchAngle, m_BoundsFillRatio,
-                cam.fieldOfView, cam.aspect);
-
+             var (position, rotation) = m_DataStreamBound.CalculateViewFitPosition(bounds, m_PitchAngle,
+                 m_BoundsFillRatio, cam);
             m_NavigationManager.TryTeleport(position, rotation);
         }
     }
-
-    public static class CameraUtilities
-    {
-        public static (Vector3 position, Vector3 eulerAngles) CalculateViewFitPosition(Bounds bounds, float pitch, float fillRatio, float fieldOfView, float aspectRatio)
-        {
-            var desiredEuler = new Vector3(pitch, 0, 0);
-            var distanceFromCenter = GetDistanceFromCenterToFit(bounds, fillRatio, fieldOfView, aspectRatio);
-            var position = bounds.center - distanceFromCenter * (Quaternion.Euler(desiredEuler) * Vector3.forward);
-
-            return (position, desiredEuler);
-        }
-
-        static float GetDistanceFromCenterToFit(Bounds bb, float fillRatio, float fovY, float aspectRatio)
-        {
-            var fovX = GetHorizontalFov(fovY, aspectRatio);
-            var distanceToFitXAxisInView = GetDistanceFromCenter(bb, bb.extents.x, fovX, fillRatio);
-            var distanceToFitYAxisInView = GetDistanceFromCenter(bb, bb.extents.y, fovY, fillRatio);
-
-            return Mathf.Max(distanceToFitXAxisInView, distanceToFitYAxisInView);
-        }
-
-        static float GetHorizontalFov(float fovY, float aspectRatio)
-        {
-            var ratio = Mathf.Tan(Mathf.Deg2Rad * (fovY / 2.0f));
-            return Mathf.Rad2Deg * Mathf.Atan(ratio * aspectRatio) * 2.0f;
-        }
-
-        static float GetDistanceFromCenter(Bounds bb, float opposite, float fov, float fillRatio)
-        {
-            var lookAt = bb.center;
-
-            var angle = fov / 2.0f;
-            var ratio = Mathf.Tan(Mathf.Deg2Rad * angle);
-            var adjacent = opposite / ratio;
-            var distanceFromLookAt = lookAt.z - bb.min.z + adjacent / fillRatio;
-
-            return distanceFromLookAt;
-        }
-    }
 }