Communication and access to WS server. (595e4d92) · Commits · ARF / World Storage API Helpers / Unity World Storage Package

Editor/Scripts/Windows/TrackableWindow.cs

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -219,13 +219,13 @@ namespace ETSI.ARF.WorldStorage.UI
	confidence = EditorGUILayout.DoubleField("Confidence:", confidence);		confidence = EditorGUILayout.DoubleField("Confidence:", confidence);

	EditorGUILayout.Space();		EditorGUILayout.Space();
	trackableSize = EditorGUILayout.Vector3Field("Trackable Size:", trackableSize);		GUILayout.Label("Transform (local CRS):");

	EditorGUILayout.Space();
	GUILayout.Label("Local CRS:");
	localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);		localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);
	localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);		localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);

			EditorGUILayout.Space();
			trackableSize = EditorGUILayout.Vector3Field("Trackable Size:", trackableSize);

	EditorGUILayout.Space();		EditorGUILayout.Space();
	if (GUILayout.Button("Generate Dummy Payload"))		if (GUILayout.Button("Generate Dummy Payload"))
	{		{
	@@ -255,12 +255,12 @@ namespace ETSI.ARF.WorldStorage.UI

	public override void GetParams()		public override void GetParams()
	{		{
	customName = "Requesting information...";		//customName = "Requesting information...";

	TrackableRequest.GetTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>		TrackableRequest.GetTrackableAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
	{		{
	Trackable obj = response.result;		Trackable obj = response.result;
	customName = obj.Name;		customName = obj.Name;
			Debug.Log("name=" + customName);
	creatorUUID = obj.CreatorUUID.ToString();		creatorUUID = obj.CreatorUUID.ToString();
	type = obj.TrackableType;		type = obj.TrackableType;
	unit = obj.Unit;		unit = obj.Unit;

Editor/Scripts/Windows/WorldAnchorWindow.cs

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -212,13 +212,13 @@ namespace ETSI.ARF.WorldStorage.UI
	unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);		unit = (UnitSystem)EditorGUILayout.EnumPopup("Unit System:", unit);

	EditorGUILayout.Space();		EditorGUILayout.Space();
	worldAnchorSize = EditorGUILayout.Vector3Field("Anchor Size:", worldAnchorSize);		GUILayout.Label("Transform (local CRS):");

	EditorGUILayout.Space();
	GUILayout.Label("Local CRS:");
	localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);		localCRS_pos = EditorGUILayout.Vector3Field(" Position:", localCRS_pos);
	localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);		localCRS_rot = EditorGUILayout.Vector3Field(" Rotation:", localCRS_rot);

			EditorGUILayout.Space();
			worldAnchorSize = EditorGUILayout.Vector3Field("Anchor Size:", worldAnchorSize);

	// ---------------------		// ---------------------
	// Keyvalues		// Keyvalues
	// ---------------------		// ---------------------
	@@ -237,6 +237,7 @@ namespace ETSI.ARF.WorldStorage.UI

	public override void GetParams()		public override void GetParams()
	{		{
			//customName = "Requesting information...";
	WorldAnchorRequest.GetWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>		WorldAnchorRequest.GetWorldAnchorAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
	{		{
	WorldAnchor obj = response.result;		WorldAnchor obj = response.result;

Editor/Scripts/Windows/WorldLinkWindow.cs

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ namespace ETSI.ARF.WorldStorage.UI
	[SerializeField] public List<string> anchors = new List<string>();		[SerializeField] public List<string> anchors = new List<string>();

	private static GUILayoutOption miniButtonWidth = GUILayout.Width(50);		private static GUILayoutOption miniButtonWidth = GUILayout.Width(50);
			private static GUILayoutOption middleButtonWidth = GUILayout.Width(70);

	// World Anchors params		// World Anchors params
	string UUID = System.Guid.Empty.ToString();		string UUID = System.Guid.Empty.ToString();
	@@ -351,7 +352,7 @@ namespace ETSI.ARF.WorldStorage.UI
	}		}

	GUI.backgroundColor = WorldStorageWindow.arfColors[0];		GUI.backgroundColor = WorldStorageWindow.arfColors[0];
	if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) \|\| lastFromUUID != FROM.UUID)		if (GUILayout.Button(" Request ", EditorStyles.miniButtonLeft, middleButtonWidth) \|\| lastFromUUID != FROM.UUID)
	{		{
	GetElementFROM();		GetElementFROM();
	}		}
	@@ -373,7 +374,7 @@ namespace ETSI.ARF.WorldStorage.UI
	TO.UUID = TO.UUID.Split('[', ']')[1];		TO.UUID = TO.UUID.Split('[', ']')[1];
	}		}
	GUI.backgroundColor = WorldStorageWindow.arfColors[0];		GUI.backgroundColor = WorldStorageWindow.arfColors[0];
	if (GUILayout.Button("Request", EditorStyles.miniButtonLeft, miniButtonWidth) \|\| lastToUUID != TO.UUID)		if (GUILayout.Button("Request ", EditorStyles.miniButtonLeft, middleButtonWidth) \|\| lastToUUID != TO.UUID)
	{		{
	GetElementTO();		GetElementTO();
	}		}
	@@ -410,6 +411,7 @@ namespace ETSI.ARF.WorldStorage.UI

	public override void GetParams()		public override void GetParams()
	{		{
			//customName = "Requesting information...";
	WorldLinkRequest.GetWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>		WorldLinkRequest.GetWorldLinkAsync(worldStorageServer, Guid.Parse(UUID), (response) =>
	{		{
	WorldLink obj = response.result;		WorldLink obj = response.result;

Runtime/Scripts/GraphEditor/LinkVisual.cs

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ namespace ETSI.ARF.WorldStorage.UI
	{		{
	Debug.Log("Rien tracer");		Debug.Log("Rien tracer");
	}		}
	}
	#endif		#endif
	}		}
	}		}
			}

Runtime/Scripts/OpenAPI/DataModels.cs

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
	Name = name;		Name = name;
	}		}

	public string ToJson() { return JsonUtility.ToJson(this); }		public string ToJson() { return Newtonsoft.Json.JsonConvert.SerializeObject(this); }
	}		}

	//		//
	@@ -38,7 +38,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
	Name = name;		Name = name;
	}		}

	public string ToJson() { return JsonUtility.ToJson(this); }		public string ToJson() { return Newtonsoft.Json.JsonConvert.SerializeObject(this); }
	}		}

	public partial class WorldAnchor : IModel		public partial class WorldAnchor : IModel
	@@ -49,7 +49,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
	Name = name;		Name = name;
	}		}

	public string ToJson() { return JsonUtility.ToJson(this); }		public string ToJson() { return Newtonsoft.Json.JsonConvert.SerializeObject(this); }
	}		}

	public partial class WorldLink : IModel		public partial class WorldLink : IModel
	@@ -59,6 +59,6 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
	UUID = Guid.NewGuid();		UUID = Guid.NewGuid();
	}		}

	public string ToJson() { return JsonUtility.ToJson(this); }		public string ToJson() { return Newtonsoft.Json.JsonConvert.SerializeObject(this); }
	}		}
	}		}
			No newline at end of file