diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 9d5f6c76..d5a41dfd 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -4755,6 +4755,7 @@ MonoBehaviour: TrackingLostAnimation: {fileID: 1311245634} UsingCloudAnchors: 0 WorldAnchorLocal: {fileID: 0} + WorldAnchorCloud: {fileID: 0} worldAnchorVis: {fileID: 0} MarkerPositionGameObject: {fileID: 1244592743491135387, guid: b2e18c9dae9ba5546b1c86346c9f6f30, type: 3} @@ -6044,7 +6045,7 @@ PrefabInstance: - target: {fileID: 87981385385152244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.3453064 + value: 0 objectReference: {fileID: 0} - target: {fileID: 106852607535154243, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14817,7 +14818,7 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14827,7 +14828,7 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24024,7 +24025,7 @@ PrefabInstance: - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2510 objectReference: {fileID: 0} - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24079,7 +24080,7 @@ PrefabInstance: - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24249,7 +24250,7 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24259,7 +24260,7 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -25489,7 +25490,7 @@ PrefabInstance: - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 500.5 objectReference: {fileID: 0} - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28556,7 +28557,7 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28566,7 +28567,7 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -30707,7 +30708,7 @@ PrefabInstance: - target: {fileID: 4284256760954197118, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.3453064 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4298774063199532215, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33335,7 +33336,7 @@ PrefabInstance: - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33460,7 +33461,7 @@ PrefabInstance: - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2510 objectReference: {fileID: 0} - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33615,7 +33616,7 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33625,7 +33626,7 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -34739,7 +34740,7 @@ PrefabInstance: - target: {fileID: 4930667918162148989, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.3453064 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4943997337859903948, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -37444,7 +37445,7 @@ PrefabInstance: - target: {fileID: 5490803365081734483, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.2848816 + value: 0.000030517578 objectReference: {fileID: 0} - target: {fileID: 5492740684693681697, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44568,7 +44569,7 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 550 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44578,7 +44579,7 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 275 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47491,7 +47492,7 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47501,7 +47502,7 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47526,7 +47527,7 @@ PrefabInstance: - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2510 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47556,7 +47557,7 @@ PrefabInstance: - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48778,7 +48779,7 @@ PrefabInstance: - target: {fileID: 7589595337822160752, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.2848816 + value: 0.000030517578 objectReference: {fileID: 0} - target: {fileID: 7591117941597656008, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -59225,7 +59226,7 @@ PrefabInstance: - target: {fileID: 9002926896675279027, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.3453064 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9004286367571080641, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -63639,12 +63640,12 @@ PrefabInstance: - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63654,7 +63655,7 @@ PrefabInstance: - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63664,7 +63665,7 @@ PrefabInstance: - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40 objectReference: {fileID: 0} - target: {fileID: 2778343470237480206, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63719,27 +63720,27 @@ PrefabInstance: - target: {fileID: 2778343470344581858, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470344581858, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470344581858, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1405 objectReference: {fileID: 0} - target: {fileID: 2778343470344581858, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 702.5 objectReference: {fileID: 0} - target: {fileID: 2778343470344581858, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40 objectReference: {fileID: 0} - target: {fileID: 2780533445710911713, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs b/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs index 92236744..09869128 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs @@ -629,8 +629,7 @@ private void FrameReceived(ARCameraFrameEventArgs arCameraArgs) { } public IEnumerator CalibrateUsingServerAsync(Action callback = null, bool inverse = false, bool autoCalibrate = false, bool force = false, bool showNotification = false) { - Debug.Log("Calibrating using server"); - + if (!ARCameraManager.TryGetIntrinsics(out XRCameraIntrinsics cameraIntrinsics)) { callback?.Invoke(false); yield break; @@ -784,7 +783,6 @@ public async void GetMarkerPosition(CameraParameters cameraParams, string image, } catch (RequestFailedException ex) { markerDetectionState = MarkerDetectionState.Failure; - Debug.Log("No markers visible"); if (showNotification) { Notifications.Instance.ShowNotification("No markers visible", "Find some markers and try again."); }