fixed issues with model bounding box showing in play mode

WEKIT-ECS · Sep 11, 2023 · 26c5952 · 26c5952
1 parent d8aed33
commit 26c5952
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/Assets/MirageXR/Common/Scripts/Sketchfab/SketchfabManager.cs b/Assets/MirageXR/Common/Scripts/Sketchfab/SketchfabManager.cs
@@ -541,7 +541,7 @@ public static IEnumerator GetModelDownloadInfo(string token, ModelPreviewItem mo
             }
             else
             {
-                DialogWindow.Instance.Show("Error downloading model, try re-logging in");
+                DialogWindow.Instance.Show("Error downloading model, try re-logging in", new DialogButtonContent("Ok"));
 
                 Debug.Log(www.error);
             }

diff --git a/Assets/MirageXR/Player/Scripts/Augmentations/Model/Model.cs b/Assets/MirageXR/Player/Scripts/Augmentations/Model/Model.cs
@@ -18,13 +18,6 @@ public class Model : MirageXRPrefab
 
         public ToggleObject MyToggleObject => _obj;
 
-        private ObjectManipulator objectManipulator;
-
-        private void Awake()
-        {
-            objectManipulator = gameObject.GetComponent<ObjectManipulator>() ? gameObject.GetComponent<ObjectManipulator>() : gameObject.AddComponent<ObjectManipulator>();
-        }
-
         private void Start()
         {
             Subscribe();
@@ -203,8 +196,6 @@ private void InitManipulators()
                     gridManager.onTranslateStopped?.Invoke(boundsControl.Target);
                     poiEditor.OnChanged();
                 });
-
-                boundsControl.enabled = !_obj.positionLock;
             }
         }
 
@@ -350,8 +341,6 @@ private void OnLock(string id, bool locked)
             {
                 _obj.positionLock = locked;
 
-                objectManipulator.enabled = !_obj.positionLock;
-
                 var poiEditor = GetComponentInParent<PoiEditor>();
 
                 if (poiEditor)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    DialogWindow.Instance.Show("Error downloading model, try re-logging in");
+                    DialogWindow.Instance.Show("Error downloading model, try re-logging in", new DialogButtonContent("Ok"));
                     Debug.Log(www.error);
                 }
@@ Expand Down @@