Merge branch 'develop'

Author: jim-bcom

Assets/Plugins/WSA/ARM64/SolARHololens2UnityPlugin.dll

@@ -144,16 +144,6 @@ private byte[] convertToPNG(ImageLayout imLayout,
             public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,
                 uint imWidth, uint imHeight, byte[] imData, double[] pose, ImageCompression imageCompression)
             {
-
-                // System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch();
-                // stopWatch.Start();
-                // byte[] imDataPng = encodeToPNG(imWidth, imHeight, imLayout, imData);
-                // byte[] imDataPng = convertToPNG(imLayout, imWidth, imHeight, imData);
-                byte[] imDataPng = imData;
-                // stopWatch.Stop();
-                // manager.SendMessage("encodeToPNG duration: " + stopWatch.ElapsedMilliseconds + "(" + imDataPng.Length + " bytes)");
-                
-
                 frame = new Frame
                 {
                     SensorId = sensorId,
@@ -163,8 +153,7 @@ public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,
                         Layout = imLayout,
                         Width = imWidth,
                         Height = imHeight,
-                        Data = ByteString.CopyFrom(imDataPng),
-                        // Data = UnsafeByteOperations.UnsafeWrap(imDataPng),
+                        Data = ByteString.CopyFrom(imData),
                         ImageCompression = imageCompression
                     },
                     Pose = new Matrix4x4

Assets/Plugins/WSA/ARM64/SolARHololens2UnityPlugin.winmd

@@ -334,7 +334,7 @@ private void NotifyOnReset()
             => OnReset?.Invoke();
 
 #if ENABLE_WINMD_SUPPORT
-        SpatialCoordinateSystem origin;
+        SpatialCoordinateSystem spatialCoordinateSystem;
 #endif
 
         SolArCloudHololens2()
@@ -386,11 +386,8 @@ void Start()
 
 #if ENABLE_WINMD_SUPPORT
 
-        origin = PerceptionInterop.GetSceneCoordinateSystem(UnityEngine.Pose.identity) as SpatialCoordinateSystem;
-        System.Numerics.Matrix4x4? m = origin.TryGetTransformTo(origin);
-
-//        IntPtr ptr = Marshal.GetIUnknownForObject(origin);
-//        researchMode.SetSpatialCoordinateSystem(ptr);
+        spatialCoordinateSystem = PerceptionInterop.GetSceneCoordinateSystem(UnityEngine.Pose.identity) as SpatialCoordinateSystem;
+        researchMode.SetSpatialCoordinateSystem(spatialCoordinateSystem);
 
 		if ( enabledSensors[Hl2SensorType.PV] )
 		{
@@ -419,7 +416,6 @@ void Start()
 
 		researchMode.Init();
 
-        researchMode.SetSpatialCoordinateSystem(origin);
 #endif
 
             if (solarScene == null)
@@ -729,7 +725,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi
                     byte[] vclBufferData = null;
 
 #if ENABLE_WINMD_SUPPORT
-			    vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None, origin /* PerceptionInterop.GetSceneCoordinateSystem(UnityEngine.Pose.identity) as SpatialCoordinateSystem*/);
+			    vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None);
 #endif
                     if (vclBufferData != null)
                     {

Assets/SolAR/Demos/Sample/Scenes/SolARHololens2SampleScene.unity

@@ -128,7 +128,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.6.0
+  bundleVersion: 0.7.0
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
@@ -280,6 +280,8 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   - {fileID: 8098013011867456620, guid: 892250fbfc1442f49a66d62b6c348e31, type: 2}
   - {fileID: 2256912601668067897, guid: bc86b981421586743bee1b33317fbc8a, type: 2}
   - {fileID: 0}
@@ -773,7 +775,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: SolARDemo
-  metroPackageVersion: 0.6.0.0
+  metroPackageVersion: 0.7.0.0
   metroCertificatePath: Assets\WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: DefaultCompany
@@ -794,7 +796,7 @@ PlayerSettings:
     2228424: Assets/SolAR/Demos/Objects/solarLogo_620x620.png
     2293860: Assets/SolAR/Demos/Objects/solarLogo_310x150.png
     2293960: Assets/SolAR/Demos/Objects/solarLogo_620x300.png
-  metroTileShortName: SolARHololens2
+  metroTileShortName: DevSolARHololens2
   metroTileShowName: 0
   metroMediumTileShowName: 0
   metroLargeTileShowName: 0
@@ -820,9 +822,6 @@ PlayerSettings:
       PrivateNetworkClientServer: True
       InternetClientServer: True
       VideosLibrary: False
-      Objects3D: False
-      Proximity: False
-      RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
       UserDataTasks: False
@@ -843,10 +842,9 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: True
+      Proximity: False
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: True

Assets/SolAR/Prefab/SolARCloudHololens2SampleUi.prefab

@@ -1,5 +1,9 @@
 # Release Notes
 
+# v0.7.0
+* Change sharing of SpatialCoordinateSystem object between Unity and native plugin so that it works with PV camera as well.
+* Make a prefab for the simple GUI.
+
 ## v0.6.0
 * Fix accuracy issues due the use of different coordinate system origin between Unity application and native plugin: the origin used in Unity is now shared between the two.
 * Fix pose errors due to wrong computation for the correction of the pose received from SolAR.