Merge branch 'develop' into 'main'

Conform to API v1.0.0

See merge request !2

Scripts.meta → Assets.meta

 fileFormatVersion: 2
-guid: be2764d34364d6e4e8b4811c9fe72a5b
+guid: 78306bf200d797d43b085b7da02b346e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor.meta → Assets/Editor.meta

 fileFormatVersion: 2
-guid: 5fec767e3d1954e4e8af5dc2b3d4dd5d
+guid: 653e904517771514ab9628529a0317d7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Editor/WorldStorageInfoEditor.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+[CustomEditor(typeof(WorldStorageInfo))]
+public class WorldStorageInfoEditor : Editor
+{
+    public override void OnInspectorGUI()
+    {
+        base.OnInspectorGUI();
+
+        EditorGUILayout.Space();
+        WorldStorageInfo srv = (WorldStorageInfo)target;
+
+        string state = srv.GetServerState();
+        EditorGUILayout.LabelField("Server State", state);
+
+        string api = srv.GetAPIVersion();
+        EditorGUILayout.LabelField("OpenAPI Version", api);
+    }
+}

Scripts/RESTRequest.cs.meta → Assets/Editor/WorldStorageInfoEditor.cs.meta

 fileFormatVersion: 2
-guid: d6c7598eb0c8e2948826a04685e1e3c3
+guid: f32282169eeffb6418d67e0303320c45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Runtime.meta

+fileFormatVersion: 2
+guid: 9f9d2ca3af2d00643b6a16d11277df9a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Runtime/REST.meta

+fileFormatVersion: 2
+guid: 2d42c05c2b33530478b6ec053f84a09d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Runtime/REST/AdminRequest.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+#define USING_OPENAPI_GENERATOR // alt. is Swagger
+
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if USING_OPENAPI_GENERATOR
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+#else
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+#endif
+
+#if UNITY_EDITOR
+namespace ETSI.ARF.WorldStorage.REST
+{
+    public class AdminRequest
+    {
+        static public string GetAdminInfo(WorldStorageServer ws)
+        {
+            DefaultApi api = new DefaultApi(ws.URI);
+            string state = api.GetAdmin();
+            Debug.Log("Server State: " + state);
+            return state;
+        }
+
+        static public string GetVersion(WorldStorageServer ws)
+        {
+            DefaultApi api = new DefaultApi(ws.URI);
+            string vers = api.GetVersion();
+            Debug.Log("Using API Version: " + vers);
+            return vers;
+        }
+
+        static public string Ping (WorldStorageServer ws)
+        {
+            DefaultApi api = new DefaultApi(ws.URI);
+            api.GetPing();
+            return "IsAlive";
+        }
+    }
+}
+#endif
\ No newline at end of file

Editor/CreateARTrackable.cs.meta → Assets/Runtime/REST/AdminRequest.cs.meta

 fileFormatVersion: 2
