Merge pull request #248 from Kapim/master

fixes regarding meshes processing

Author: ZdenekM

arcor2_AREditor/Assets/BASE/Scripts/DataHelper.cs

@@ -5,13 +5,13 @@ public static class DataHelper {
     // Start is called before the first frame update
 
     public static IO.Swagger.Model.Position Vector3ToPosition(Vector3 vector) {
-        return new IO.Swagger.Model.Position((decimal) vector.x, (decimal) vector.y, (decimal) vector.z);
+        return new IO.Swagger.Model.Position(x: (decimal) vector.x, y: (decimal) vector.y, z: (decimal) vector.z);
     }
 
     public static Vector3 PositionToVector3(IO.Swagger.Model.Position position) => new Vector3((float) position.X, (float) position.Y, (float) position.Z);
 
     public static IO.Swagger.Model.Orientation QuaternionToOrientation(Quaternion quaternion) {
-        return new IO.Swagger.Model.Orientation((decimal) quaternion.w, (decimal) quaternion.x, (decimal) quaternion.y, (decimal) quaternion.z);
+        return new IO.Swagger.Model.Orientation(w: (decimal) quaternion.w, x: (decimal) quaternion.x, y: (decimal) quaternion.y, z: (decimal) quaternion.z);
     }
 
     public static Quaternion OrientationToQuaternion(IO.Swagger.Model.Orientation orientation) => new Quaternion((float) orientation.X, (float) orientation.Y, (float) orientation.Z, (float) orientation.W);

arcor2_AREditor/Assets/BASE/Scripts/MeshImporter.cs

@@ -67,7 +67,7 @@ private void ImportMesh(string path, string aoId) {
             AssetLoaderOptions assetLoaderOptions = AssetLoader.CreateDefaultLoaderOptions();
             AssetLoader.LoadModelFromFile(path, null, delegate (AssetLoaderContext assetLoaderContext) {
                 if (Path.GetExtension(path).ToLower() == ".stl") {
-                    assetLoaderContext.RootGameObject.transform.Rotate(0f, 180f, 0f); // TODO kinali hacked version had 0, 90f, 0
+                    assetLoaderContext.RootGameObject.transform.Rotate(0f, 90f, 0f);
                 }
 
                 OnMeshImported?.Invoke(this, new ImportedMeshEventArgs(assetLoaderContext.WrapperGameObject, aoId));
@@ -85,7 +85,8 @@ private void ImportMesh(string path, string aoId) {
     private IEnumerator DownloadMesh(string meshId, string fileName, string aoId) {
 
         //Debug.LogError("MESH: download started");
-        string uri = MainSettingsMenu.Instance.GetProjectServiceURI() + fileName;
+        string uri = MainSettingsMenu.Instance.GetAssetFileURI(fileName);
+        Debug.LogError(uri);
         using (UnityWebRequest www = UnityWebRequest.Get(uri)) {
             // Request and wait for the desired page.
             yield return www.Send();
@@ -200,7 +201,8 @@ public bool CheckIfNewerRobotModelExists(string meshId, string fileName) {
             return CanIDownload(meshId);
         }
 
-        string uri = MainSettingsMenu.Instance.GetProjectServiceURI() + fileName;
+        string uri = MainSettingsMenu.Instance.GetAssetFileURI(fileName);
+
         DateTime downloadedZipLastModified = meshFileInfo.LastWriteTime;
         try {
             HttpWebRequest httpWebRequest = (HttpWebRequest) WebRequest.Create(uri);

arcor2_AREditor/Assets/BASE/Scripts/URDF/UrdfManager.cs

@@ -40,7 +40,7 @@ public IEnumerator DownloadUrdfPackage(string robotType, string fileName) {
         //GameManager.Instance.SetTurboFramerate();
 
         //Debug.Log("URDF: download started");
-        string uri = MainSettingsMenu.Instance.GetProjectServiceURI() + fileName;
+        string uri = MainSettingsMenu.Instance.GetAssetFileURI(fileName);
         UnityWebRequest www;
         try {
             www = UnityWebRequest.Get(uri);
@@ -261,7 +261,7 @@ public bool CheckIfNewerRobotModelExists(string robotType, string fileName) {
             // Check whether downloading can be started and start it, if so.
             return CanIDownload(fileName);
         }
-        string uri = MainSettingsMenu.Instance.GetProjectServiceURI() + fileName;
+        string uri = MainSettingsMenu.Instance.GetAssetFileURI(fileName);
         try {
             HttpWebRequest httpWebRequest = (HttpWebRequest) WebRequest.Create(uri);
             HttpWebResponse httpWebResponse = (HttpWebResponse) httpWebRequest.GetResponse();