Skip to content
Snippets Groups Projects
Commit c8406f18 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Use now API v1.0.0

Changes in element interface.
Added world link functions.
parent 036c4edd
No related branches found
No related tags found
1 merge request!2Conform to API v1.0.0
...@@ -37,12 +37,22 @@ namespace ETSI.ARF.WorldStorage.REST ...@@ -37,12 +37,22 @@ namespace ETSI.ARF.WorldStorage.REST
{ {
public class TrackableRequest public class TrackableRequest
{ {
static public void AddTrackable(WorldStorageServer ws, Trackable trackable) static public string AddTrackable(WorldStorageServer ws, Trackable trackable)
{ {
Debug.Log("Posting Add Trackable to Server"); Debug.Log("Posting Add Trackable to Server");
TrackablesApi api = new TrackablesApi(ws.URI); TrackablesApi api = new TrackablesApi(ws.URI);
string result = api.AddTrackable(trackable); string result = api.AddTrackable(trackable);
Debug.Log(result); 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) static public List<Trackable> GetAllTrackables(WorldStorageServer ws)
......
...@@ -37,12 +37,22 @@ namespace ETSI.ARF.WorldStorage.REST ...@@ -37,12 +37,22 @@ namespace ETSI.ARF.WorldStorage.REST
{ {
public class WorldAnchorRequest public class WorldAnchorRequest
{ {
static public void AddWorldAnchor(WorldStorageServer ws, WorldAnchor anchor) static public string AddWorldAnchor(WorldStorageServer ws, WorldAnchor anchor)
{ {
Debug.Log("Posting Add World Anchor to Server"); Debug.Log("Posting Add World Anchor to Server");
WorldAnchorsApi api = new WorldAnchorsApi(ws.URI); WorldAnchorsApi api = new WorldAnchorsApi(ws.URI);
string result = api.AddWorldAnchor(anchor); string result = api.AddWorldAnchor(anchor);
Debug.Log(result); 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) static public List<WorldAnchor> GetAllWorldAnchors(WorldStorageServer ws)
......
//
// 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
fileFormatVersion: 2
guid: 9d17b7a1eac66b74ea32aac83c01aa2f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -30,11 +30,12 @@ namespace ETSI.ARF.WorldStorage ...@@ -30,11 +30,12 @@ namespace ETSI.ARF.WorldStorage
public class WorldStorageServer : ScriptableObject public class WorldStorageServer : ScriptableObject
{ {
[SerializeField] public string serverName = "myServerName"; [SerializeField] public string serverName = "myServerName";
[SerializeField] public string company = "";
[SerializeField] public string basePath = "https://"; [SerializeField] public string basePath = "https://";
[SerializeField] public int port = 8080; [SerializeField] public int port = 8080;
[Space(8)] [Space(8)]
[SerializeField] public WorldStorageUser user = null; [SerializeField] public WorldStorageUser currentUser = null;
public string URI => basePath + ":" + port.ToString(); public string URI => basePath + ":" + port.ToString();
} }
......
...@@ -30,6 +30,7 @@ namespace ETSI.ARF.WorldStorage ...@@ -30,6 +30,7 @@ namespace ETSI.ARF.WorldStorage
public class WorldStorageUser : ScriptableObject public class WorldStorageUser : ScriptableObject
{ {
[SerializeField] public string userName = "myName"; [SerializeField] public string userName = "myName";
[SerializeField] public string company = "";
[SerializeField] public string UUID = System.Guid.Empty.ToString(); [SerializeField] public string UUID = System.Guid.Empty.ToString();
} }
} }
\ No newline at end of file
No preview for this file type
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment