From 0a8d6c3b51a50ffa6cac66e6af9fac156ad44c43 Mon Sep 17 00:00:00 2001 From: Sylvain Renault Date: Fri, 3 Jun 2022 16:12:53 +0200 Subject: [PATCH 1/3] New list view for elements with two "direct" buttons: delete element and edit element. Some bugfixes. --- .../Editor/Windows/TrackableWindow.cs | 83 ++++++------ .../Editor/Windows/WorldAnchorWindow.cs | 82 ++++++------ .../Editor/Windows/WorldLinkWindow.cs | 80 ++++++----- .../Editor/Windows/WorldStorageWindow.cs | 111 +++++++++++++++- UserSettings/Layouts/default-2021.dwlt | 124 +++++++++--------- 5 files changed, 300 insertions(+), 180 deletions(-) diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs index acc8f55..f6da0d8 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs +++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs @@ -40,6 +40,8 @@ namespace ETSI.ARF.WorldStorage.UI { public class TrackableWindow : EditorWindow { + static public TrackableWindow winSingleton; + [HideInInspector] public WorldStorageServer worldStorageServer; [HideInInspector] public WorldStorageUser worldStorageUser; @@ -64,11 +66,16 @@ namespace ETSI.ARF.WorldStorage.UI private Color ori; private GUIStyle gsTest; - public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user) + public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "") { - TrackableWindow win = EditorWindow.GetWindow(typeof(TrackableWindow), false, WorldStorageWindow.winName) as TrackableWindow; - win.worldStorageServer = ws; - win.worldStorageUser = user; + winSingleton = EditorWindow.GetWindow(typeof(TrackableWindow), false, WorldStorageWindow.winName) as TrackableWindow; + winSingleton.worldStorageServer = ws; + winSingleton.worldStorageUser = user; + if (!string.IsNullOrEmpty(UUID)) + { + winSingleton.UUID = UUID; + winSingleton.GetTrackableParams(); + } } public TrackableWindow() @@ -114,41 +121,11 @@ namespace ETSI.ARF.WorldStorage.UI EditorGUILayout.Space(); GUI.backgroundColor = WorldStorageWindow.arfColors[1]; - if (GUILayout.Button("Get Parameters")) + if (GUILayout.Button("Read Parameters")) { - if (!customName.Contains("[")) UUID = customName; - else - { - // extract the UUID - UUID = customName.Split('[', ']')[1]; - } - Trackable obj = TrackableRequest.GetTrackable(worldStorageServer, UUID); - customName = obj.Name; - creatorUUID = obj.CreatorUUID.ToString(); - type = obj.TrackableType; - unit = obj.Unit; - if (obj.TrackableSize.Count == 3) - { - trackableSize = new Vector3((float)obj.TrackableSize[0], (float)obj.TrackableSize[1], (float)obj.TrackableSize[2]); - } - else trackableSize = Vector3.zero; - if (obj.LocalCRS.Count == 16) - { - Matrix4x4 localCRS = new Matrix4x4(); - localCRS.m00 = obj.LocalCRS[0]; localCRS.m01 = obj.LocalCRS[1]; localCRS.m02 = obj.LocalCRS[2]; localCRS.m03 = obj.LocalCRS[3]; - localCRS.m10 = obj.LocalCRS[4]; localCRS.m11 = obj.LocalCRS[5]; localCRS.m12 = obj.LocalCRS[6]; localCRS.m13 = obj.LocalCRS[7]; - localCRS.m20 = obj.LocalCRS[8]; localCRS.m21 = obj.LocalCRS[9]; localCRS.m22 = obj.LocalCRS[10]; localCRS.m23 = obj.LocalCRS[11]; - localCRS.m30 = obj.LocalCRS[12]; localCRS.m31 = obj.LocalCRS[13]; localCRS.m32 = obj.LocalCRS[14]; localCRS.m33 = obj.LocalCRS[15]; - localCRS_pos = localCRS.GetPosition(); - localCRS_rot = localCRS.rotation.eulerAngles; - } - else - { - localCRS_pos = Vector3.zero; - localCRS_rot = Vector3.zero; - } - keyValueTags = obj.KeyvalueTags; - this.Repaint(); // TODO + UUID = WorldStorageWindow.GetUUIDFromString(customName); + if (UUID == null) UUID = customName; // try this + GetTrackableParams(); } GUI.backgroundColor = ori; @@ -248,6 +225,36 @@ namespace ETSI.ARF.WorldStorage.UI GUI.backgroundColor = ori; } + private void GetTrackableParams() + { + Trackable obj = TrackableRequest.GetTrackable(worldStorageServer, UUID); + customName = obj.Name; + creatorUUID = obj.CreatorUUID.ToString(); + type = obj.TrackableType; + unit = obj.Unit; + if (obj.TrackableSize.Count == 3) + { + trackableSize = new Vector3((float)obj.TrackableSize[0], (float)obj.TrackableSize[1], (float)obj.TrackableSize[2]); + } + else trackableSize = Vector3.zero; + if (obj.LocalCRS.Count == 16) + { + Matrix4x4 localCRS = new Matrix4x4(); + localCRS.m00 = obj.LocalCRS[0]; localCRS.m01 = obj.LocalCRS[1]; localCRS.m02 = obj.LocalCRS[2]; localCRS.m03 = obj.LocalCRS[3]; + localCRS.m10 = obj.LocalCRS[4]; localCRS.m11 = obj.LocalCRS[5]; localCRS.m12 = obj.LocalCRS[6]; localCRS.m13 = obj.LocalCRS[7]; + localCRS.m20 = obj.LocalCRS[8]; localCRS.m21 = obj.LocalCRS[9]; localCRS.m22 = obj.LocalCRS[10]; localCRS.m23 = obj.LocalCRS[11]; + localCRS.m30 = obj.LocalCRS[12]; localCRS.m31 = obj.LocalCRS[13]; localCRS.m32 = obj.LocalCRS[14]; localCRS.m33 = obj.LocalCRS[15]; + localCRS_pos = localCRS.GetPosition(); + localCRS_rot = localCRS.rotation.eulerAngles; + } + else + { + localCRS_pos = Vector3.zero; + localCRS_rot = Vector3.zero; + } + keyValueTags = obj.KeyvalueTags; + this.Repaint(); // TODO + } public Trackable GenerateTrackable() { diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs index 84eec85..ae8f0c3 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs +++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs @@ -39,6 +39,8 @@ namespace ETSI.ARF.WorldStorage.UI { public class WorldAnchorWindow : EditorWindow { + static public WorldAnchorWindow winSingleton; + [HideInInspector] public WorldStorageServer worldStorageServer; [HideInInspector] public WorldStorageUser worldStorageUser; @@ -61,11 +63,16 @@ namespace ETSI.ARF.WorldStorage.UI private Color ori; private GUIStyle gsTest; - public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user) + public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "") { - WorldAnchorWindow win = EditorWindow.GetWindow(typeof(WorldAnchorWindow), false, WorldStorageWindow.winName) as WorldAnchorWindow; - win.worldStorageServer = ws; - win.worldStorageUser = user; + winSingleton = EditorWindow.GetWindow(typeof(WorldAnchorWindow), false, WorldStorageWindow.winName) as WorldAnchorWindow; + winSingleton.worldStorageServer = ws; + winSingleton.worldStorageUser = user; + if (!string.IsNullOrEmpty(UUID)) + { + winSingleton.UUID = UUID; + winSingleton.GetWorldAnchorParams(); + } } public WorldAnchorWindow() @@ -111,40 +118,11 @@ namespace ETSI.ARF.WorldStorage.UI EditorGUILayout.Space(); GUI.backgroundColor = WorldStorageWindow.arfColors[1]; - if (GUILayout.Button("Get Parameters")) + if (GUILayout.Button("Read Parameters")) { - if (!customName.Contains("[")) UUID = customName; - else - { - // extract the UUID - UUID = customName.Split('[', ']')[1]; - } - WorldAnchor obj = WorldAnchorRequest.GetWorldAnchor(worldStorageServer, UUID); - customName = obj.Name; - creatorUUID = obj.CreatorUUID.ToString(); - unit = obj.Unit; - if (obj.WorldAnchorSize.Count == 3) - { - worldAnchorSize = new Vector3((float)obj.WorldAnchorSize[0], (float)obj.WorldAnchorSize[1], (float)obj.WorldAnchorSize[2]); - } - else worldAnchorSize = Vector3.zero; - if (obj.LocalCRS.Count == 16) - { - Matrix4x4 localCRS = new Matrix4x4(); - localCRS.m00 = obj.LocalCRS[0]; localCRS.m01 = obj.LocalCRS[1]; localCRS.m02 = obj.LocalCRS[2]; localCRS.m03 = obj.LocalCRS[3]; - localCRS.m10 = obj.LocalCRS[4]; localCRS.m11 = obj.LocalCRS[5]; localCRS.m12 = obj.LocalCRS[6]; localCRS.m13 = obj.LocalCRS[7]; - localCRS.m20 = obj.LocalCRS[8]; localCRS.m21 = obj.LocalCRS[9]; localCRS.m22 = obj.LocalCRS[10]; localCRS.m23 = obj.LocalCRS[11]; - localCRS.m30 = obj.LocalCRS[12]; localCRS.m31 = obj.LocalCRS[13]; localCRS.m32 = obj.LocalCRS[14]; localCRS.m33 = obj.LocalCRS[15]; - localCRS_pos = localCRS.GetPosition(); - localCRS_rot = localCRS.rotation.eulerAngles; - } - else - { - localCRS_pos = Vector3.zero; - localCRS_rot = Vector3.zero; - } - keyValueTags = obj.KeyvalueTags; - this.Repaint(); // TODO + UUID = WorldStorageWindow.GetUUIDFromString(customName); + if (UUID == null) UUID = customName; // try this + GetWorldAnchorParams(); } GUI.backgroundColor = ori; @@ -224,6 +202,36 @@ namespace ETSI.ARF.WorldStorage.UI GUI.backgroundColor = ori; } + private void GetWorldAnchorParams() + { + WorldAnchor obj = WorldAnchorRequest.GetWorldAnchor(worldStorageServer, UUID); + customName = obj.Name; + creatorUUID = obj.CreatorUUID.ToString(); + unit = obj.Unit; + if (obj.WorldAnchorSize.Count == 3) + { + worldAnchorSize = new Vector3((float)obj.WorldAnchorSize[0], (float)obj.WorldAnchorSize[1], (float)obj.WorldAnchorSize[2]); + } + else worldAnchorSize = Vector3.zero; + if (obj.LocalCRS.Count == 16) + { + Matrix4x4 localCRS = new Matrix4x4(); + localCRS.m00 = obj.LocalCRS[0]; localCRS.m01 = obj.LocalCRS[1]; localCRS.m02 = obj.LocalCRS[2]; localCRS.m03 = obj.LocalCRS[3]; + localCRS.m10 = obj.LocalCRS[4]; localCRS.m11 = obj.LocalCRS[5]; localCRS.m12 = obj.LocalCRS[6]; localCRS.m13 = obj.LocalCRS[7]; + localCRS.m20 = obj.LocalCRS[8]; localCRS.m21 = obj.LocalCRS[9]; localCRS.m22 = obj.LocalCRS[10]; localCRS.m23 = obj.LocalCRS[11]; + localCRS.m30 = obj.LocalCRS[12]; localCRS.m31 = obj.LocalCRS[13]; localCRS.m32 = obj.LocalCRS[14]; localCRS.m33 = obj.LocalCRS[15]; + localCRS_pos = localCRS.GetPosition(); + localCRS_rot = localCRS.rotation.eulerAngles; + } + else + { + localCRS_pos = Vector3.zero; + localCRS_rot = Vector3.zero; + } + keyValueTags = obj.KeyvalueTags; + this.Repaint(); // TODO + } + public WorldAnchor GenerateWorldAnchor() { #if USING_OPENAPI_GENERATOR diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs index 8334534..b8966cb 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs +++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs @@ -39,6 +39,8 @@ namespace ETSI.ARF.WorldStorage.UI { public class WorldLinkWindow : EditorWindow { + static public WorldLinkWindow winSingleton; + [HideInInspector] public WorldStorageServer worldStorageServer; [HideInInspector] public WorldStorageUser worldStorageUser; @@ -63,11 +65,16 @@ namespace ETSI.ARF.WorldStorage.UI private Color ori; private GUIStyle gsTest; - public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user) + public static void ShowWindow(WorldStorageServer ws, WorldStorageUser user, string UUID = "") { - WorldLinkWindow win = EditorWindow.GetWindow(typeof(WorldLinkWindow), false, WorldStorageWindow.winName) as WorldLinkWindow; - win.worldStorageServer = ws; - win.worldStorageUser = user; + winSingleton = EditorWindow.GetWindow(typeof(WorldLinkWindow), false, WorldStorageWindow.winName) as WorldLinkWindow; + winSingleton.worldStorageServer = ws; + winSingleton.worldStorageUser = user; + if (!string.IsNullOrEmpty(UUID)) + { + winSingleton.UUID = UUID; + winSingleton.GetWorldLinkParams(); + } } public WorldLinkWindow() @@ -113,39 +120,11 @@ namespace ETSI.ARF.WorldStorage.UI EditorGUILayout.Space(); GUI.backgroundColor = WorldStorageWindow.arfColors[1]; - if (GUILayout.Button("Get Parameters")) + if (GUILayout.Button("Read Parameters")) { - if (!customName.Contains("[")) UUID = customName; - else - { - // extract the UUID - UUID = customName.Split('[', ']')[1]; - } - WorldLink obj = WorldLinkRequest.GetWorldLink(worldStorageServer, UUID); - //customName = obj.Name; - creatorUUID = obj.CreatorUUID.ToString(); - fromUUID = obj.UUIDFrom.ToString(); - toUUID = obj.UUIDTo.ToString(); - fromType = obj.TypeFrom; - toType = obj.TypeTo; - unit = obj.Unit; - if (obj.Transform.Count == 16) - { - Matrix4x4 localCRS = new Matrix4x4(); - localCRS.m00 = obj.Transform[0]; localCRS.m01 = obj.Transform[1]; localCRS.m02 = obj.Transform[2]; localCRS.m03 = obj.Transform[3]; - localCRS.m10 = obj.Transform[4]; localCRS.m11 = obj.Transform[5]; localCRS.m12 = obj.Transform[6]; localCRS.m13 = obj.Transform[7]; - localCRS.m20 = obj.Transform[8]; localCRS.m21 = obj.Transform[9]; localCRS.m22 = obj.Transform[10]; localCRS.m23 = obj.Transform[11]; - localCRS.m30 = obj.Transform[12]; localCRS.m31 = obj.Transform[13]; localCRS.m32 = obj.Transform[14]; localCRS.m33 = obj.Transform[15]; - localCRS_pos = localCRS.GetPosition(); - localCRS_rot = localCRS.rotation.eulerAngles; - } - else - { - localCRS_pos = Vector3.zero; - localCRS_rot = Vector3.zero; - } - keyValueTags = obj.KeyvalueTags; - this.Repaint(); // TODO + UUID = WorldStorageWindow.GetUUIDFromString(customName); + if (UUID == null) UUID = customName; // try this + GetWorldLinkParams(); } GUI.backgroundColor = ori; @@ -225,6 +204,35 @@ namespace ETSI.ARF.WorldStorage.UI GUI.backgroundColor = ori; } + private void GetWorldLinkParams() + { + WorldLink obj = WorldLinkRequest.GetWorldLink(worldStorageServer, UUID); + //customName = obj.Name; + creatorUUID = obj.CreatorUUID.ToString(); + fromUUID = obj.UUIDFrom.ToString(); + toUUID = obj.UUIDTo.ToString(); + fromType = obj.TypeFrom; + toType = obj.TypeTo; + unit = obj.Unit; + if (obj.Transform.Count == 16) + { + Matrix4x4 localCRS = new Matrix4x4(); + localCRS.m00 = obj.Transform[0]; localCRS.m01 = obj.Transform[1]; localCRS.m02 = obj.Transform[2]; localCRS.m03 = obj.Transform[3]; + localCRS.m10 = obj.Transform[4]; localCRS.m11 = obj.Transform[5]; localCRS.m12 = obj.Transform[6]; localCRS.m13 = obj.Transform[7]; + localCRS.m20 = obj.Transform[8]; localCRS.m21 = obj.Transform[9]; localCRS.m22 = obj.Transform[10]; localCRS.m23 = obj.Transform[11]; + localCRS.m30 = obj.Transform[12]; localCRS.m31 = obj.Transform[13]; localCRS.m32 = obj.Transform[14]; localCRS.m33 = obj.Transform[15]; + localCRS_pos = localCRS.GetPosition(); + localCRS_rot = localCRS.rotation.eulerAngles; + } + else + { + localCRS_pos = Vector3.zero; + localCRS_rot = Vector3.zero; + } + keyValueTags = obj.KeyvalueTags; + this.Repaint(); // TODO + } + public WorldLink GenerateWorldLink() { Matrix4x4 localCRS = new Matrix4x4(); diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs index 5d353c9..d983045 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs +++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs @@ -59,6 +59,12 @@ namespace ETSI.ARF.WorldStorage.UI private Color ori; private GUIStyle gsTest; + private static GUILayoutOption miniButtonWidth = GUILayout.Width(32); + private static GUILayoutOption buttonWidth = GUILayout.Width(64f); + private bool showListT = true; + private bool showListA = true; + private bool showListL = true; + static public string winName = "ARF Authoring Editor"; static public Color[] arfColors = new Color[] { @@ -124,6 +130,10 @@ namespace ETSI.ARF.WorldStorage.UI EditorGUILayout.EndScrollView(); } + public void OnInspectorUpdate() + { + this.Repaint(); + } void DrawElementStuffs() { @@ -225,12 +235,37 @@ namespace ETSI.ARF.WorldStorage.UI WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); } GUI.backgroundColor = ori; - + // Show list stringsProperty = so.FindProperty("trackables"); - EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children - so.ApplyModifiedProperties(); // Remember to apply modified properties + //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children + //so.ApplyModifiedProperties(); // Remember to apply modified properties + // New version with "Edit" button: + showListT = EditorGUILayout.BeginFoldoutHeaderGroup(showListT, "List of Trackables"); + if (showListT) + for (int i = 0; i < stringsProperty.arraySize; i++) + { + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i)); + //EditorGUILayout.PropertyField(list.GetArrayElementAtIndex(i), GUIContent.none); + + string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); + if (UUID == null) UUID = trackables[i]; // try this + if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + { + TrackableRequest.DeleteTrackable(worldStorageServer, UUID); + WorldStorageWindowSingleton.GetTrackables(); + WorldStorageWindowSingleton.Repaint(); + } + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Trackable Window"); + TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + EditorGUILayout.EndHorizontal(); + } + EditorGUILayout.EndFoldoutHeaderGroup(); #endregion // ########################################################### @@ -276,8 +311,34 @@ namespace ETSI.ARF.WorldStorage.UI // Show list stringsProperty = so.FindProperty("anchors"); - EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children - so.ApplyModifiedProperties(); // Remember to apply modified properties + //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children + //so.ApplyModifiedProperties(); // Remember to apply modified properties + + // New version with "Edit" button: + showListA = EditorGUILayout.BeginFoldoutHeaderGroup(showListA, "List of World Anchors"); + if (showListA) + for (int i = 0; i < stringsProperty.arraySize; i++) + { + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i)); + //EditorGUILayout.PropertyField(list.GetArrayElementAtIndex(i), GUIContent.none); + + string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); + if (UUID == null) UUID = anchors[i]; // try this + if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + { + WorldAnchorRequest.DeleteWorldAnchor(worldStorageServer, UUID); + WorldStorageWindowSingleton.GetWorldAnchors(); + WorldStorageWindowSingleton.Repaint(); + } + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Anchor Window"); + WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + EditorGUILayout.EndHorizontal(); + } + EditorGUILayout.EndFoldoutHeaderGroup(); #endregion // ########################################################### @@ -323,8 +384,35 @@ namespace ETSI.ARF.WorldStorage.UI // Show list stringsProperty = so.FindProperty("links"); - EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children - so.ApplyModifiedProperties(); // Remember to apply modified properties + //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children + //so.ApplyModifiedProperties(); // Remember to apply modified properties + + // New version with "Edit" button: + showListL = EditorGUILayout.BeginFoldoutHeaderGroup(showListL, "List of World Links"); + if (showListL) + for (int i = 0; i < stringsProperty.arraySize; i++) + { + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.PropertyField(stringsProperty.GetArrayElementAtIndex(i)); + //EditorGUILayout.PropertyField(list.GetArrayElementAtIndex(i), GUIContent.none); + + string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); + if (UUID == null) UUID = links[i]; // try this + if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + { + WorldLinkRequest.DeleteWorldLink(worldStorageServer, UUID); + WorldStorageWindowSingleton.GetWorldLinks(); + WorldStorageWindowSingleton.Repaint(); + } + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Link Window"); + + WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + EditorGUILayout.EndHorizontal(); + } + EditorGUILayout.EndFoldoutHeaderGroup(); #endregion // @@ -335,6 +423,15 @@ namespace ETSI.ARF.WorldStorage.UI // Get elements from current server // ########################################################### #region Helpers + static public string GetUUIDFromString(string text) + { + if (!text.Contains("[")) return null; + else + { + // extract the UUID + return text.Split('[', ']')[1]; + } + } public void GetCreators() { // Get all objects diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6b99358..75d3cbd 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 96 - y: 157.33333 - width: 1308 - height: 787.11115 + x: 206.22223 + y: 165.77779 + width: 1368 + height: 786.6667 m_ShowMode: 4 - m_Title: Inspector + m_Title: Console m_RootView: {fileID: 8} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,9 +39,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 517.7778 + x: 547.1111 y: 0 - width: 522.6667 + width: 627.55554 height: 291.7778 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -68,13 +68,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 445.33334 - width: 1040.4445 + y: 444.8889 + width: 1174.6666 height: 291.7778 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 127 + controlID: 173 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -94,12 +94,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1308 - height: 737.11115 + width: 1368 + height: 736.6667 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 76 + controlID: 219 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -115,12 +115,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1040.4445 + x: 1174.6666 y: 0 - width: 267.55554 - height: 737.11115 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 193.33337 + height: 736.6667 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -143,8 +143,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 252.88889 - height: 445.33334 + width: 281.33334 + height: 444.8889 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -169,7 +169,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 517.7778 + width: 547.1111 height: 291.7778 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -198,8 +198,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1308 - height: 787.11115 + width: 1368 + height: 786.6667 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -223,7 +223,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1308 + width: 1368 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -244,8 +244,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 767.11115 - width: 1308 + y: 766.6667 + width: 1368 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -268,12 +268,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1040.4445 - height: 737.11115 + width: 1174.6666 + height: 736.6667 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 65 + controlID: 220 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -293,12 +293,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1040.4445 - height: 445.33334 + width: 1174.6666 + height: 444.8889 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 66 + controlID: 221 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -314,10 +314,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 252.88889 + x: 281.33334 y: 0 - width: 787.55554 - height: 445.33334 + width: 893.33325 + height: 444.8889 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -375,9 +375,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 96 - y: 632.8889 - width: 516.7778 + x: 206.22223 + y: 640.8889 + width: 546.1111 height: 270.7778 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -408,10 +408,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 28.356365} - m_SelectedIDs: 664b0000 - m_LastClickedID: 19302 - m_ExpandedIDs: 000000004a4b00004c4b00004e4b0000504b0000524b0000544b0000564b000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 724b0000 + m_LastClickedID: 19314 + m_ExpandedIDs: 00000000544b0000564b0000584b00005a4b00005c4b00005e4b0000604b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -439,7 +439,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004a4b00004c4b00004e4b0000504b0000524b0000544b0000564b0000 + m_ExpandedIDs: 00000000544b0000564b0000584b00005a4b00005c4b00005e4b0000604b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -494,7 +494,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 257.8889 + m_DirectoriesAreaWidth: 248.11111 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -515,10 +515,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1136.4445 - y: 187.55556 - width: 266.55554 - height: 716.11115 + x: 1380.8889 + y: 196 + width: 192.33337 + height: 715.6667 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -556,10 +556,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 96 - y: 187.55556 - width: 251.88889 - height: 424.33334 + x: 206.22223 + y: 196 + width: 280.33334 + height: 423.8889 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -567,7 +567,7 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 444b0000 + m_SelectedIDs: m_LastClickedID: 0 m_ExpandedIDs: 34fbffff m_RenameOverlay: @@ -613,10 +613,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 348.8889 - y: 187.55556 - width: 785.55554 - height: 424.33334 + x: 487.55557 + y: 196 + width: 891.33325 + height: 423.8889 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -681,9 +681,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: -190.44443} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 0 id: Orientation index: 0 layout: 4 @@ -1010,9 +1010,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 613.7778 - y: 632.8889 - width: 520.6667 + x: 753.3333 + y: 640.8889 + width: 625.55554 height: 270.7778 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: -- GitLab From 8ccb356a9be7c7e768b5521110ab89040913ae5a Mon Sep 17 00:00:00 2001 From: Sylvain Renault Date: Tue, 7 Jun 2022 16:21:15 +0200 Subject: [PATCH 2/3] - added a to/from object GUI - added a to/from request button (tbi) --- .../Editor/Windows/WorldLinkWindow.cs | 47 ++- UserSettings/Layouts/default-2021.dwlt | 321 ++++++++++++------ 2 files changed, 260 insertions(+), 108 deletions(-) diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs index b8966cb..039ca12 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs +++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs @@ -47,13 +47,21 @@ namespace ETSI.ARF.WorldStorage.UI [SerializeField] public List anchors = new List(); bool groupEnabled; + private static GUILayoutOption miniButtonWidth = GUILayout.Width(50); // World Anchors params string UUID = System.Guid.Empty.ToString(); string customName = "(no name for World Links)"; string creatorUUID = System.Guid.Empty.ToString(); + // From... + private bool showListFrom = true; + string fromName = "(none)"; string fromUUID = System.Guid.Empty.ToString(); + // To... + private bool showListTo = true; + string toName = "(none)"; string toUUID = System.Guid.Empty.ToString(); + UnitSystem unit = UnitSystem.CM; ObjectType fromType = ObjectType.NotIdentified, toType = ObjectType.NotIdentified; Vector3 localCRS_pos; @@ -130,8 +138,43 @@ namespace ETSI.ARF.WorldStorage.UI unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit); - fromType = (ObjectType)EditorGUILayout.EnumPopup("From Object Type:", fromType); - toType = (ObjectType)EditorGUILayout.EnumPopup("To Object Type:", toType); + EditorGUILayout.Space(); + showListFrom = EditorGUILayout.Foldout(showListFrom, "Parent Object (From)"); + if (showListFrom) + { + EditorGUILayout.BeginHorizontal(); + fromUUID = EditorGUILayout.TextField("UUID", fromUUID); + GUI.backgroundColor = WorldStorageWindow.arfColors[1]; + if (GUILayout.Button("Find", EditorStyles.miniButtonLeft, miniButtonWidth)) + { + // TODO Request the object from the server + fromName = "(not implemented yet)"; + fromType = ObjectType.NotIdentified; + } + EditorGUILayout.EndHorizontal(); + GUI.backgroundColor = ori; + fromName = EditorGUILayout.TextField("Name", fromName); + fromType = (ObjectType)EditorGUILayout.EnumPopup("Type:", fromType); + } + + EditorGUILayout.Space(); + showListTo = EditorGUILayout.Foldout(showListTo, "Child Object (To)"); + if (showListTo) + { + EditorGUILayout.BeginHorizontal(); + toUUID = EditorGUILayout.TextField("UUID", toUUID); + GUI.backgroundColor = WorldStorageWindow.arfColors[1]; + if (GUILayout.Button("Find", EditorStyles.miniButtonLeft, miniButtonWidth)) + { + // TODO Request the object from the server + toName = "(not implemented yet)"; + toType = ObjectType.NotIdentified; + } + EditorGUILayout.EndHorizontal(); + GUI.backgroundColor = ori; + toName = EditorGUILayout.TextField("Name", toName); + toType = (ObjectType)EditorGUILayout.EnumPopup("Type:", toType); + } EditorGUILayout.Space(10); GUILayout.Label("Local CRS:"); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 75d3cbd..db25c22 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 464 + y: 157.33333 + width: 696.44446 + height: 876.8889 + m_ShowMode: 0 + m_Title: ETSI ARF - Authoring Editor + m_RootView: {fileID: 4} + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -14,17 +38,67 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 206.22223 - y: 165.77779 - width: 1368 - height: 786.6667 + x: 12.888889 + y: 72 + width: 1365.3334 + height: 935.11115 m_ShowMode: 4 m_Title: Console - m_RootView: {fileID: 8} + m_RootView: {fileID: 11} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &2 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WorldStorageWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 696.44446 + height: 876.8889 + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 696.44446 + height: 876.8889 + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 1081 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -39,18 +113,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 547.1111 + x: 469.33334 y: 0 - width: 627.55554 - height: 291.7778 + width: 534.22217 + height: 350.00006 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 24} m_Panes: - - {fileID: 20} + - {fileID: 24} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,19 +137,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 - y: 444.8889 - width: 1174.6666 - height: 291.7778 + y: 535.1111 + width: 1003.55554 + height: 350.00006 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 173 ---- !u!114 &4 + controlID: 17 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,19 +162,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 5} + - {fileID: 14} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1368 - height: 736.6667 + width: 1365.3334 + height: 885.11115 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 219 ---- !u!114 &5 + controlID: 15 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -115,18 +189,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1174.6666 + x: 1003.55554 y: 0 - width: 193.33337 - height: 736.6667 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + width: 361.77783 + height: 885.11115 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 16} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -143,16 +217,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 281.33334 - height: 444.8889 + width: 239.55556 + height: 535.1111 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 17} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,16 +243,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 547.1111 - height: 291.7778 + width: 469.33334 + height: 350.00006 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 15} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -191,22 +265,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 4} - - {fileID: 10} + - {fileID: 12} + - {fileID: 7} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1368 - height: 786.6667 + width: 1365.3334 + height: 935.11115 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -223,12 +297,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1368 + width: 1365.3334 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &10 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,12 +318,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 766.6667 - width: 1368 + y: 915.11115 + width: 1365.3334 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &11 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -262,19 +336,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 3} + - {fileID: 15} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1174.6666 - height: 736.6667 + width: 1003.55554 + height: 885.11115 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 220 ---- !u!114 &12 + controlID: 16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -287,19 +361,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 13} + - {fileID: 9} + - {fileID: 16} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1174.6666 - height: 444.8889 + width: 1003.55554 + height: 535.1111 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 221 ---- !u!114 &13 + controlID: 102 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -314,20 +388,55 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 281.33334 + x: 239.55556 y: 0 - width: 893.33325 - height: 444.8889 + width: 764 + height: 535.1111 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 22} m_Panes: + - {fileID: 22} + - {fileID: 23} - {fileID: 18} - - {fileID: 19} - - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &14 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1647df9b48bf4f49a664a929fff57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: ETSI ARF - Authoring Editor + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 464 + y: 157.33333 + width: 696.44446 + height: 855.8889 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2} + worldStorageUser: {fileID: 11400000, guid: ce0f40be06008b14283766424922b729, type: 2} + creators: [] + trackables: [] + anchors: [] + links: + - c6998f4f-1b8d-460b-9de8-4793b92fae2a +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -355,7 +464,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &15 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -375,10 +484,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 206.22223 - y: 640.8889 - width: 546.1111 - height: 270.7778 + x: 12.888889 + y: 637.3333 + width: 468.33334 + height: 329.00006 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -409,9 +518,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 724b0000 - m_LastClickedID: 19314 - m_ExpandedIDs: 00000000544b0000564b0000584b00005a4b00005c4b00005e4b0000604b000000ca9a3bffffff7f + m_SelectedIDs: 5e4b0000 + m_LastClickedID: 19294 + m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -427,7 +536,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -439,7 +548,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000544b0000564b0000584b00005a4b00005c4b00005e4b0000604b0000 + m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -483,7 +592,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -495,7 +604,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 248.11111 ---- !u!114 &16 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -515,10 +624,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1380.8889 - y: 196 - width: 192.33337 - height: 715.6667 + x: 1016.44446 + y: 102.22222 + width: 360.77783 + height: 864.11115 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -536,7 +645,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &17 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -556,10 +665,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 206.22223 - y: 196 - width: 280.33334 - height: 423.8889 + x: 12.888889 + y: 102.22222 + width: 238.55556 + height: 514.1111 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -567,7 +676,7 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 844b0000 m_LastClickedID: 0 m_ExpandedIDs: 34fbffff m_RenameOverlay: @@ -593,7 +702,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 26d3cc4a749ad3148bdaac8cbfc0727d ---- !u!114 &18 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -613,10 +722,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 487.55557 - y: 196 - width: 891.33325 - height: 423.8889 + x: 252.44444 + y: 102.22222 + width: 762 + height: 514.1111 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -898,7 +1007,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -990,7 +1099,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &20 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1010,10 +1119,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 753.3333 - y: 640.8889 - width: 625.55554 - height: 270.7778 + x: 482.22223 + y: 637.3333 + width: 532.22217 + height: 329.00006 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default -- GitLab From e4ed2abf986b73ee0a385e1b465ede7a58fc8ddb Mon Sep 17 00:00:00 2001 From: Sylvain Renault Date: Mon, 13 Jun 2022 17:51:53 +0200 Subject: [PATCH 3/3] Use now API v1.0.0 --- Packages/unity-world-storage-package | 2 +- UserSettings/Layouts/default-2021.dwlt | 253 +++++++------------------ 2 files changed, 73 insertions(+), 182 deletions(-) diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package index c8406f1..688bf20 160000 --- a/Packages/unity-world-storage-package +++ b/Packages/unity-world-storage-package @@ -1 +1 @@ -Subproject commit c8406f18a9f789d4cc0eb2ef995d274797ea4051 +Subproject commit 688bf209c3e6d27d10782b2583b0e9c8edea15c7 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index db25c22..6907351 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 464 - y: 157.33333 - width: 696.44446 - height: 876.8889 - m_ShowMode: 0 - m_Title: ETSI ARF - Authoring Editor - m_RootView: {fileID: 4} - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,62 +19,12 @@ MonoBehaviour: width: 1365.3334 height: 935.11115 m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 11} + m_Title: Inspector + m_RootView: {fileID: 8} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: WorldStorageWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 696.44446 - height: 876.8889 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 696.44446 - height: 876.8889 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 1081 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -116,15 +42,15 @@ MonoBehaviour: x: 469.33334 y: 0 width: 534.22217 - height: 350.00006 + height: 350 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -137,19 +63,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 7} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 535.1111 width: 1003.55554 - height: 350.00006 + height: 350 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 ---- !u!114 &7 + controlID: 73 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -162,19 +88,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 8} + - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1365.3334 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 15 ---- !u!114 &8 + controlID: 156 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,15 +118,15 @@ MonoBehaviour: x: 1003.55554 y: 0 width: 361.77783 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -221,12 +147,12 @@ MonoBehaviour: height: 535.1111 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,15 +170,15 @@ MonoBehaviour: x: 0 y: 0 width: 469.33334 - height: 350.00006 + height: 350 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -265,22 +191,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 7} - - {fileID: 13} + - {fileID: 9} + - {fileID: 4} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1365.3334 - height: 935.11115 + height: 935.1111 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -302,7 +228,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -318,12 +244,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 915.11115 + y: 915.1111 width: 1365.3334 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -336,19 +262,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 6} + - {fileID: 12} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1003.55554 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16 ---- !u!114 &15 + controlID: 72 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -361,8 +287,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 16} + - {fileID: 6} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -372,8 +298,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 102 ---- !u!114 &16 + controlID: 184 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -394,49 +320,14 @@ MonoBehaviour: height: 535.1111 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} - - {fileID: 23} - {fileID: 18} + - {fileID: 19} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a1647df9b48bf4f49a664a929fff57ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: ETSI ARF - Authoring Editor - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 464 - y: 157.33333 - width: 696.44446 - height: 855.8889 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2} - worldStorageUser: {fileID: 11400000, guid: ce0f40be06008b14283766424922b729, type: 2} - creators: [] - trackables: [] - anchors: [] - links: - - c6998f4f-1b8d-460b-9de8-4793b92fae2a ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,7 +355,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -487,7 +378,7 @@ MonoBehaviour: x: 12.888889 y: 637.3333 width: 468.33334 - height: 329.00006 + height: 329 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -518,9 +409,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5e4b0000 - m_LastClickedID: 19294 - m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b000000ca9a3bffffff7f + m_SelectedIDs: 684b0000 + m_LastClickedID: 19304 + m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -536,7 +427,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -548,7 +439,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b0000 + m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -592,7 +483,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -604,7 +495,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 248.11111 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -627,7 +518,7 @@ MonoBehaviour: x: 1016.44446 y: 102.22222 width: 360.77783 - height: 864.11115 + height: 864.1111 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -645,7 +536,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -676,7 +567,7 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 844b0000 + m_SelectedIDs: 464b0000 m_LastClickedID: 0 m_ExpandedIDs: 34fbffff m_RenameOverlay: @@ -702,7 +593,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 26d3cc4a749ad3148bdaac8cbfc0727d ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1007,7 +898,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1058,8 +949,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -766 m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_VBaseRangeMin: -395 + m_VBaseRangeMax: 395 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1076,11 +967,11 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 21 + y: 0 width: 1532 - height: 769 + height: 790 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 766, y: 395} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -1088,9 +979,9 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -766 - y: -384.5 + y: -395 width: 1532 - height: 769 + height: 790 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 3447, y: 1777.5} @@ -1099,7 +990,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1122,7 +1013,7 @@ MonoBehaviour: x: 482.22223 y: 637.3333 width: 532.22217 - height: 329.00006 + height: 329 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default -- GitLab