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 f6da0d87d4cc6ff8f44b91e4ec42199f1fd9a311..3a361a83e62ea9d36bb94b60f290139df8ad972f 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
@@ -60,6 +60,8 @@ namespace ETSI.ARF.WorldStorage.UI
Vector3 localCRS_rot;
byte[] trackablePayload = new byte[1] { 0 };
[SerializeField] Dictionary<string, List<string>> keyValueTags = new Dictionary<string, List<string>>();
+ string key1 = "";
+ string value1 = "";
// UI stuffs
private Vector2 scrollPos;
@@ -120,14 +122,14 @@ namespace ETSI.ARF.WorldStorage.UI
#endif
EditorGUILayout.Space();
- GUI.backgroundColor = WorldStorageWindow.arfColors[1];
- if (GUILayout.Button("Read Parameters"))
- {
- UUID = WorldStorageWindow.GetUUIDFromString(customName);
- if (UUID == null) UUID = customName; // try this
- GetTrackableParams();
- }
- GUI.backgroundColor = ori;
+ //GUI.backgroundColor = WorldStorageWindow.arfColors[1];
+ //if (GUILayout.Button("Read Parameters"))
+ //{
+ // UUID = WorldStorageWindow.GetUUIDFromString(customName);
+ // if (UUID == null) UUID = customName; // try this
+ // GetTrackableParams();
+ //}
+ //GUI.backgroundColor = ori;
type = (Trackable.TrackableTypeEnum)EditorGUILayout.EnumPopup("Trackable Type:", type);
unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
@@ -137,8 +139,8 @@ namespace ETSI.ARF.WorldStorage.UI
EditorGUILayout.Space(10);
GUILayout.Label("Local CRS:");
- localCRS_pos = EditorGUILayout.Vector3Field("Position:", localCRS_pos);
- localCRS_rot = EditorGUILayout.Vector3Field("Rotation:", localCRS_rot);
+ localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);
+ localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);
EditorGUILayout.Space();
if (GUILayout.Button("Generate Dummy Payload"))
@@ -153,25 +155,10 @@ namespace ETSI.ARF.WorldStorage.UI
EditorGUILayout.Space();
groupEnabled = EditorGUILayout.BeginToggleGroup("Optional Parameters:", groupEnabled);
- //EditorGUILayout.IntField("Number of KeyValues", 0);
- //EditorGUILayout.Space();
- //EditorGUILayout.TextField("Key", "");
- //EditorGUILayout.TextField("Value", "");
- if (GUILayout.Button("Generate Dummy Key Values"))
- {
- // dummy
- keyValueTags.Clear();
- keyValueTags.Add("Location", new List<string> { "Room1" });
- }
- // Test
- //keyValueTags.Add("1", "a");
- //ScriptableObject target = this;
- //SerializedObject so = new SerializedObject(target);
- //SerializedProperty stringsProperty = so.FindProperty("trackables");
- //EditorGUILayout.PropertyField(stringsProperty, true); // True means show children
- //so.ApplyModifiedProperties(); // Remember to apply modified properties
+ key1 = EditorGUILayout.TextField("Key 1", key1);
+ value1 = EditorGUILayout.TextField("Value 1", value1);
EditorGUILayout.EndToggleGroup();
-
+ //
GUILayout.EndVertical();
// ###########################################################
@@ -252,7 +239,12 @@ namespace ETSI.ARF.WorldStorage.UI
localCRS_pos = Vector3.zero;
localCRS_rot = Vector3.zero;
}
- keyValueTags = obj.KeyvalueTags;
+
+ // Read a key value (demo)
+ var first = WorldStorageWindow.GetFirstKeyValueTags(obj.KeyvalueTags);
+ key1 = first.Item1;
+ value1 = first.Item2;
+
this.Repaint(); // TODO
}
@@ -281,6 +273,10 @@ namespace ETSI.ARF.WorldStorage.UI
localCRS.m30, localCRS.m31, localCRS.m32, localCRS.m33,
};
+ // Create a key value (one from demo)
+ keyValueTags.Clear();
+ keyValueTags.Add(key1, new List<string> { value1 });
+
System.Guid _uuid = System.Guid.Parse(UUID);
System.Guid _creator = System.Guid.Parse(worldStorageUser.UUID);
Trackable t = new Trackable(_uuid, customName, _creator, type, trackableEncodingInformation, trackablePayload, _localCRS, unit, _trackableSize, keyValueTags);
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 ae8f0c379215bd756a536fc952252aca8ee6dd3a..5eddea42b2f5f159dc6c59fbb2a600a2a18af331 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
@@ -57,6 +57,8 @@ namespace ETSI.ARF.WorldStorage.UI
Vector3 localCRS_pos;
Vector3 localCRS_rot;
[SerializeField] Dictionary<string, List<string>> keyValueTags = new Dictionary<string, List<string>>();
+ string key1 = "";
+ string value1 = "";
// UI stuffs
private Vector2 scrollPos;
@@ -117,14 +119,14 @@ namespace ETSI.ARF.WorldStorage.UI
#endif
EditorGUILayout.Space();
- GUI.backgroundColor = WorldStorageWindow.arfColors[1];
- if (GUILayout.Button("Read Parameters"))
- {
- UUID = WorldStorageWindow.GetUUIDFromString(customName);
- if (UUID == null) UUID = customName; // try this
- GetWorldAnchorParams();
- }
- GUI.backgroundColor = ori;
+ //GUI.backgroundColor = WorldStorageWindow.arfColors[1];
+ //if (GUILayout.Button("Read Parameters"))
+ //{
+ // UUID = WorldStorageWindow.GetUUIDFromString(customName);
+ // if (UUID == null) UUID = customName; // try this
+ // GetWorldAnchorParams();
+ //}
+ //GUI.backgroundColor = ori;
unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
@@ -133,21 +135,13 @@ namespace ETSI.ARF.WorldStorage.UI
EditorGUILayout.Space(10);
GUILayout.Label("Local CRS:");
- localCRS_pos = EditorGUILayout.Vector3Field("Position:", localCRS_pos);
- localCRS_rot = EditorGUILayout.Vector3Field("Rotation:", localCRS_rot);
+ localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);
+ localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);
EditorGUILayout.Space();
groupEnabled = EditorGUILayout.BeginToggleGroup("Optional Parameters:", groupEnabled);
- //EditorGUILayout.IntField("Number of KeyValues", 0);
- //EditorGUILayout.Space();
- //EditorGUILayout.TextField("Key", "");
- //EditorGUILayout.TextField("Value", "");
- if (GUILayout.Button("Generate Dummy Key Values"))
- {
- // dummy
- keyValueTags.Clear();
- keyValueTags.Add("Location", new List<string> { "Room1" });
- }
+ key1 = EditorGUILayout.TextField("Key 1", key1);
+ value1 = EditorGUILayout.TextField("Value 1", value1);
EditorGUILayout.EndToggleGroup();
//
GUILayout.EndVertical();
@@ -228,7 +222,12 @@ namespace ETSI.ARF.WorldStorage.UI
localCRS_pos = Vector3.zero;
localCRS_rot = Vector3.zero;
}
- keyValueTags = obj.KeyvalueTags;
+
+ // Read a key value (demo)
+ var first = WorldStorageWindow.GetFirstKeyValueTags(obj.KeyvalueTags);
+ key1 = first.Item1;
+ value1 = first.Item2;
+
this.Repaint(); // TODO
}
@@ -254,6 +253,10 @@ namespace ETSI.ARF.WorldStorage.UI
localCRS.m30, localCRS.m31, localCRS.m32, localCRS.m33,
};
+ // Create a key value (one from demo)
+ keyValueTags.Clear();
+ keyValueTags.Add(key1, new List<string> { value1 });
+
System.Guid _uuid = System.Guid.Parse(UUID);
System.Guid _creator = System.Guid.Parse(worldStorageUser.UUID);
WorldAnchor t = new WorldAnchor(_uuid, customName, _creator, _localCRS, unit, _worldAnchorSize, keyValueTags);
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 039ca12bd60d73fa1e2c80918e3796763059ee4b..05971e7fdbb19d0de741895a5d2ddba887989c00 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
@@ -120,36 +120,49 @@ namespace ETSI.ARF.WorldStorage.UI
EditorGUILayout.Space();
//GUILayout.BeginHorizontal();
- customName = EditorGUILayout.TextField("Name of Link", customName);
+ //customName = EditorGUILayout.TextField("Name of Link", customName);
#if isDEBUG
GUILayout.Label("UUID: " + UUID, EditorStyles.miniLabel); // readonly
GUILayout.Label("Creator UID: " + creatorUUID, EditorStyles.miniLabel); // readonly
#endif
EditorGUILayout.Space();
- GUI.backgroundColor = WorldStorageWindow.arfColors[1];
- if (GUILayout.Button("Read Parameters"))
- {
- UUID = WorldStorageWindow.GetUUIDFromString(customName);
- if (UUID == null) UUID = customName; // try this
- GetWorldLinkParams();
- }
- GUI.backgroundColor = ori;
-
- unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
EditorGUILayout.Space();
- showListFrom = EditorGUILayout.Foldout(showListFrom, "Parent Object (From)");
+ showListFrom = EditorGUILayout.Foldout(showListFrom, "From (parent object)");
if (showListFrom)
{
EditorGUILayout.BeginHorizontal();
- fromUUID = EditorGUILayout.TextField("UUID", fromUUID);
+ string lastFromUUID = fromUUID;
+ fromUUID = EditorGUILayout.TextField("Enter a valid UUID:", fromUUID);
GUI.backgroundColor = WorldStorageWindow.arfColors[1];
- if (GUILayout.Button("Find", EditorStyles.miniButtonLeft, miniButtonWidth))
+ if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastFromUUID != fromUUID)
{
- // TODO Request the object from the server
- fromName = "(not implemented yet)";
- fromType = ObjectType.NotIdentified;
+ bool found = false;
+ try
+ {
+ Trackable result = TrackableRequest.GetTrackable(worldStorageServer, fromUUID);
+ fromName = result.Name;
+ fromType = ObjectType.Trackable;
+ found = true;
+ }
+ catch { /* Object was not found */ }
+
+ if (!found)
+ try
+ {
+ WorldAnchor result = WorldAnchorRequest.GetWorldAnchor(worldStorageServer, fromUUID);
+ fromName = result.Name;
+ fromType = ObjectType.WorldAnchor;
+ found = true;
+ }
+ catch { /* Object was not found */ }
+
+ if (!found)
+ {
+ fromName = "";
+ fromType = ObjectType.NotIdentified;
+ }
}
EditorGUILayout.EndHorizontal();
GUI.backgroundColor = ori;
@@ -158,17 +171,40 @@ namespace ETSI.ARF.WorldStorage.UI
}
EditorGUILayout.Space();
- showListTo = EditorGUILayout.Foldout(showListTo, "Child Object (To)");
+ showListTo = EditorGUILayout.Foldout(showListTo, "To (child object)");
if (showListTo)
{
EditorGUILayout.BeginHorizontal();
- toUUID = EditorGUILayout.TextField("UUID", toUUID);
+ string lastToUUID = fromUUID;
+ toUUID = EditorGUILayout.TextField("Eenter a valid UUID:", toUUID);
GUI.backgroundColor = WorldStorageWindow.arfColors[1];
- if (GUILayout.Button("Find", EditorStyles.miniButtonLeft, miniButtonWidth))
+ if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) || lastToUUID != toUUID)
{
- // TODO Request the object from the server
- toName = "(not implemented yet)";
- toType = ObjectType.NotIdentified;
+ bool found = false;
+ try
+ {
+ Trackable result = TrackableRequest.GetTrackable(worldStorageServer, toUUID);
+ toName = result.Name;
+ toType = ObjectType.Trackable;
+ found = true;
+ }
+ catch { /* Object was not found */ }
+
+ if (!found)
+ try
+ {
+ WorldAnchor result = WorldAnchorRequest.GetWorldAnchor(worldStorageServer, toUUID);
+ toName = result.Name;
+ toType = ObjectType.WorldAnchor;
+ found = true;
+ }
+ catch { /* Object was not found */ }
+
+ if (!found)
+ {
+ toName = "";
+ toType = ObjectType.NotIdentified;
+ }
}
EditorGUILayout.EndHorizontal();
GUI.backgroundColor = ori;
@@ -177,6 +213,7 @@ namespace ETSI.ARF.WorldStorage.UI
}
EditorGUILayout.Space(10);
+ unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);
GUILayout.Label("Local CRS:");
localCRS_pos = EditorGUILayout.Vector3Field("Position:", localCRS_pos);
localCRS_rot = EditorGUILayout.Vector3Field("Rotation:", localCRS_rot);
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 d9830453e88a3ac9833f28abe5faaa663c98fb7b..490ff31eae955256b4eebddb231b2066ef845a85 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
@@ -64,6 +64,8 @@ namespace ETSI.ARF.WorldStorage.UI
private bool showListT = true;
private bool showListA = true;
private bool showListL = true;
+
+ private string filterByKeyValueTag = "";
static public string winName = "ARF Authoring Editor";
static public Color[] arfColors = new Color[]
@@ -92,7 +94,7 @@ namespace ETSI.ARF.WorldStorage.UI
{
// Title
GUILayout.Label("Augmented Reality Framework", EditorStyles.boldLabel);
- GUILayout.Label("Copyright(c) 2022, ETSI (BSD 3-Clause License)");
+ GUILayout.Label("Copyright (C) 2022, ETSI (BSD 3-Clause License)");
}
void OnGUI()
@@ -195,6 +197,17 @@ namespace ETSI.ARF.WorldStorage.UI
so.ApplyModifiedProperties(); // Remember to apply modified properties
#endregion
+ EditorGUILayout.Space(10);
+ GUILayout.Label("World Storage Elements", EditorStyles.whiteLargeLabel);
+
+ // ###########################################################
+ // Handle Key Values
+ // ###########################################################
+ #region Filter
+ EditorGUILayout.Space(10);
+ filterByKeyValueTag = EditorGUILayout.TextField("Filter Value (Key = Group):", filterByKeyValueTag);
+ #endregion
+
// ###########################################################
// Handle trackables
// ###########################################################
@@ -248,15 +261,17 @@ namespace ETSI.ARF.WorldStorage.UI
{
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 (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
+ {
+ TrackableRequest.DeleteTrackable(worldStorageServer, UUID);
+ WorldStorageWindowSingleton.GetTrackables();
+ WorldStorageWindowSingleton.Repaint();
+ }
}
if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
{
@@ -321,15 +336,17 @@ namespace ETSI.ARF.WorldStorage.UI
{
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 (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
+ {
+ WorldAnchorRequest.DeleteWorldAnchor(worldStorageServer, UUID);
+ WorldStorageWindowSingleton.GetWorldAnchors();
+ WorldStorageWindowSingleton.Repaint();
+ }
}
if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
{
@@ -394,16 +411,19 @@ namespace ETSI.ARF.WorldStorage.UI
{
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 (EditorUtility.DisplayDialog("Delete", "Are you sure you want to delete this element?", "Delete", "Cancel"))
+ {
+ WorldLinkRequest.DeleteWorldLink(worldStorageServer, UUID);
+ WorldStorageWindowSingleton.GetWorldLinks();
+ WorldStorageWindowSingleton.Repaint();
+ }
}
+
if (GUILayout.Button("Edit...", EditorStyles.miniButtonLeft, buttonWidth))
{
Debug.Log("Open Link Window");
@@ -444,6 +464,24 @@ namespace ETSI.ARF.WorldStorage.UI
}
}
+ static public (string, string) GetFirstKeyValueTags(Dictionary<string, List<string>> dict)
+ {
+ if (dict.Count >= 1)
+ {
+ // Get the first value in account (demo)
+ foreach (var item in dict)
+ {
+ string key1 = item.Key;
+ if (item.Value.Count >= 1)
+ {
+ string value1 = item.Value[0];
+ return (key1, value1);
+ }
+ }
+ }
+ return ("", "");
+ }
+
public void GetTrackables()
{
// Get all objects
@@ -452,6 +490,11 @@ namespace ETSI.ARF.WorldStorage.UI
trackables.Clear();
foreach (var item in res)
{
+ if (filterByKeyValueTag != "")
+ {
+ var first = GetFirstKeyValueTags(item.KeyvalueTags);
+ if (first.Item1.ToLower() != "group" || first.Item2 != filterByKeyValueTag) continue;
+ }
if (!string.IsNullOrEmpty(item.Name)) trackables.Add(item.Name + " [" + item.UUID.ToString() + "]");
else trackables.Add(item.UUID.ToString());
}
@@ -465,6 +508,11 @@ namespace ETSI.ARF.WorldStorage.UI
anchors.Clear();
foreach (var item in res)
{
+ if (filterByKeyValueTag != "")
+ {
+ var first = GetFirstKeyValueTags(item.KeyvalueTags);
+ if (first.Item1.ToLower() != "group" || first.Item2 != filterByKeyValueTag) continue;
+ }
if (!string.IsNullOrEmpty(item.Name)) anchors.Add(item.Name + " [" + item.UUID.ToString() + "]");
else anchors.Add(item.UUID.ToString());
}
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
index 6907351018363e86654211cac90a32e8c0faacb0..11c68c0c3da8014c14929bd8abb8bda6bffb0535 100644
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -14,16 +14,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: 12.888889
- y: 72
- width: 1365.3334
- height: 935.11115
+ x: 0
+ y: 42.22222
+ width: 1706.6666
+ height: 984.44446
m_ShowMode: 4
- m_Title: Inspector
+ m_Title: Project
m_RootView: {fileID: 8}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
- m_Maximized: 0
+ m_Maximized: 1
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -39,12 +39,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 469.33334
+ x: 557.3333
y: 0
- width: 534.22217
- height: 350
- m_MinSize: {x: 102, y: 121}
- m_MaxSize: {x: 4002, y: 4021}
+ width: 632.88885
+ height: 369.55554
+ m_MinSize: {x: 100, y: 100}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
@@ -68,13 +68,13 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 535.1111
- width: 1003.55554
- height: 350
+ y: 564.8889
+ width: 1190.2222
+ height: 369.55554
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 73
+ controlID: 174
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -94,12 +94,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
- width: 1365.3334
- height: 885.1111
+ width: 1706.6666
+ height: 934.44446
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 156
+ controlID: 128
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -115,12 +115,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1003.55554
+ x: 1190.2222
y: 0
- width: 361.77783
- height: 885.1111
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 516.44446
+ height: 934.44446
+ 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: 239.55556
- height: 535.1111
+ width: 284.8889
+ height: 564.8889
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
@@ -169,8 +169,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 469.33334
- height: 350
+ width: 557.3333
+ height: 369.55554
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15}
@@ -198,8 +198,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1365.3334
- height: 935.1111
+ width: 1706.6666
+ height: 984.44446
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: 1365.3334
+ width: 1706.6666
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: 915.1111
- width: 1365.3334
+ y: 964.44446
+ width: 1706.6666
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: 1003.55554
- height: 885.1111
+ width: 1190.2222
+ height: 934.44446
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 72
+ controlID: 173
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -293,12 +293,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1003.55554
- height: 535.1111
+ width: 1190.2222
+ height: 564.8889
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 184
+ controlID: 233
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -314,12 +314,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 239.55556
+ x: 284.8889
y: 0
- width: 764
- height: 535.1111
- m_MinSize: {x: 202, y: 221}
- m_MaxSize: {x: 4002, y: 4021}
+ width: 905.33325
+ height: 564.8889
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
@@ -343,7 +343,7 @@ MonoBehaviour:
m_MaxSize: {x: 2048, y: 2048}
m_TitleContent:
m_Text: Asset Store
- m_Image: {fileID: -7444545952099596278, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -4391848389275900105, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
@@ -371,14 +371,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
- m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -2032128904892744680, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 12.888889
+ x: 0
y: 637.3333
- width: 468.33334
- height: 329
+ width: 556.3333
+ height: 348.55554
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -396,22 +396,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/ETSI.ARF/ARF World Storage API/World Storage
+ - Assets/ETSI.ARF/ARF World Storage API/Editor/Windows
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 16
m_LastFolders:
- - Assets/ETSI.ARF/ARF World Storage API/World Storage
+ - Assets/ETSI.ARF/ARF World Storage API/Editor/Windows
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: 0}
- m_SelectedIDs: 684b0000
- m_LastClickedID: 19304
- m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b000000ca9a3bffffff7f
+ m_SelectedIDs: 6c4b0000
+ m_LastClickedID: 19308
+ m_ExpandedIDs: 00000000564b0000584b00005a4b00005c4b00005e4b0000604b0000624b000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -439,7 +439,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b0000
+ m_ExpandedIDs: 00000000564b0000584b00005a4b00005c4b00005e4b0000604b0000624b0000
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: c6230000de4b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -511,14 +511,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
- m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: 8356117983803934776, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1016.44446
- y: 102.22222
- width: 360.77783
- height: 864.1111
+ x: 1190.2223
+ y: 72.44444
+ width: 515.44446
+ height: 913.44446
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -552,14 +552,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
- m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -9000905672528348964, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 12.888889
- y: 102.22222
- width: 238.55556
- height: 514.1111
+ x: 0
+ y: 72.44444
+ width: 283.8889
+ height: 543.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: 464b0000
+ m_SelectedIDs: a2080000
m_LastClickedID: 0
m_ExpandedIDs: 34fbffff
m_RenameOverlay:
@@ -609,14 +609,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
- m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -131512000283675692, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 252.44444
- y: 102.22222
- width: 762
- height: 514.1111
+ x: 284.8889
+ y: 72.44444
+ width: 903.33325
+ height: 543.8889
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -844,7 +844,7 @@ MonoBehaviour:
m_Target: 0
speed: 2
m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+ m_Color: {r: 0, g: 1, b: 0, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 0, y: 0}
yGrid:
@@ -852,7 +852,7 @@ MonoBehaviour:
m_Target: 1
speed: 2
m_Value: 1
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+ m_Color: {r: 0, g: 1, b: 0, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
zGrid:
@@ -860,7 +860,7 @@ MonoBehaviour:
m_Target: 0
speed: 2
m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+ m_Color: {r: 0, g: 1, b: 0, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 0, y: 0}
m_ShowGrid: 1
@@ -914,7 +914,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
- m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: 257045534191678443, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
@@ -949,8 +949,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -766
m_HBaseRangeMax: 766
- m_VBaseRangeMin: -395
- m_VBaseRangeMax: 395
+ m_VBaseRangeMin: -384.5
+ m_VBaseRangeMax: 384.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -967,11 +967,11 @@ MonoBehaviour:
m_DrawArea:
serializedVersion: 2
x: 0
- y: 0
+ y: 21
width: 1532
- height: 790
+ height: 769
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 766, y: 395}
+ m_Translation: {x: 766, y: 384.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
@@ -979,9 +979,9 @@ MonoBehaviour:
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -766
- y: -395
+ y: -384.5
width: 1532
- height: 790
+ height: 769
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 3447, y: 1777.5}
@@ -1006,14 +1006,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
- m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
+ m_Image: {fileID: -3303252850963283158, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 482.22223
+ x: 557.3333
y: 637.3333
- width: 532.22217
- height: 329
+ width: 630.88885
+ height: 348.55554
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default