From 8577bd3128f5668f0a634c423dee938c6aaa7587 Mon Sep 17 00:00:00 2001 From: Michal Kapinus Date: Fri, 18 Oct 2024 15:01:15 +0200 Subject: [PATCH] feat: compatibility with Unity 2022.3.41 and ARFoundation 5.1.5 --- .../BASE/Scripts/URDF/RobotActionObject.cs | 1 - .../Assets/Plugins/Android/proguard-user.txt | 7 + ...rigin.prefab => ARSessionOriginNew.prefab} | 634 +++++++------- ...ab.meta => ARSessionOriginNew.prefab.meta} | 2 +- .../Assets/TABLET/Scenes/TabletGUI.unity | 789 ++++++++---------- .../TABLET/Scripts/AR/CalibrationManager.cs | 2 +- .../Assets/TABLET/Scripts/GUI/Sight.cs | 1 - .../XRSimulationRuntimeSettings.asset | 7 + .../XRSimulationRuntimeSettings.asset.meta | 2 +- .../XRSimulationPreferences.asset.meta | 2 +- arcor2_AREditor/Packages/manifest.json | 18 +- arcor2_AREditor/Packages/packages-lock.json | 57 +- .../ProjectSettings/GvhProjectSettings.xml | 1 + .../ProjectSettings/ProjectSettings.asset | 21 +- .../ProjectSettings/ProjectVersion.txt | 4 +- 15 files changed, 722 insertions(+), 826 deletions(-) rename arcor2_AREditor/Assets/TABLET/Prefabs/{AR Session Origin.prefab => ARSessionOriginNew.prefab} (66%) rename arcor2_AREditor/Assets/TABLET/Prefabs/{AR Session Origin.prefab.meta => ARSessionOriginNew.prefab.meta} (74%) diff --git a/arcor2_AREditor/Assets/BASE/Scripts/URDF/RobotActionObject.cs b/arcor2_AREditor/Assets/BASE/Scripts/URDF/RobotActionObject.cs index 996df2ce8..4d06fbb2e 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/URDF/RobotActionObject.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/URDF/RobotActionObject.cs @@ -9,7 +9,6 @@ using RosSharp.Urdf; using TMPro; using UnityEngine; -using static UnityEditor.Recorder.OutputPath; namespace Base { diff --git a/arcor2_AREditor/Assets/Plugins/Android/proguard-user.txt b/arcor2_AREditor/Assets/Plugins/Android/proguard-user.txt index 32b64b377..9d039db0c 100644 --- a/arcor2_AREditor/Assets/Plugins/Android/proguard-user.txt +++ b/arcor2_AREditor/Assets/Plugins/Android/proguard-user.txt @@ -5,3 +5,10 @@ -keep class com.unity3d.plugin.* { *; } ### Module Progurad Rules ends ### + +### Module Progurad Rules starts ### + +## Default ## +-keep class com.unity3d.plugin.* { *; } + +### Module Progurad Rules ends ### diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab similarity index 66% rename from arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab rename to arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab index 28908377f..749ed9a37 100644 --- a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab +++ b/arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1542303085 +--- !u!1 &1651091398740839864 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,244 +8,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1542303086} - - component: {fileID: 1542303088} - - component: {fileID: 1542303087} - - component: {fileID: 4216866555721590601} + - component: {fileID: 3053920680162745298} m_Layer: 0 - m_Name: CameraAddons - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1542303086 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1542303085} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7694872491458505932} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1542303088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1542303085} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3da0e2b6e0b820d4e897be221648044e, type: 3} - m_Name: - m_EditorClassIdentifier: - ControlWithMouseOnly: 1 - CameraRotationSpeed: 4 - WalkingSpeed: 5 - zoomSpeed: 2 - dragSpeed: 4 ---- !u!114 &1542303087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1542303085} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0ff1a69b00cf624bbf15409690bbef0, type: 3} - m_Name: - m_EditorClassIdentifier: - showMain: 1 - showSub: 1 - showAxis: 1 - gridSizeX: 6 - gridSizeY: 0 - gridSizeZ: 6 - smallStep: 0.1 - largeStep: 1 - startX: -3 - startY: 0 - startZ: -3 - mainColor: {r: 0.10980392, g: 0.50980395, b: 0.69803923, a: 1} - subColor: {r: 0.08627451, g: 0.31764707, b: 0.32156864, a: 1} ---- !u!114 &4216866555721590601 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1542303085} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2f8785f381fc6a54d8dae25eae6f4dd6, type: 3} - m_Name: - m_EditorClassIdentifier: - InitialPosition: {x: 0, y: 1.5, z: 2} - InitialRotation: {x: 45, y: -180, z: 0} ---- !u!1 &1704717925647586395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8515770607326247076} - - component: {fileID: 7162692103421295487} - - component: {fileID: 4432355524544093521} - - component: {fileID: 1343991523756174936} - m_Layer: 0 - m_Name: Cone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8515770607326247076 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1704717925647586395} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7694872491458505932} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7162692103421295487 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1704717925647586395} - m_Mesh: {fileID: 0} ---- !u!23 &4432355524544093521 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1704717925647586395} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1343991523756174936 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1704717925647586395} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!1 &2563061363361773156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8227296246521771578} - m_Layer: 0 - m_Name: AR Offset + m_Name: VR Camera Wrapper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8227296246521771578 +--- !u!4 &3053920680162745298 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2563061363361773156} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7694872491458505932} - m_Father: {fileID: 7694872492407101043} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4944955270593107803 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5434502302806989883} - m_Layer: 0 - m_Name: VR Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5434502302806989883 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4944955270593107803} + m_GameObject: {fileID: 1651091398740839864} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -779.265, y: -372.34174, z: -13.21755} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2740797662107980249} - m_Father: {fileID: 7694872492407101043} - m_RootOrder: 1 + - {fileID: 8300900420714390028} + m_Father: {fileID: 3690177545664227728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5418191720604352399 +--- !u!1 &2613820105258955758 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -253,73 +40,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2740797662107980249} - - component: {fileID: 765537260474209038} + - component: {fileID: 9202466047961322422} m_Layer: 0 - m_Name: VR Camera + m_Name: Offset m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2740797662107980249 +--- !u!4 &9202466047961322422 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5418191720604352399} + m_GameObject: {fileID: 2613820105258955758} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5434502302806989883} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4499194260188754764} + m_Father: {fileID: 3690177545664227728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &765537260474209038 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5418191720604352399} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.03 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!1 &7694872491458505929 +--- !u!1 &3692039763034334096 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -327,42 +72,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7694872491458505932} - - component: {fileID: 7694872491458505928} - - component: {fileID: 7313577448931428177} - - component: {fileID: 7694872491458505934} - - component: {fileID: 7694872491458505935} + - component: {fileID: 4499194260188754764} + - component: {fileID: 6051669135588813576} + - component: {fileID: 4103113649673742561} + - component: {fileID: 316064681509943176} + - component: {fileID: 734985001107491441} m_Layer: 0 - m_Name: AR Camera + m_Name: Camera m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7694872491458505932 +--- !u!4 &4499194260188754764 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872491458505929} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 3692039763034334096} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8515770607326247076} - - {fileID: 1542303086} - - {fileID: 9195024543993869882} - m_Father: {fileID: 8227296246521771578} - m_RootOrder: 0 + - {fileID: 5398107315035239982} + - {fileID: 638063832315156336} + m_Father: {fileID: 9202466047961322422} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &7694872491458505928 +--- !u!20 &6051669135588813576 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872491458505929} + m_GameObject: {fileID: 3692039763034334096} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 @@ -370,9 +115,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -399,25 +152,13 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!114 &7313577448931428177 +--- !u!114 &4103113649673742561 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872491458505929} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6e3c44306fb1e439a9f18b2212b8ab70, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &7694872491458505934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872491458505929} + m_GameObject: {fileID: 3692039763034334096} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3} @@ -428,13 +169,14 @@ MonoBehaviour: m_AutoFocus: 0 m_LightEstimation: 0 m_FacingDirection: 1 ---- !u!114 &7694872491458505935 + m_RenderMode: 0 +--- !u!114 &316064681509943176 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872491458505929} + m_GameObject: {fileID: 3692039763034334096} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 816b289ef451e094f9ae174fb4cf8db0, type: 3} @@ -442,7 +184,25 @@ MonoBehaviour: m_EditorClassIdentifier: m_UseCustomMaterial: 0 m_CustomMaterial: {fileID: 0} ---- !u!1 &7694872492407101039 +--- !u!114 &734985001107491441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3692039763034334096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!1 &5773624735300281021 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -450,56 +210,61 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7694872492407101043} - - component: {fileID: 7694872492407101036} - - component: {fileID: 7694872492407101038} - - component: {fileID: 7694872492407101042} - - component: {fileID: 7694872492407101041} - - component: {fileID: 7694872492407101037} - - component: {fileID: 7694872492407101040} + - component: {fileID: 3690177545664227728} + - component: {fileID: 8631382557455855226} + - component: {fileID: 8915997990186067680} + - component: {fileID: 7998151888842820639} + - component: {fileID: 8565941316355258916} + - component: {fileID: 2845327057457690982} + - component: {fileID: 4987535155065776404} m_Layer: 0 - m_Name: AR Session Origin + m_Name: ARSessionOriginNew m_TagString: AR_MANAGERS m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7694872492407101043 +--- !u!4 &3690177545664227728 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 779.265, y: 372.34174, z: 13.21755} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8227296246521771578} - - {fileID: 5434502302806989883} + - {fileID: 9202466047961322422} + - {fileID: 3053920680162745298} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7694872492407101036 +--- !u!114 &8631382557455855226 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 520bb47c46cf8624fafb307b7d1b862a, type: 3} + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} m_Name: m_EditorClassIdentifier: - m_Camera: {fileID: 7694872491458505928} ---- !u!114 &7694872492407101038 + m_Camera: {fileID: 6051669135588813576} + m_OriginBaseGameObject: {fileID: 5773624735300281021} + m_CameraFloorOffsetObject: {fileID: 0} + m_RequestedTrackingOriginMode: 0 + m_CameraYOffset: 1.1176 +--- !u!114 &8915997990186067680 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4dea56a9eaadd1c439095de4f9a371cb, type: 3} @@ -507,16 +272,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_SerializedLibrary: {fileID: 11400000, guid: 3a31ef3bf7164194c921862a6e66c1d0, type: 2} - m_MaxNumberOfMovingImages: 1 + m_MaxNumberOfMovingImages: 0 m_TrackedImagePrefab: {fileID: 4476520058714655711, guid: 323d6551af1e8b6498377367ae54d218, type: 3} ---- !u!114 &7694872492407101042 +--- !u!114 &7998151888842820639 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 728ad7fae8e460a4ba41265c7308d757, type: 3} @@ -524,13 +289,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_AnchorPrefab: {fileID: 7803728040622184820, guid: 1fbe071d3397cfc459aca4ed1c6ae46f, type: 3} ---- !u!114 &7694872492407101041 +--- !u!114 &8565941316355258916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3} @@ -539,26 +304,26 @@ MonoBehaviour: m_PlanePrefab: {fileID: 543720357673358579, guid: 00917a2ba17812c40b77bec0bbde03c7, type: 3} m_DetectionMode: 1 ---- !u!114 &7694872492407101037 +--- !u!114 &2845327057457690982 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3} m_Name: m_EditorClassIdentifier: m_RaycastPrefab: {fileID: 0} ---- !u!114 &7694872492407101040 +--- !u!114 &4987535155065776404 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694872492407101039} + m_GameObject: {fileID: 5773624735300281021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7ab0e80cee9cc1d44928bfe488dd1e2d, type: 3} @@ -566,12 +331,186 @@ MonoBehaviour: m_EditorClassIdentifier: m_PointCloudPrefab: {fileID: 833777275137645504, guid: ce5808eb4f489bf4dbbd701f2e4ba1f4, type: 3} ---- !u!1001 &6120708084065565462 +--- !u!1 &8189856145763909967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5398107315035239982} + - component: {fileID: 2031936478704667910} + - component: {fileID: 3946838290130522611} + - component: {fileID: 8503258383297488393} + m_Layer: 0 + m_Name: CameraAddons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5398107315035239982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8189856145763909967} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -779.265, y: -372.34174, z: -13.21755} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4499194260188754764} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2031936478704667910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8189856145763909967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3da0e2b6e0b820d4e897be221648044e, type: 3} + m_Name: + m_EditorClassIdentifier: + ControlWithMouseOnly: 1 + CameraRotationSpeed: 4 + WalkingSpeed: 5 + zoomSpeed: 2 + dragSpeed: 4 +--- !u!114 &3946838290130522611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8189856145763909967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0ff1a69b00cf624bbf15409690bbef0, type: 3} + m_Name: + m_EditorClassIdentifier: + showMain: 1 + showSub: 1 + showAxis: 1 + gridSizeX: 6 + gridSizeY: 0 + gridSizeZ: 6 + smallStep: 0.1 + largeStep: 1 + startX: -3 + startY: 0 + startZ: -3 + mainColor: {r: 0.10980392, g: 0.50980395, b: 0.69803923, a: 1} + subColor: {r: 0.08627451, g: 0.31764707, b: 0.32156864, a: 1} +--- !u!114 &8503258383297488393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8189856145763909967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f8785f381fc6a54d8dae25eae6f4dd6, type: 3} + m_Name: + m_EditorClassIdentifier: + InitialPosition: {x: 0, y: 1.5, z: 2} + InitialRotation: {x: 45, y: -180, z: 0} +--- !u!1 &8770518155527301640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8300900420714390028} + - component: {fileID: 2088451069580624723} + m_Layer: 0 + m_Name: VR Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8300900420714390028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8770518155527301640} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3053920680162745298} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &2088451069580624723 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8770518155527301640} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.03 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!1001 &2571711676466141788 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7694872491458505932} + serializedVersion: 3 + m_TransformParent: {fileID: 4499194260188754764} m_Modifications: - target: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} @@ -601,17 +540,17 @@ PrefabInstance: - target: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} @@ -634,10 +573,13 @@ PrefabInstance: value: TabletVis objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f696a61212fc564ba4a44404462104f, type: 3} ---- !u!4 &9195024543993869882 stripped +--- !u!4 &638063832315156336 stripped Transform: m_CorrespondingSourceObject: {fileID: 3128406934459665708, guid: 1f696a61212fc564ba4a44404462104f, type: 3} - m_PrefabInstance: {fileID: 6120708084065565462} + m_PrefabInstance: {fileID: 2571711676466141788} m_PrefabAsset: {fileID: 0} diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab.meta b/arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab.meta similarity index 74% rename from arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab.meta rename to arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab.meta index 63e4cf09d..946c93cf6 100644 --- a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab.meta +++ b/arcor2_AREditor/Assets/TABLET/Prefabs/ARSessionOriginNew.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 917a61edd84946d4d84b396b6e2eefc8 +guid: 73054005d80101c4fa3bec338d5fe42f PrefabImporter: externalObjects: {} userData: diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index d80d25649..bfb0c6e99 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 952576527} - m_IndirectSpecularColor: {r: 0.44566113, g: 0.4949969, b: 0.57297516, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -391,11 +390,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6000098be4011544882ebd2697b8d610, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!64 &42421036 stripped -MeshCollider: - m_CorrespondingSourceObject: {fileID: 1343991523756174936, guid: 917a61edd84946d4d84b396b6e2eefc8, +--- !u!1 &36232440 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1651091398740839864, guid: 73054005d80101c4fa3bec338d5fe42f, type: 3} - m_PrefabInstance: {fileID: 1617425452} + m_PrefabInstance: {fileID: 6851988824816228754} m_PrefabAsset: {fileID: 0} --- !u!114 &51431703 stripped MonoBehaviour: @@ -1040,6 +1039,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1994642989} m_PrefabAsset: {fileID: 0} +--- !u!1 &290666336 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 638063832315156339, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} --- !u!1 &311940052 GameObject: m_ObjectHideFlags: 0 @@ -1130,9 +1135,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af0e1e1c47ab291448a99020a5afd9a0, type: 3} m_Name: m_EditorClassIdentifier: - VRCamera: {fileID: 1810644474} - ARCamera: {fileID: 1704561859} - ARCameraVis: {fileID: 1617425457} + VRCamera: {fileID: 1435869100} + ARCamera: {fileID: 1795339558} + ARCameraVis: {fileID: 290666336} GridPlane: {fileID: 169938987} CameraMoveJoystick: {fileID: 1994642991} CameraMoveUpJoystick: {fileID: 783345367} @@ -1409,10 +1414,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68de3b2ce71c55146bdb8537c098b1f6, type: 3} m_Name: m_EditorClassIdentifier: - ARPlaneManager: {fileID: 1617425455} - ARPointCloudManager: {fileID: 1430095120} - ARTrackedImageManager: {fileID: 1617425453} - ARAnchorManager: {fileID: 1617425456} + ARPlaneManager: {fileID: 824157215} + ARPointCloudManager: {fileID: 824157213} + ARTrackedImageManager: {fileID: 824157217} + ARAnchorManager: {fileID: 824157216} TrackingLostAnimation: {fileID: 1311245634} PlaneTransparentMaterial: {fileID: 2100000, guid: f1a110d32af21aa4d872c707dfcc6043, type: 2} @@ -2430,11 +2435,11 @@ Animator: type: 3} m_PrefabInstance: {fileID: 517122706} m_PrefabAsset: {fileID: 0} ---- !u!4 &556044552 stripped +--- !u!4 &567041416 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7694872491458505932, guid: 917a61edd84946d4d84b396b6e2eefc8, + m_CorrespondingSourceObject: {fileID: 9202466047961322422, guid: 73054005d80101c4fa3bec338d5fe42f, type: 3} - m_PrefabInstance: {fileID: 1617425452} + m_PrefabInstance: {fileID: 6851988824816228754} m_PrefabAsset: {fileID: 0} --- !u!1 &579514953 GameObject: @@ -2778,8 +2783,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Session: {fileID: 386295009} - SessionOrigin: {fileID: 1488888097} - CameraManager: {fileID: 1357711041} + Origin: {fileID: 824157218} + CameraManager: {fileID: 1795339560} ARCoreExtensionsConfig: {fileID: 11400000, guid: 126439c544148a64c8a5f7b926435432, type: 2} CameraConfigFilter: {fileID: 11400000, guid: 85087d22851ca2b4ea9963c6cd93a020, type: 2} @@ -2955,6 +2960,78 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fec2a5f0a3eec674391bc2d2984505d2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &824157213 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4987535155065776404, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ab0e80cee9cc1d44928bfe488dd1e2d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &824157214 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2845327057457690982, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &824157215 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8565941316355258916, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &824157216 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7998151888842820639, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 728ad7fae8e460a4ba41265c7308d757, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &824157217 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8915997990186067680, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4dea56a9eaadd1c439095de4f9a371cb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &824157218 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8631382557455855226, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &853396970 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7389811696381298902, guid: ce7fcaa9f2e51014ba31f987a92587f1, @@ -3016,14 +3093,14 @@ MonoBehaviour: - {fileID: 1311245631} - {fileID: 2104409735} - {fileID: 281650273} - - {fileID: 1617425460} - - {fileID: 1617425457} + - {fileID: 36232440} + - {fileID: 0} - {fileID: 783345365} - {fileID: 1994642995} - {fileID: 1994642994} GameObjectsForIOSOnly: [] GameObjectsForSTANDALONEOnly: - - {fileID: 1542303085} + - {fileID: 0} --- !u!4 &877604999 Transform: m_ObjectHideFlags: 0 @@ -3610,17 +3687,17 @@ PrefabInstance: - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 184.97 objectReference: {fileID: 0} - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3635,7 +3712,7 @@ PrefabInstance: - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -40.725 objectReference: {fileID: 0} - target: {fileID: 224809448130997376, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3755,17 +3832,17 @@ PrefabInstance: - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 144.97 objectReference: {fileID: 0} - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3780,7 +3857,7 @@ PrefabInstance: - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -39.225 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114999874459135732, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3922,36 +3999,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1357711041 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872491458505934, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &1419685486 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7721400276146817733, guid: 4829eff037f39bf4188d5061d0b11ab0, type: 3} m_PrefabInstance: {fileID: 2011160562} m_PrefabAsset: {fileID: 0} ---- !u!114 &1430095120 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101040, guid: 917a61edd84946d4d84b396b6e2eefc8, +--- !u!20 &1435869100 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 2088451069580624723, guid: 73054005d80101c4fa3bec338d5fe42f, type: 3} - m_PrefabInstance: {fileID: 1617425452} + m_PrefabInstance: {fileID: 6851988824816228754} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7ab0e80cee9cc1d44928bfe488dd1e2d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1440140995 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5042231566427439980, guid: ce7fcaa9f2e51014ba31f987a92587f1, @@ -4404,18 +4463,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1488888097 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101036, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 520bb47c46cf8624fafb307b7d1b862a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &1519921291 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, @@ -4498,12 +4545,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1542303085 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1542303085, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} --- !u!114 &1578442813 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1365060935555715070, guid: ce7fcaa9f2e51014ba31f987a92587f1, @@ -4516,188 +4557,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c26eead415070cc46b4de80820abd803, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1617425452 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1542303087, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1542303088, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4944955270593107803, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_Name - value: VR Camera Wrapper - objectReference: {fileID: 0} - - target: {fileID: 4944955270593107803, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7694872491458505928, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: near clip plane - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 7694872491458505929, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7694872491458505935, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7694872491458505938, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: objectRelativeTransform - value: - objectReference: {fileID: 311940053} - - target: {fileID: 7694872492407101039, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_Name - value: AR Session Origin - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101041, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_DetectionMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7694872492407101043, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9195024543993869881, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7694872491458505938, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} ---- !u!114 &1617425453 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101038, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4dea56a9eaadd1c439095de4f9a371cb, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1617425454 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101037, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1617425455 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101041, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1617425456 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694872492407101042, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 728ad7fae8e460a4ba41265c7308d757, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1617425457 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9195024543993869881, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1617425460 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4944955270593107803, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} --- !u!1 &1633447618 GameObject: m_ObjectHideFlags: 0 @@ -4742,23 +4601,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: add4e6a77a73e544f8bc499933d0cba3, type: 3} m_Name: m_EditorClassIdentifier: - ARSessionOrigin: {fileID: 1488888097} - ARAnchorManager: {fileID: 1617425456} - ARPlaneManager: {fileID: 1617425455} - ARRaycastManager: {fileID: 1617425454} - ARTrackedImageManager: {fileID: 1617425453} - ARPointCloudManager: {fileID: 1430095120} - ARCameraManager: {fileID: 1357711041} - ARCamera: {fileID: 556044552} + ARAnchorManager: {fileID: 824157216} + ARPlaneManager: {fileID: 824157215} + ARRaycastManager: {fileID: 824157214} + ARTrackedImageManager: {fileID: 824157217} + ARPointCloudManager: {fileID: 824157213} + ARCameraManager: {fileID: 1795339560} + ARCamera: {fileID: 1795339562} WorldAnchorPrefab: {fileID: 7803728040622184820, guid: 1fbe071d3397cfc459aca4ed1c6ae46f, type: 3} TrackingLostAnimation: {fileID: 1311245634} UsingCloudAnchors: 0 WorldAnchorLocal: {fileID: 0} + WorldAnchorCloud: {fileID: 0} worldAnchorVis: {fileID: 0} MarkerPositionGameObject: {fileID: 1244592743491135387, guid: b2e18c9dae9ba5546b1c86346c9f6f30, type: 3} - AROfsset: {fileID: 2057465950} + AROfsset: {fileID: 567041416} AutoRecalibrateTime: 120 --- !u!114 &1636584856 stripped MonoBehaviour: @@ -5056,12 +4915,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fec2a5f0a3eec674391bc2d2984505d2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!20 &1704561859 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 7694872491458505928, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} --- !u!114 &1709869951 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 706261665658080197, guid: ce7fcaa9f2e51014ba31f987a92587f1, @@ -5246,6 +5099,30 @@ MonoBehaviour: text: {fileID: 190841679} btn: {fileID: 1720267180} fitter: {fileID: 1664456698} +--- !u!20 &1795339558 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 6051669135588813576, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1795339560 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4103113649673742561, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1795339562 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4499194260188754764, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + m_PrefabInstance: {fileID: 6851988824816228754} + m_PrefabAsset: {fileID: 0} --- !u!1 &1804142158 GameObject: m_ObjectHideFlags: 0 @@ -5392,12 +5269,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 ---- !u!20 &1810644474 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 765537260474209038, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} --- !u!1 &1815563878 GameObject: m_ObjectHideFlags: 0 @@ -12143,12 +12014,12 @@ PrefabInstance: - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -12158,12 +12029,12 @@ PrefabInstance: - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.5172 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -706.13873 objectReference: {fileID: 0} - target: {fileID: 1127243555159149967, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14807,12 +14678,12 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14832,7 +14703,7 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -520 objectReference: {fileID: 0} - target: {fileID: 1657306220089949503, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -21521,17 +21392,17 @@ PrefabInstance: - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -21546,7 +21417,7 @@ PrefabInstance: - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -212.525 objectReference: {fileID: 0} - target: {fileID: 2873880366526128012, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22824,12 +22695,12 @@ PrefabInstance: - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22839,12 +22710,12 @@ PrefabInstance: - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.5172 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -656.13873 objectReference: {fileID: 0} - target: {fileID: 3095204741490621554, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22910,17 +22781,17 @@ PrefabInstance: - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22935,7 +22806,7 @@ PrefabInstance: - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 3095204741874235018, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22982,12 +22853,12 @@ PrefabInstance: - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -23007,7 +22878,7 @@ PrefabInstance: - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -279.835 objectReference: {fileID: 0} - target: {fileID: 3095204742360027977, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24039,12 +23910,12 @@ PrefabInstance: - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24054,12 +23925,12 @@ PrefabInstance: - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 2609.517 + value: 2680.1401 objectReference: {fileID: 0} - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1405.1387 objectReference: {fileID: 0} - target: {fileID: 3281146438025174257, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24089,17 +23960,17 @@ PrefabInstance: - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24114,7 +23985,7 @@ PrefabInstance: - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -55.64 objectReference: {fileID: 0} - target: {fileID: 3281146438198352464, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24269,12 +24140,12 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24294,7 +24165,7 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -266.64 objectReference: {fileID: 0} - target: {fileID: 3281146439633971036, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -25504,12 +25375,12 @@ PrefabInstance: - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -25524,7 +25395,7 @@ PrefabInstance: - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -299 objectReference: {fileID: 0} - target: {fileID: 3349931142655474258, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28596,12 +28467,12 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28621,7 +28492,7 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -310 objectReference: {fileID: 0} - target: {fileID: 3842307656692972769, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28891,12 +28762,12 @@ PrefabInstance: - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28906,12 +28777,12 @@ PrefabInstance: - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.5172 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -655.13873 objectReference: {fileID: 0} - target: {fileID: 3894373152632990978, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -29001,17 +28872,17 @@ PrefabInstance: - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -29026,7 +28897,7 @@ PrefabInstance: - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 3894373153281623112, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -29056,12 +28927,12 @@ PrefabInstance: - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -29081,7 +28952,7 @@ PrefabInstance: - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -174.83499 objectReference: {fileID: 0} - target: {fileID: 3897383095768747624, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31648,12 +31519,12 @@ PrefabInstance: - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31663,12 +31534,12 @@ PrefabInstance: - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.5172 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -656.13873 objectReference: {fileID: 0} - target: {fileID: 4488229724520827536, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31785,12 +31656,12 @@ PrefabInstance: - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31810,7 +31681,7 @@ PrefabInstance: - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -282.715 objectReference: {fileID: 0} - target: {fileID: 4488229725617315484, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31902,17 +31773,17 @@ PrefabInstance: - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31927,7 +31798,7 @@ PrefabInstance: - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.81 objectReference: {fileID: 0} - target: {fileID: 4488229725871366942, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33380,17 +33251,17 @@ PrefabInstance: - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33405,7 +33276,7 @@ PrefabInstance: - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -55.64 objectReference: {fileID: 0} - target: {fileID: 4717613570155323735, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33510,12 +33381,12 @@ PrefabInstance: - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33525,12 +33396,12 @@ PrefabInstance: - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 2609.517 + value: 2680.1401 objectReference: {fileID: 0} - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1405.1387 objectReference: {fileID: 0} - target: {fileID: 4717613571272357877, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33670,12 +33541,12 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33695,7 +33566,7 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -319.14 objectReference: {fileID: 0} - target: {fileID: 4717613571454393435, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -41592,17 +41463,17 @@ PrefabInstance: - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -41617,7 +41488,7 @@ PrefabInstance: - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 6334605764730844107, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44653,12 +44524,12 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44678,7 +44549,7 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -107 objectReference: {fileID: 0} - target: {fileID: 7045572396030017847, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44974,12 +44845,12 @@ PrefabInstance: - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44999,7 +44870,7 @@ PrefabInstance: - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -209.67 objectReference: {fileID: 0} - target: {fileID: 7078921980705206694, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47586,12 +47457,12 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47611,17 +47482,17 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -321.64 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47631,27 +47502,27 @@ PrefabInstance: - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 2609.517 + value: 2680.1401 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1405.1387 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47666,7 +47537,7 @@ PrefabInstance: - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -55.64 objectReference: {fileID: 0} - target: {fileID: 7475979444441642352, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48066,12 +47937,12 @@ PrefabInstance: - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48081,12 +47952,12 @@ PrefabInstance: - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 1380.0172 + value: 1450.6401 objectReference: {fileID: 0} - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -655.13873 objectReference: {fileID: 0} - target: {fileID: 7529791229714676975, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48161,17 +48032,17 @@ PrefabInstance: - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48186,7 +48057,7 @@ PrefabInstance: - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 7529791229928230606, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48241,12 +48112,12 @@ PrefabInstance: - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -48266,7 +48137,7 @@ PrefabInstance: - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -660.43494 objectReference: {fileID: 0} - target: {fileID: 7529791230178888222, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -55858,12 +55729,12 @@ PrefabInstance: - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -55883,7 +55754,7 @@ PrefabInstance: - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -224.83499 objectReference: {fileID: 0} - target: {fileID: 8257279139563759840, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -57002,7 +56873,7 @@ PrefabInstance: type: 3} propertyPath: CameraCollider value: - objectReference: {fileID: 42421036} + objectReference: {fileID: 0} - target: {fileID: 8565720915689735197, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchorMax.y @@ -61191,12 +61062,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &2057465950 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8227296246521771578, guid: 917a61edd84946d4d84b396b6e2eefc8, - type: 3} - m_PrefabInstance: {fileID: 1617425452} - m_PrefabAsset: {fileID: 0} --- !u!1 &2075953930 GameObject: m_ObjectHideFlags: 0 @@ -63673,12 +63538,12 @@ PrefabInstance: - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63688,27 +63553,27 @@ PrefabInstance: - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.517 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -655.13873 objectReference: {fileID: 0} - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63723,17 +63588,17 @@ PrefabInstance: - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63753,7 +63618,7 @@ PrefabInstance: - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -565.855 objectReference: {fileID: 0} - target: {fileID: 2778343470111920657, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63769,12 +63634,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} @@ -63794,7 +63659,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} @@ -63880,12 +63745,12 @@ PrefabInstance: - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63905,7 +63770,7 @@ PrefabInstance: - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -155 objectReference: {fileID: 0} - target: {fileID: 2870344015033479149, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64498,12 +64363,12 @@ PrefabInstance: - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64523,7 +64388,7 @@ PrefabInstance: - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -174.83499 objectReference: {fileID: 0} - target: {fileID: 3703633929135335085, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64559,17 +64424,17 @@ PrefabInstance: - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64584,7 +64449,7 @@ PrefabInstance: - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.835 objectReference: {fileID: 0} - target: {fileID: 3703633929829912551, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64609,12 +64474,12 @@ PrefabInstance: - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64624,12 +64489,12 @@ PrefabInstance: - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1379.517 + value: 1450.1401 objectReference: {fileID: 0} - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -655.13873 objectReference: {fileID: 0} - target: {fileID: 3703633930208784705, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -67313,12 +67178,12 @@ PrefabInstance: - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -67338,7 +67203,7 @@ PrefabInstance: - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -105 objectReference: {fileID: 0} - target: {fileID: 6667381223719663961, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68724,17 +68589,17 @@ PrefabInstance: - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 765 objectReference: {fileID: 0} - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68749,7 +68614,7 @@ PrefabInstance: - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -55.64 objectReference: {fileID: 0} - target: {fileID: 8994770306774294910, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68815,12 +68680,12 @@ PrefabInstance: - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68830,12 +68695,12 @@ PrefabInstance: - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 2609.517 + value: 2680.1401 objectReference: {fileID: 0} - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1405.1387 objectReference: {fileID: 0} - target: {fileID: 8994770307973242005, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68890,12 +68755,12 @@ PrefabInstance: - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68915,7 +68780,7 @@ PrefabInstance: - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -266.64 objectReference: {fileID: 0} - target: {fileID: 8994770308181573710, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -69559,13 +69424,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accb714425edfcc4abfab54e2b4267a3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &6851988824816228754 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalPosition.x + value: 779.265 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalPosition.y + value: 372.34174 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalPosition.z + value: 13.21755 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690177545664227728, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5773624735300281021, guid: 73054005d80101c4fa3bec338d5fe42f, + type: 3} + propertyPath: m_Name + value: ARSessionOriginNew + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 73054005d80101c4fa3bec338d5fe42f, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 952576528} - {fileID: 877604999} - - {fileID: 1617425452} + - {fileID: 6851988824816228754} - {fileID: 386295010} - {fileID: 673993478} - {fileID: 645530830} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs b/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs index 098691288..553a788ac 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/AR/CalibrationManager.cs @@ -23,7 +23,7 @@ public enum MarkerDetectionState { //#if (UNITY_ANDROID || UNITY_IOS) && AR_ON // public ARCoreExtensions ARCoreExt; //#endif - public ARSessionOrigin ARSessionOrigin; + public ARAnchorManager ARAnchorManager; public ARPlaneManager ARPlaneManager; public ARRaycastManager ARRaycastManager; diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/Sight.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/Sight.cs index 9afcbb438..c6f05cf8d 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/Sight.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/Sight.cs @@ -12,7 +12,6 @@ namespace Base { public class Sight : Singleton { public GameObject CurrentObject; - public Collider CameraCollider; public System.DateTime HoverStartTime; diff --git a/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset b/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset index e85064dae..c6d555b24 100644 --- a/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset +++ b/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset @@ -56,5 +56,12 @@ MonoBehaviour: m_VoxelSize: 0.1 m_TrackedImageDiscoveryParams: m_TrackingUpdateInterval: 0.09 + m_EnvironmentProbeDiscoveryParams: + m_MinUpdateTime: 0.2 + m_MaxDiscoveryDistance: 3 + m_DiscoveryDelayTime: 1 + m_CubemapFaceSize: 16 + m_AnchorDiscoveryParams: + m_MinTimeUntilUpdate: 0.2 m_UseXRay: 1 m_FlipXRayDirection: 0 diff --git a/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta b/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta index 997364496..0a4c7e5ac 100644 --- a/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta +++ b/arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32dc913f476aab7998ce46fb21e8e384 +guid: 5b183b32c96e893429a249ee49871a44 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/arcor2_AREditor/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta b/arcor2_AREditor/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta index 6411fff74..219db634d 100644 --- a/arcor2_AREditor/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta +++ b/arcor2_AREditor/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 145ea579ba078d67eb671674e6734a1f +guid: f3eda1aeb96aac34fb141d616ee41d83 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/arcor2_AREditor/Packages/manifest.json b/arcor2_AREditor/Packages/manifest.json index 3b71797f5..35b38d469 100644 --- a/arcor2_AREditor/Packages/manifest.json +++ b/arcor2_AREditor/Packages/manifest.json @@ -9,26 +9,26 @@ } ], "dependencies": { - "com.google.ar.core.arfoundation.extensions": "https://github.com/google-ar/arcore-unity-extensions.git", + "com.google.ar.core.arfoundation.extensions": "https://github.com/google-ar/arcore-unity-extensions.git#arf5", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", - "com.unity.ai.navigation": "1.1.4", + "com.unity.ai.navigation": "1.1.5", "com.unity.analytics": "3.8.1", "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.recorder": "4.0.1", + "com.unity.recorder": "4.0.3", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.timeline": "1.7.6", "com.unity.toolchain.linux-x86_64": "2.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", - "com.unity.xr.arcore": "5.0.7", - "com.unity.xr.arfoundation": "5.0.7", - "com.unity.xr.arkit": "5.0.7", + "com.unity.xr.arcore": "5.1.5", + "com.unity.xr.arfoundation": "5.1.5", + "com.unity.xr.arkit": "5.1.5", "com.unity.xr.arkit-face-tracking": "5.0.2", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/arcor2_AREditor/Packages/packages-lock.json b/arcor2_AREditor/Packages/packages-lock.json index 005622fd0..d95aa5f38 100644 --- a/arcor2_AREditor/Packages/packages-lock.json +++ b/arcor2_AREditor/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.google.ar.core.arfoundation.extensions": { - "version": "https://github.com/google-ar/arcore-unity-extensions.git", + "version": "https://github.com/google-ar/arcore-unity-extensions.git#arf5", "depth": 0, "source": "git", "dependencies": { @@ -9,7 +9,7 @@ "com.unity.xr.arcore": "4.1.5", "com.unity.xr.arkit": "4.1.5" }, - "hash": "8c310cdc5796dccf9e0a5214143492a823e025bf" + "hash": "8efaa199783172032614644747e7fe58dcc7b597" }, "com.unity.2d.sprite": { "version": "1.0.0", @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -49,8 +49,8 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.analytics": "1.0.4", - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" }, "url": "https://packages.unity.com" }, @@ -69,7 +69,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -78,7 +78,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -117,7 +117,7 @@ "url": "https://packages.unity.com" }, "com.unity.recorder": { - "version": "4.0.1", + "version": "4.0.3", "depth": 0, "source": "registry", "dependencies": { @@ -131,19 +131,19 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.services.core": "1.10.1" + "com.unity.services.core": "1.10.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.11.0", + "version": "1.12.5", "depth": 2, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -184,13 +184,13 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -225,44 +225,45 @@ } }, "com.unity.xr.arcore": { - "version": "5.0.7", + "version": "5.1.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.arfoundation": "5.0.7", "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1", + "com.unity.xr.arfoundation": "5.1.5", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.0.7", + "version": "5.1.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.inputsystem": "1.3.0", - "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.management": "4.0.1", "com.unity.ugui": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.inputsystem": "1.3.0", "com.unity.mathematics": "1.2.5", + "com.unity.xr.core-utils": "2.2.1", + "com.unity.xr.management": "4.0.1", + "com.unity.editorcoroutines": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.ui": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arkit": { - "version": "5.0.7", + "version": "5.1.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.editorcoroutines": "1.0.0", - "com.unity.xr.arfoundation": "5.0.7", "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.management": "4.0.1" + "com.unity.xr.management": "4.0.1", + "com.unity.xr.arfoundation": "5.1.5", + "com.unity.editorcoroutines": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -276,7 +277,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.2.3", + "version": "2.3.0", "depth": 1, "source": "registry", "dependencies": { @@ -299,9 +300,9 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" diff --git a/arcor2_AREditor/ProjectSettings/GvhProjectSettings.xml b/arcor2_AREditor/ProjectSettings/GvhProjectSettings.xml index 47fce6392..edaa39683 100644 --- a/arcor2_AREditor/ProjectSettings/GvhProjectSettings.xml +++ b/arcor2_AREditor/ProjectSettings/GvhProjectSettings.xml @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset index 0a11678d2..a2a502231 100644 --- a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset +++ b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset @@ -50,6 +50,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 2 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -77,6 +78,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -137,11 +139,14 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0.3 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 + bundleVersion: 1.0.4 preloadedAssets: - {fileID: 11400000, guid: 20a9bcdf4f5308b4cbe95702f502a097, type: 2} - {fileID: 0} - - {fileID: 11400000, guid: d53a61adfc9ff4d89aacb9db70fb859b, type: 2} + - {fileID: 0} + - {fileID: 11400000, guid: 1328e17ef08204649bf5089207aa8cec, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -152,6 +157,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -235,6 +241,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -597,7 +604,6 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchEnableFileSystemTrace: 0 - switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -727,7 +733,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -856,7 +861,8 @@ PlayerSettings: Standalone: 0 il2cppCompilerConfiguration: Android: 1 - il2cppCodeGeneration: {} + il2cppCodeGeneration: + Android: 1 managedStrippingLevel: Android: 1 EmbeddedLinux: 1 @@ -908,6 +914,7 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: WindowsStoreApps: EnterpriseAuthentication: False @@ -943,10 +950,10 @@ PlayerSettings: PointOfService: False RecordedCallsFolder: False Contacts: False + Proximity: False InternetClient: True CodeGeneration: False BackgroundMediaPlayback: False - Proximity: False metroTargetDeviceFamilies: Desktop: False Holographic: True @@ -1007,7 +1014,7 @@ PlayerSettings: hmiLogStartupTiming: 0 hmiCpuConfiguration: apiCompatibilityLevel: 6 - activeInputHandler: 2 + activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: 4b478335-2d42-4366-b691-5cdda8c48d1d framebufferDepthMemorylessMode: 0 diff --git a/arcor2_AREditor/ProjectSettings/ProjectVersion.txt b/arcor2_AREditor/ProjectSettings/ProjectVersion.txt index 88bb9cf99..44ca7915e 100644 --- a/arcor2_AREditor/ProjectSettings/ProjectVersion.txt +++ b/arcor2_AREditor/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.10f1 -m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) +m_EditorVersion: 2022.3.41f1 +m_EditorVersionWithRevision: 2022.3.41f1 (0f988161febf)