-guid: a1647df9b48bf4f49a664a929fff57ff
+guid: 0fa015c6a7b3a8e4884833d8f672c20c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Runtime/REST/TrackableRequest.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+#define USING_OPENAPI_GENERATOR // alt. is Swagger
+
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if USING_OPENAPI_GENERATOR
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+#else
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+#endif
+
+#if UNITY_EDITOR
+namespace ETSI.ARF.WorldStorage.REST
+{
+    public class TrackableRequest
+    {
+        static public string AddTrackable(WorldStorageServer ws, Trackable trackable)
+        {
+            Debug.Log("Posting Add Trackable to Server");
+            TrackablesApi api = new TrackablesApi(ws.URI);
+            string result = api.AddTrackable(trackable);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public string UpdateTrackable(WorldStorageServer ws, Trackable trackable)
+        {
+            Debug.Log("Posting Add Trackable to Server");
+            TrackablesApi api = new TrackablesApi(ws.URI);
+            string result = api.ModifyTrackable(trackable);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public List<Trackable> GetAllTrackables(WorldStorageServer ws)
+        {
+            TrackablesApi api = new TrackablesApi(ws.URI);
+            List<Trackable> result = api.GetTrackables();
+            return result;
+        }
+
+        static public Trackable GetTrackable(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            TrackablesApi api = new TrackablesApi(ws.URI);
+            Trackable result = api.GetTrackableById(_uuid);
+            return result;
+        }
+
+        static public void DeleteTrackable(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            TrackablesApi api = new TrackablesApi(ws.URI);
+            api.DeleteTrackable(_uuid);
+        }
+    }
+}
+#endif
\ No newline at end of file

Assets/Runtime/REST/TrackableRequest.cs.meta

+fileFormatVersion: 2
+guid: f492e20bc218f884b907369b8eca15a3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Runtime/REST/WorldAnchorRequest.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+#define USING_OPENAPI_GENERATOR // alt. is Swagger
+
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if USING_OPENAPI_GENERATOR
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+#else
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+#endif
+
+#if UNITY_EDITOR
+namespace ETSI.ARF.WorldStorage.REST
+{
+    public class WorldAnchorRequest
+    {
+        static public string AddWorldAnchor(WorldStorageServer ws, WorldAnchor anchor)
+        {
+            Debug.Log("Posting Add World Anchor to Server");
+            WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
+            string result = api.AddWorldAnchor(anchor);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public string UpdateWorldAnchor(WorldStorageServer ws, WorldAnchor anchor)
+        {
+            Debug.Log("Posting Add World Anchor to Server");
+            WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
+            string result = api.ModifyWorldAnchor(anchor);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public List<WorldAnchor> GetAllWorldAnchors(WorldStorageServer ws)
+        {
+            WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
+            List<WorldAnchor> result = api.GetWorldAnchors();
+            return result;
+        }
+
+        static public WorldAnchor GetWorldAnchor(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
+            WorldAnchor result = api.GetWorldAnchorById(_uuid);
+            return result;
+        }
+
+        static public void DeleteWorldAnchor(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
+            api.DeleteWorldAnchor(_uuid);
+        }
+    }
+}
+#endif
\ No newline at end of file

Assets/Runtime/REST/WorldAnchorRequest.cs.meta

+fileFormatVersion: 2
+guid: eb674a7de52fc6d4a822e7d07c1dd294
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Runtime/REST/WorldLinkRequest.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+#define USING_OPENAPI_GENERATOR // alt. is Swagger
+
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if USING_OPENAPI_GENERATOR
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+#else
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+#endif
+
+#if UNITY_EDITOR
+namespace ETSI.ARF.WorldStorage.REST
+{
+    public class WorldLinkRequest
+    {
+        static public string AddWorldLink(WorldStorageServer ws, WorldLink link)
+        {
+            Debug.Log("Posting Add Trackable to Server");
+            WorldLinksApi api = new WorldLinksApi(ws.URI);
+            string result = api.AddWorldLink(link);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public string UpdateWorldLink(WorldStorageServer ws, WorldLink link)
+        {
+            Debug.Log("Posting Add Trackable to Server");
+            WorldLinksApi api = new WorldLinksApi(ws.URI);
+            string result = api.ModifyWorldLink(link);
+            Debug.Log(result);
+            return result;
+        }
+
+        static public List<WorldLink> GetAllWorldLinks(WorldStorageServer ws)
+        {
+            WorldLinksApi api = new WorldLinksApi(ws.URI);
+            List<WorldLink> result = api.GetWorldLinks();
+            return result;
+        }
+
+        static public WorldLink GetWorldLink(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            WorldLinksApi api = new WorldLinksApi(ws.URI);
+            WorldLink result = api.GetWorldLinkById(_uuid);
+            return result;
+        }
+
+        static public void DeleteWorldLink(WorldStorageServer ws, string uuid)
+        {
+            System.Guid _uuid = System.Guid.Parse(uuid);
+            WorldLinksApi api = new WorldLinksApi(ws.URI);
+            api.DeleteWorldLink(_uuid);
+        }
+    }
+}
+#endif
\ No newline at end of file

Assets/Runtime/REST/WorldLinkRequest.cs.meta

+fileFormatVersion: 2
+guid: 9d17b7a1eac66b74ea32aac83c01aa2f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Runtime/WorldStorageInfo.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using ETSI.ARF.WorldStorage;
+
+public class WorldStorageInfo : MonoBehaviour
+{
+    public WorldStorageServer worldStorageServer;
+
+    public bool isServerAlive()
+    {
+        if (worldStorageServer == null) return false;
+        return !string.IsNullOrEmpty(ETSI.ARF.WorldStorage.REST.AdminRequest.Ping(worldStorageServer));
+    }
+
+    public string GetServerState()
+    {
+        if (worldStorageServer == null) return "No Server Defined!";
+        return ETSI.ARF.WorldStorage.REST.AdminRequest.GetAdminInfo(worldStorageServer);
+    }
+
+    public string GetAPIVersion()
+    {
+        if (worldStorageServer == null) return "Unknown Version!";
+        return ETSI.ARF.WorldStorage.REST.AdminRequest.GetVersion(worldStorageServer);
+    }
+}

Assets/Runtime/WorldStorageInfo.cs.meta

+fileFormatVersion: 2
+guid: 02da7adcc65f4694684d71e61d88070b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scriptables.meta

+fileFormatVersion: 2
+guid: 9f7902ce03cc2b2458df8c561ff1f55e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scriptables/WorldStorageServer.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ETSI.ARF.WorldStorage
+{
+    [System.Serializable]
+    [CreateAssetMenu(fileName = "ARFWorldStorageServer", menuName = "ARF World Storage/Create Server", order = 1)]
+    public class WorldStorageServer : ScriptableObject
+    {
+        [SerializeField] public string serverName = "myServerName";
+        [SerializeField] public string company = "";
+        [SerializeField] public string basePath = "https://";
+        [SerializeField] public int port = 8080;
+
+        [Space(8)]
+        [SerializeField] public WorldStorageUser currentUser = null;
+
+        public string URI => basePath + ":" + port.ToString();
+    }
+}
\ No newline at end of file

Assets/Scriptables/WorldStorageServer.cs.meta

+fileFormatVersion: 2
+guid: e4b7be4c33f68d0418c3b4e1a7053d91
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scriptables/WorldStorageUser.cs

+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace ETSI.ARF.WorldStorage
+{
+    [System.Serializable]
+    [CreateAssetMenu(fileName = "ARFWorldStorageUser", menuName = "ARF World Storage/Create User", order = 1)]
+    public class WorldStorageUser : ScriptableObject
+    {
+        [SerializeField] public string userName = "myName";
+        [SerializeField] public string company = "";
+        [SerializeField] public string UUID = System.Guid.Empty.ToString();
+    }
+}
\ No newline at end of file