Commit ebbecbf8 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Type changed for matrix4x4 conversion

parent 02e1a1e9

Runtime/Scripts/WorldAnalysisARFoundation.cs

+5 −5
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class WorldAnalysisARFoundation : MonoBehaviour, WorldAnalysisInterface 
                        continue;

                    }



                    Matrix4x4 tr = WorldAnalysisUnityHelper.ConvertETSIARFTransform3DToUnity(firstRelocInfo.Transform3D);

                    Matrix4x4 tr = WorldStorageUnityHelper.ConvertETSIARFTransform3DToUnity(firstRelocInfo.Transform3D);  // Changed to WS / SylR

                    UnityEngine.Vector3 tr_trans = WorldAnalysisUnityHelper.ExtractTranslationFromMatrix(tr);

                    UnityEngine.Quaternion tr_rot = WorldAnalysisUnityHelper.ExtractRotationFromMatrix(tr);
@@ -395,10 +395,10 @@ public class WorldAnalysisARFoundation : MonoBehaviour, WorldAnalysisInterface 




            /// Collect relocalization information

            ETSI.ARF.OpenAPI.WorldStorage.Response response = RelocalizationInformationRequest.GetRelocalizationInformation(m_worldStorageServer, uuids, modes, capabilities);

            ETSI.ARF.OpenAPI.WorldStorage.RelocalizationInformations response = RelocalizationInformationRequest.GetRelocalizationInformation(m_worldStorageServer, uuids, modes, capabilities);

            if(response == null)

            {

                Debug.Log("ESTI ARF GetRelocalizationInformation : request response is null");

                Debug.Log("ETSI ARF GetRelocalizationInformation : request response is null");

            }

            relocInfo = response.RelocInfo.First(); //Only one uuid requested

        }
@@ -449,7 +449,7 @@ public class WorldAnalysisARFoundation : MonoBehaviour, WorldAnalysisInterface 
            l_modes.Add(Mode_WorldStorage.TRACKABLES_TO_REQUEST);

        }

        /// Collect relocalization information

        ETSI.ARF.OpenAPI.WorldStorage.Response response = RelocalizationInformationRequest.GetRelocalizationInformation(m_worldStorageServer, l_uuids, l_modes, capabilities);

        ETSI.ARF.OpenAPI.WorldStorage.RelocalizationInformations response = RelocalizationInformationRequest.GetRelocalizationInformation(m_worldStorageServer, l_uuids, l_modes, capabilities);



        /// Check every reloc information object

        foreach (RelocalizationInformation relocInfo in response.RelocInfo)
@@ -506,7 +506,7 @@ public class WorldAnalysisARFoundation : MonoBehaviour, WorldAnalysisInterface 
        }

    }



    public InformationSubscriptionResult UnSubscribeToPose(Guid subscriptionUUID)

    public InformationSubscriptionResult UnsubscribeFromPose(Guid subscriptionUUID)

    {

        if (m_subscriptionsPoses.ContainsKey(subscriptionUUID))

        {