Merge pull request #133 from Kapim/devel

Devel
robofit · Jun 1, 2020 · 778c842 · 778c842
2 parents 4432ccc + 062ebdc
commit 778c842
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 172 deletions.
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs
@@ -411,6 +411,7 @@ public async void BuildAndRunPackage(string name) {
 
         } else {
             Base.Notifications.Instance.ShowNotification("Failed to build and run package", "");
+            GameManager.Instance.HideLoadingScreen();
         }
     }
 

diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs
@@ -852,13 +852,15 @@ public async Task<bool> BuildAndRunPackage(string name) {
                 if (!result.Success) {
                     Notifications.Instance.ShowNotification("Failed to build and run package", result.Message);
                     reopenProjectId = null;
+                    HideLoadingScreen();
                     return false;
                 }
                 await LoadPackages();
                 await WebsocketManager.Instance.RunPackage(packageId);
                 return true;
             } catch (RequestFailedException ex) {
                 Notifications.Instance.ShowNotification("Failed to build and run package", ex.Message);
+                HideLoadingScreen();
                 return false;
             } finally {
             }

diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab
@@ -208,7 +208,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1c0ad0e8e55c95c4e931911c4b943a64, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  space: 0
+  space: 1
   transformType: 0
   pivot: 0
   centerType: 0
@@ -221,6 +221,7 @@ MonoBehaviour:
   SetPivotModeToggle: 0
   SetCenterTypeToggle: 0
   SetScaleTypeToggle: 0
+  translationSnapping: 306
   AddSelection: 0
   RemoveSelection: 0
   ActionKey: 0
@@ -233,6 +234,9 @@ MonoBehaviour:
   selectedColor: {r: 1, g: 1, b: 0, a: 0.8}
   hoverColor: {r: 1, g: 0.75, b: 0, a: 0.8}
   planesOpacity: 0.5
+  movementSnap: 0.25
+  rotationSnap: 15
+  scaleSnap: 1
   handleLength: 0.25
   handleWidth: 0.003
   planeSize: 0.035
-Original file line number
+Diff line change
@@ Expand Up / @@ -411,6 +411,7 @@ public async void BuildAndRunPackage(string name) { @@
             } else {
                 Base.Notifications.Instance.ShowNotification("Failed to build and run package", "");
+                GameManager.Instance.HideLoadingScreen();
             }
         }
@@ Expand Down @@