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 0eafd8c91539352b1f4dbf06c6e47e0c6b9892a6..9847de9ed6d90f421d0af096a2e55836ecdc17c1 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 @@ -80,6 +80,11 @@ namespace ETSI.ARF.WorldStorage.UI winSingleton.UUID = UUID; winSingleton.GetTrackableParams(); } + else + { + // Create new one + winSingleton.AddTrackable(); + } } public static GameObject GenerateAndUpdateVisual(string UUID, string name, Vector3 pos, Vector3 rot) @@ -115,6 +120,7 @@ namespace ETSI.ARF.WorldStorage.UI gsTest = new GUIStyle("window"); //gsTest.normal.textColor = WorldStorageWindow.arfColors[0]; gsTest.fontStyle = FontStyle.Bold; + gsTest.alignment = TextAnchor.UpperLeft; gsTest.fontSize = 16; scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true)); @@ -132,7 +138,20 @@ namespace ETSI.ARF.WorldStorage.UI void DrawTrackableStuffs()// Trackable trackable) { - GUILayout.BeginVertical("Trackable Editor", gsTest); + GUILayout.BeginVertical(); // "Trackable Editor", gsTest); + EditorGUILayout.Space(); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[7]; + Texture trackableImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png", typeof(Texture)); + GUILayout.Box(trackableImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("Trackable Parameters:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); + + Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH); + EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[7]); + // GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel); GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel); @@ -150,25 +169,11 @@ namespace ETSI.ARF.WorldStorage.UI // --------------------- EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Create")) - { - Debug.Log("POST Trackable"); - - UUID = "0"; - if (string.IsNullOrEmpty(UUID) || UUID == "0") UUID = System.Guid.Empty.ToString(); - Trackable obj = GenerateTrackable(); - UUID = TrackableRequest.AddTrackable(worldStorageServer, obj); - UUID = UUID.Trim('"'); //Bugfix: remove " from server return value - WorldStorageWindow.WorldStorageWindowSingleton.GetTrackables(); - WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); - } - - GUI.backgroundColor = WorldStorageWindow.arfColors[0]; - if (GUILayout.Button("Update")) + if (GUILayout.Button("Save")) { Debug.Log("PUT Trackable"); - if (!string.IsNullOrEmpty(UUID) && UUID != "0") + if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString()) { Trackable obj = GenerateTrackable(); UUID = TrackableRequest.UpdateTrackable(worldStorageServer, obj); @@ -184,6 +189,7 @@ namespace ETSI.ARF.WorldStorage.UI Debug.Log("Delete Trackable"); TrackableRequest.DeleteTrackable(worldStorageServer, UUID); UUID = System.Guid.Empty.ToString(); + customName = "Warning: Object deleted !"; creatorUUID = System.Guid.Empty.ToString(); type = Trackable.TrackableTypeEnum.OTHER; unit = UnitSystem.CM; @@ -268,6 +274,19 @@ namespace ETSI.ARF.WorldStorage.UI this.Repaint(); } + public void AddTrackable() + { + Debug.Log("POST Trackable"); + UUID = System.Guid.Empty.ToString(); + customName = "Default Trackable"; + + Trackable obj = GenerateTrackable(); + UUID = TrackableRequest.AddTrackable(worldStorageServer, obj); + UUID = UUID.Trim('"'); //Bugfix: remove " from server return value + WorldStorageWindow.WorldStorageWindowSingleton.GetTrackables(); + WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); + } + public Trackable GenerateTrackable() { EncodingInformationStructure trackableEncodingInformation = new EncodingInformationStructure(EncodingInformationStructure.DataFormatEnum.ARCORE, "1.0"); 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 dec7509e00944607be869ae6ed5bba6b6ad07633..8260aae91c3d07221c9b9fe4b70ed7d48e19f0b0 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 @@ -77,6 +77,11 @@ namespace ETSI.ARF.WorldStorage.UI winSingleton.UUID = UUID; winSingleton.GetWorldAnchorParams(); } + else + { + // Create new one + winSingleton.AddAnchor(); + } } public static GameObject GenerateAndUpdateVisual(string UUID, string name, Vector3 pos, Vector3 rot) @@ -112,6 +117,7 @@ namespace ETSI.ARF.WorldStorage.UI gsTest = new GUIStyle("window"); //gsTest.normal.textColor = WorldStorageWindow.arfColors[0]; gsTest.fontStyle = FontStyle.Bold; + gsTest.alignment = TextAnchor.UpperLeft; gsTest.fontSize = 16; scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true)); @@ -129,7 +135,20 @@ namespace ETSI.ARF.WorldStorage.UI void DrawAnchorStuffs() { - GUILayout.BeginVertical("World Anchor Editor", gsTest); + GUILayout.BeginVertical(); // "World Anchor Editor", gsTest); + EditorGUILayout.Space(); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[8]; + Texture anchorImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png", typeof(Texture)); + GUILayout.Box(anchorImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("World Anchor Parameters:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); + + Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH); + EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[8]); + // GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel); GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel); @@ -147,25 +166,11 @@ namespace ETSI.ARF.WorldStorage.UI // --------------------- EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Create")) - { - Debug.Log("POST World Anchor"); - - UUID = "0"; - if (string.IsNullOrEmpty(UUID) || UUID == "0") UUID = System.Guid.Empty.ToString(); - WorldAnchor obj = GenerateWorldAnchor(); - UUID = WorldAnchorRequest.AddWorldAnchor(worldStorageServer, obj); - UUID = UUID.Trim('"'); //Bugfix: remove " from server return value - WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors(); - WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); - } - - GUI.backgroundColor = WorldStorageWindow.arfColors[0]; - if (GUILayout.Button("Update")) + if (GUILayout.Button("Save")) { Debug.Log("PUT World Anchor"); - if (!string.IsNullOrEmpty(UUID) && UUID != "0") + if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString()) { WorldAnchor obj = GenerateWorldAnchor(); UUID = WorldAnchorRequest.UpdateWorldAnchor(worldStorageServer, obj); @@ -181,6 +186,7 @@ namespace ETSI.ARF.WorldStorage.UI Debug.Log("Delete World Anchor"); WorldAnchorRequest.DeleteWorldAnchor(worldStorageServer, UUID); UUID = System.Guid.Empty.ToString(); + customName = "Warning: Object deleted !"; creatorUUID = System.Guid.Empty.ToString(); unit = UnitSystem.CM; WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors(); @@ -251,6 +257,19 @@ namespace ETSI.ARF.WorldStorage.UI this.Repaint(); } + public void AddAnchor() + { + Debug.Log("POST World Anchor"); + UUID = System.Guid.Empty.ToString(); + customName = "Default Anchor"; + + WorldAnchor obj = GenerateWorldAnchor(); + UUID = WorldAnchorRequest.AddWorldAnchor(worldStorageServer, obj); + UUID = UUID.Trim('"'); //Bugfix: remove " from server return value + WorldStorageWindow.WorldStorageWindowSingleton.GetWorldAnchors(); + WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); + } + 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 5dce92d4d28449c9439591a7aa27eaf1b8d6e989..3011f9eef172052729b3dbe14b6f271833aee8c2 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 @@ -92,6 +92,11 @@ namespace ETSI.ARF.WorldStorage.UI winSingleton.UUID = UUID; winSingleton.GetWorldLinkParams(); } + else + { + // Create new one + winSingleton.AddLink(); + } } public static GameObject GenerateAndUpdateVisual(string UUID, Element from, Element to) @@ -146,7 +151,9 @@ namespace ETSI.ARF.WorldStorage.UI gsTest = new GUIStyle("window"); //gsTest.normal.textColor = WorldStorageWindow.arfColors[0]; gsTest.fontStyle = FontStyle.Bold; + gsTest.alignment = TextAnchor.UpperLeft; gsTest.fontSize = 16; + gsTest.fixedHeight = 100; scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true)); WorldStorageWindow.DrawCopyright(); @@ -230,7 +237,20 @@ namespace ETSI.ARF.WorldStorage.UI void DrawAnchorStuffs() { - GUILayout.BeginVertical("World Link Editor", gsTest); + GUILayout.BeginVertical(); // "World Link Editor", gsTest); + EditorGUILayout.Space(); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[9]; + Texture linkImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/link.png", typeof(Texture)); + GUILayout.Box(linkImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("World Link Parameters:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); + + Rect rect = EditorGUILayout.GetControlRect(false, WorldStorageWindow.lineH); + EditorGUI.DrawRect(rect, WorldStorageWindow.arfColors[9]); + // GUILayout.Label("Server: " + worldStorageServer.serverName, EditorStyles.whiteLargeLabel); GUILayout.Label("User: " + worldStorageUser.userName, EditorStyles.whiteLargeLabel); @@ -240,6 +260,8 @@ namespace ETSI.ARF.WorldStorage.UI GUILayout.Label("UUID: " + UUID, EditorStyles.miniLabel); // readonly GUILayout.Label("Creator UID: " + creatorUUID, EditorStyles.miniLabel); // readonly #endif + + EditorGUILayout.Space(); // --------------------- @@ -247,25 +269,11 @@ namespace ETSI.ARF.WorldStorage.UI // --------------------- EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Create")) - { - Debug.Log("POST World Link"); - - UUID = "0"; - if (string.IsNullOrEmpty(UUID) || UUID == "0") UUID = System.Guid.Empty.ToString(); - WorldLink obj = GenerateWorldLink(); - UUID = WorldLinkRequest.AddWorldLink(worldStorageServer, obj); - UUID = UUID.Trim('"'); //Bugfix: remove " from server return value - WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks(); - WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); - } - - GUI.backgroundColor = WorldStorageWindow.arfColors[0]; - if (GUILayout.Button("Update")) + if (GUILayout.Button("Save")) { Debug.Log("PUT World Link"); - if (!string.IsNullOrEmpty(UUID) && UUID != "0") + if (!string.IsNullOrEmpty(UUID) && UUID != "0" && UUID != System.Guid.Empty.ToString()) { WorldLink obj = GenerateWorldLink(); UUID = WorldLinkRequest.UpdateWorldLink(worldStorageServer, obj); @@ -281,6 +289,7 @@ namespace ETSI.ARF.WorldStorage.UI Debug.Log("Delete World Link"); WorldLinkRequest.DeleteWorldLink(worldStorageServer, UUID); UUID = System.Guid.Empty.ToString(); + customName = "Warning: Object deleted !"; creatorUUID = System.Guid.Empty.ToString(); unit = UnitSystem.CM; WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks(); @@ -303,7 +312,7 @@ namespace ETSI.ARF.WorldStorage.UI string lastFromUUID = FROM.UUID; string lastToUUID = TO.UUID; - if (GUILayout.Button("Get From/To Elements from Scene Selection")) + if (GUILayout.Button("Use 'From-To' Objects from Scene Selection")) { GameObject from, to; GameObject[] SelectedObjects = Selection.gameObjects; @@ -322,7 +331,7 @@ namespace ETSI.ARF.WorldStorage.UI } } - showListFrom = EditorGUILayout.Foldout(showListFrom, "From (parent object)"); + showListFrom = EditorGUILayout.Foldout(showListFrom, "Parent Object (From)"); if (showListFrom) { EditorGUILayout.BeginHorizontal(); @@ -333,19 +342,19 @@ namespace ETSI.ARF.WorldStorage.UI FROM.UUID = FROM.UUID.Split('[', ']')[1]; } - GUI.backgroundColor = WorldStorageWindow.arfColors[1]; + GUI.backgroundColor = WorldStorageWindow.arfColors[0]; if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastFromUUID != FROM.UUID) { GetElementFROM(); } EditorGUILayout.EndHorizontal(); GUI.backgroundColor = ori; - FROM.name = EditorGUILayout.TextField("Name:", FROM.name); - FROM.type = (ObjectType)EditorGUILayout.EnumPopup("Type:", FROM.type); + EditorGUILayout.LabelField("Name:", FROM.name); + EditorGUILayout.LabelField("Type:", FROM.type.ToString()); } EditorGUILayout.Space(); - showListTo = EditorGUILayout.Foldout(showListTo, "To (child object)"); + showListTo = EditorGUILayout.Foldout(showListTo, "Child Object (To)"); if (showListTo) { EditorGUILayout.BeginHorizontal(); @@ -355,15 +364,15 @@ namespace ETSI.ARF.WorldStorage.UI // extract the UUID TO.UUID = TO.UUID.Split('[', ']')[1]; } - GUI.backgroundColor = WorldStorageWindow.arfColors[1]; + GUI.backgroundColor = WorldStorageWindow.arfColors[0]; if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastToUUID != TO.UUID) { GetElementTO(); } EditorGUILayout.EndHorizontal(); GUI.backgroundColor = ori; - TO.name = EditorGUILayout.TextField("Name:", TO.name); - TO.type = (ObjectType)EditorGUILayout.EnumPopup("Type:", TO.type); + EditorGUILayout.LabelField("Name:", TO.name); + EditorGUILayout.LabelField("Type:", TO.type.ToString()); } EditorGUILayout.Space(); @@ -417,6 +426,19 @@ namespace ETSI.ARF.WorldStorage.UI this.Repaint(); } + public void AddLink() + { + Debug.Log("POST World Link"); + UUID = System.Guid.Empty.ToString(); + customName = "Default Link"; + + WorldLink obj = GenerateWorldLink(); + UUID = WorldLinkRequest.AddWorldLink(worldStorageServer, obj); + UUID = UUID.Trim('"'); //Bugfix: remove " from server return value + WorldStorageWindow.WorldStorageWindowSingleton.GetWorldLinks(); + WorldStorageWindow.WorldStorageWindowSingleton.Repaint(); + } + 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 46d364f117264f6dd31beda946f768e8f394ebd2..1ca7613719e1208c0536f506f42ec6d1811b3326 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 @@ -68,15 +68,19 @@ namespace ETSI.ARF.WorldStorage.UI private string filterByKeyValueTag = ""; static public string winName = "ARF Authoring Editor"; + static public int lineH= 2; static public Color[] arfColors = new Color[] { Color.yellow, // paneltext new Color(0.3f, 1f, 1f), // button REST - new Color(0.3f, 1f, 0.3f), // button create + new Color(0.3f, 1f, 0.3f), // button create new Color(1f, 0f, 0f), // button delete (red) - new Color(1f, 0f, 1f), // button graph - new Color(.7f, .5f, 1f), // button prefab - new Color(1f, 1f, 0.3f) // button request + new Color(.7f, .5f, 1f), // button graph window + new Color(.3f, .7f, 1f), // button generate prefab + new Color(1f, 1f, 0.3f), // button request + new Color(1f, 0.3f, 0.3f), // color for trackables + new Color(1f, 0.7f, 0f), // color for anchors + new Color(.66f, .4f, 1f) // color for links }; @@ -104,6 +108,7 @@ namespace ETSI.ARF.WorldStorage.UI gsTest = new GUIStyle("window"); //gsTest.normal.textColor = WorldStorageWindow.arfColors[0]; gsTest.fontStyle = FontStyle.Bold; + gsTest.alignment = TextAnchor.UpperLeft; gsTest.fontSize = 16; scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.ExpandWidth(true)); @@ -111,6 +116,9 @@ namespace ETSI.ARF.WorldStorage.UI // Server info GUILayout.BeginVertical("World Storage Server", gsTest); + EditorGUILayout.Space(); + Rect rect = EditorGUILayout.GetControlRect(false, 1); + EditorGUI.DrawRect(rect, Color.black); // GUILayout gl = new GUILayout(); @@ -180,10 +188,10 @@ namespace ETSI.ARF.WorldStorage.UI ScriptableObject target = this; SerializedObject so = new SerializedObject(target); - GUI.backgroundColor = WorldStorageWindow.arfColors[4]; + //GUI.backgroundColor = WorldStorageWindow.arfColors[4]; if (GUILayout.Button("Open World Graph Window...")) { - GraphWindow.ShowWindow(); + //GraphWindow.ShowWindow(); } GUI.backgroundColor = ori; @@ -192,8 +200,8 @@ namespace ETSI.ARF.WorldStorage.UI // ########################################################### #region Get all creator UUID EditorGUILayout.Space(); - GUI.backgroundColor = WorldStorageWindow.arfColors[1]; - if (GUILayout.Button("Request all Creator ID")) GetCreators(); + GUI.backgroundColor = WorldStorageWindow.arfColors[0]; + if (GUILayout.Button("Request UUID of Creators")) GetCreators(); GUI.backgroundColor = ori; SerializedProperty stringsProperty = so.FindProperty("creators"); @@ -218,7 +226,14 @@ namespace ETSI.ARF.WorldStorage.UI // ########################################################### #region Get all trackable objects EditorGUILayout.Space(); - GUILayout.Label("Trackables:", EditorStyles.whiteLargeLabel); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[7]; + Texture trackableImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png", typeof(Texture)); + GUILayout.Box(trackableImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("Trackables:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[0]; @@ -226,15 +241,15 @@ namespace ETSI.ARF.WorldStorage.UI { GetTrackables(); } - GUI.backgroundColor = ori; - //GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Open Editor...")) + GUI.backgroundColor = WorldStorageWindow.arfColors[2]; + if (GUILayout.Button("Create New")) { - Debug.Log("Open Trackable Window"); + Debug.Log("Create trackable and open window"); TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser); } + GUI.backgroundColor = ori; //GUI.backgroundColor = WorldStorageWindow.arfColors[3]; if (GUILayout.Button("Delete all Trackables (3 stay in!!!)")) { @@ -276,7 +291,14 @@ namespace ETSI.ARF.WorldStorage.UI string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); if (UUID == null) UUID = trackables[i]; // try this - if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Trackable Window"); + TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + + GUI.backgroundColor = WorldStorageWindow.arfColors[3]; + if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth)) { if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel")) { @@ -285,11 +307,8 @@ namespace ETSI.ARF.WorldStorage.UI WorldStorageWindowSingleton.Repaint(); } } - if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) - { - Debug.Log("Open Trackable Window"); - TrackableWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); - } + GUI.backgroundColor = ori; + EditorGUILayout.EndHorizontal(); } EditorGUILayout.EndFoldoutHeaderGroup(); @@ -300,7 +319,14 @@ namespace ETSI.ARF.WorldStorage.UI // ########################################################### #region Get all anchor objects EditorGUILayout.Space(); - GUILayout.Label("World Anchors:", EditorStyles.whiteLargeLabel); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[8]; + Texture anchorImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png", typeof(Texture)); + GUILayout.Box(anchorImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("World Anchors:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[0]; @@ -308,15 +334,15 @@ namespace ETSI.ARF.WorldStorage.UI { GetWorldAnchors(); } - GUI.backgroundColor = ori; - //GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Open Editor...")) + GUI.backgroundColor = WorldStorageWindow.arfColors[2]; + if (GUILayout.Button("Create New")) { - Debug.Log("Open World Anchor Window"); + Debug.Log("Create anchor and open window"); WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser); } + GUI.backgroundColor = ori; //GUI.backgroundColor = WorldStorageWindow.arfColors[3]; if (GUILayout.Button("Delete all Anchors (3 stay in!!!)")) { @@ -358,7 +384,14 @@ namespace ETSI.ARF.WorldStorage.UI string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); if (UUID == null) UUID = anchors[i]; // try this - if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Anchor Window"); + WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + + GUI.backgroundColor = WorldStorageWindow.arfColors[3]; + if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth)) { if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel")) { @@ -367,11 +400,8 @@ namespace ETSI.ARF.WorldStorage.UI WorldStorageWindowSingleton.Repaint(); } } - if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) - { - Debug.Log("Open Anchor Window"); - WorldAnchorWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); - } + GUI.backgroundColor = ori; + EditorGUILayout.EndHorizontal(); } EditorGUILayout.EndFoldoutHeaderGroup(); @@ -382,7 +412,14 @@ namespace ETSI.ARF.WorldStorage.UI // ########################################################### #region Get all link objects EditorGUILayout.Space(); - GUILayout.Label("World Links:", EditorStyles.whiteLargeLabel); + + GUILayout.BeginHorizontal(); + GUI.backgroundColor = WorldStorageWindow.arfColors[9]; + Texture linkImage = (Texture)AssetDatabase.LoadAssetAtPath("Assets/ETSI.ARF/ARF World Storage API/Images/link.png", typeof(Texture)); + GUILayout.Box(linkImage, GUILayout.Width(24), GUILayout.Height(24)); + GUI.backgroundColor = ori; + GUILayout.Label("World Links:", EditorStyles.whiteBoldLabel); + GUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); GUI.backgroundColor = WorldStorageWindow.arfColors[0]; @@ -390,15 +427,15 @@ namespace ETSI.ARF.WorldStorage.UI { GetWorldLinks(); } - GUI.backgroundColor = ori; - //GUI.backgroundColor = WorldStorageWindow.arfColors[2]; - if (GUILayout.Button("Open Editor...")) + GUI.backgroundColor = WorldStorageWindow.arfColors[2]; + if (GUILayout.Button("Create New")) { - Debug.Log("Open World Link Window"); + Debug.Log("Create link and open window"); WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser); } + GUI.backgroundColor = ori; //GUI.backgroundColor = WorldStorageWindow.arfColors[3]; if (GUILayout.Button("Delete all Links (3 stay in!!!)")) { @@ -440,7 +477,15 @@ namespace ETSI.ARF.WorldStorage.UI string UUID = WorldStorageWindow.GetUUIDFromString(stringsProperty.GetArrayElementAtIndex(i).stringValue); if (UUID == null) UUID = links[i]; // try this - if (GUILayout.Button("-", EditorStyles.miniButtonLeft, miniButtonWidth)) + if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) + { + Debug.Log("Open Link Window"); + + WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); + } + + GUI.backgroundColor = WorldStorageWindow.arfColors[3]; + if (GUILayout.Button("X", EditorStyles.miniButtonLeft, miniButtonWidth)) { if (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel")) { @@ -449,13 +494,8 @@ namespace ETSI.ARF.WorldStorage.UI WorldStorageWindowSingleton.Repaint(); } } + GUI.backgroundColor = ori; - if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth)) - { - Debug.Log("Open Link Window"); - - WorldLinkWindow.ShowWindow(worldStorageServer, worldStorageUser, UUID); - } EditorGUILayout.EndHorizontal(); } EditorGUILayout.EndFoldoutHeaderGroup(); diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images.meta b/Assets/ETSI.ARF/ARF World Storage API/Images.meta new file mode 100644 index 0000000000000000000000000000000000000000..bb9559bf302087e412462086f6bcd17a7a5b64b4 --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 959ac6161f5900d4aa7903c24bc5a31d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1804db730faff5a6f0a7523a8729085e8dae34 Binary files /dev/null and b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png differ diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..b8da83ad1c9b68b8a96b51093d3f1d54aa6d78dd --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Images/anchor.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 000725cae67a4f7448f79fe2a478a50d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png new file mode 100644 index 0000000000000000000000000000000000000000..dda8f37b2a455617c9f692431928b0502e31747c Binary files /dev/null and b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png differ diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..70c4feda72dbe3c9d316954b91263554356c5505 --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Images/link.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: fef18a27fe1e4a040b8cfda6b3b5c178 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png new file mode 100644 index 0000000000000000000000000000000000000000..f31019b2f9ea607e3bfa127348fa17d80296938d Binary files /dev/null and b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png differ diff --git a/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..fb299339b1756f509d67421574faa81ac5b0fa47 --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Images/trackable.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 90d4635c9d0895c42bec0551c4e790ea +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 84539cb558dec5537ee78c24c52fa8421566d7a1..ab45c6b5474889d9fc77cc917a8d11fff82f68b4 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1642.6666 height: 888.44446 m_ShowMode: 4 - m_Title: Scene + m_Title: Project 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: 574.2222 + x: 619.1111 y: 0 - width: 653.7778 + width: 704.8889 height: 331.7778 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -69,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 506.66666 - width: 1228 + width: 1324 height: 331.7778 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 + controlID: 98 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -99,7 +99,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 103 + controlID: 17 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -115,12 +115,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1228 + x: 1324 y: 0 - width: 414.66663 + width: 318.66663 height: 838.44446 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -143,10 +143,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 346.22223 + width: 373.77777 height: 506.66666 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -169,7 +169,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 574.2222 + width: 619.1111 height: 331.7778 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -268,12 +268,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1228 + width: 1324 height: 838.44446 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 137 + controlID: 59 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -293,12 +293,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1228 + width: 1324 height: 506.66666 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 138 + controlID: 60 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -314,12 +314,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 346.22223 + x: 373.77777 y: 0 - width: 881.7778 + width: 950.2222 height: 506.66666 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -377,7 +377,7 @@ MonoBehaviour: serializedVersion: 2 x: 13.333333 y: 595.11115 - width: 573.2222 + width: 618.1111 height: 310.7778 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -396,22 +396,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/ETSI.ARF/ARF World Storage API/Scripts + - Assets/ETSI.ARF/ARF World Storage API/Images m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/ETSI.ARF/ARF World Storage API/Scripts + - Assets/ETSI.ARF/ARF World Storage API/Images m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Fraunhofer\Projects\ETSI\GitLab (STF)\unity-world-storage-editor m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 19.738289} - m_SelectedIDs: f04c0000 - m_LastClickedID: 19696 - m_ExpandedIDs: 00000000d24c0000d44c0000d64c0000d84c0000da4c0000dc4c0000de4c000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 004e0000 + m_LastClickedID: 19968 + m_ExpandedIDs: 000000003c4d00003e4d0000404d0000424d0000444d0000464d0000484d000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -439,7 +439,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d24c0000d44c0000d64c0000d84c0000da4c0000dc4c0000de4c0000 + m_ExpandedIDs: 000000003c4d00003e4d0000404d0000424d0000444d0000464d0000484d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -466,7 +466,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000de4b000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -515,9 +515,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1241.3334 + x: 1337.3334 y: 88.88889 - width: 413.66663 + width: 317.66663 height: 817.44446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -558,7 +558,7 @@ MonoBehaviour: serializedVersion: 2 x: 13.333333 y: 88.88889 - width: 345.22223 + width: 372.77777 height: 485.66666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -567,9 +567,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 684b0000724b0000 - m_LastClickedID: 19314 - m_ExpandedIDs: 8cdaffff92daffffdcefffff34fbffff084c0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 34fbffff804c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -613,9 +613,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 359.55557 + x: 387.1111 y: 88.88889 - width: 879.7778 + width: 948.2222 height: 485.66666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -626,8 +626,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -98.22223, y: -25.777771} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -98.22223, y: -25.777771} snapCorner: 3 id: Tool Settings index: 0 @@ -648,7 +648,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.88889} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -670,7 +670,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.88889} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -869,7 +869,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.08381799, y: -0.044827957, z: 0.0037659912, w: 0.9954731} speed: 2 - m_Value: {x: 0.082324035, y: -0.044833202, z: 0.0036987138, w: 0.9955899} + m_Value: {x: 0.083817326, y: -0.044827603, z: 0.0037659616, w: 0.9954653} m_Size: m_Target: 0.6397584 speed: 2 @@ -1010,9 +1010,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 587.55554 + x: 632.44446 y: 595.11115 - width: 651.7778 + width: 702.8889 height: 310.7778 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: