Commit 6ac06177 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Merge branch 'main' into 'develop' 

Major structural and design changes on GUI, classes, parameters...

See merge request !2
parents 1a480b40 949dd19e

.gitmodules

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
[submodule "Packages/unity-world-storage-package"]

	path = Packages/unity-world-storage-package

	url = https://labs.etsi.org/rep/arf/world-storage-api-helpers/unity-world-storage-package.git

Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFGraphView.cs

+20 −0
Original line number Original line Diff line number Diff line 
//

// 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;

using System.Collections.Generic;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine;

Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/ARFNode.cs

+15 −8
Original line number Original line Diff line number Diff line 
//

//

// ETSI (European Telecommunications Standards Institute, referred to as ETSI)

// ARF - Augmented Reality Framework (ETSI ISG ARF)

// ARF - ETSI ISG Augmented Reality Framework (ISG ARF)

// (C) 2022

//

//

// Development "World Storage", data management, authoring tools

// Copyright 2022 ETSI

//

//

// Authors:

// Licensed under the Apache License, Version 2.0 (the "License");

// - Sylvain Renault (Fraunhofer HHI)

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//

// Date: Feb. 2022

//     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;

Assets/ETSI.ARF/ARF World Storage API/Editor/GraphWindow.cs→Assets/ETSI.ARF/ARF World Storage API/Editor/Graph/GraphWindow.cs

+32 −10
Original line number Original line Diff line number Diff line 
//

// 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

#define USING_OPENAPI_GENERATOR // alt. is Swagger





using System.Collections;

using System.Collections;
@@ -7,7 +27,7 @@ using UnityEditor; 
using UnityEditor.Experimental.GraphView;

using UnityEditor.Experimental.GraphView;

using UnityEngine.UIElements;

using UnityEngine.UIElements;

using UnityEditor.UIElements;

using UnityEditor.UIElements;

using ETSI.ARF.WorldStorage.RESTful;

using ETSI.ARF.WorldStorage.REST;





#if USING_OPENAPI_GENERATOR

#if USING_OPENAPI_GENERATOR

using Org.OpenAPITools.Api;

using Org.OpenAPITools.Api;
@@ -23,13 +43,14 @@ namespace ETSI.ARF.WorldStorage.UI 




    public class GraphWindow : EditorWindow

    public class GraphWindow : EditorWindow

    {

    {

        [HideInInspector] public WorldStorageSettings worldStorageSettings;

        [HideInInspector] public WorldStorageServer worldStorageSettings;





        [SerializeField] public List<string> trackables = new List<string>();

        [SerializeField] public List<string> trackables = new List<string>();





        bool groupEnabled;

        bool groupEnabled;





        string uid = System.Guid.Empty.ToString();

        string uid = System.Guid.Empty.ToString();

        string customName = "NotDefined";

        string creatorUid = System.Guid.Empty.ToString();

        string creatorUid = System.Guid.Empty.ToString();

        string type = "Unknow";

        string type = "Unknow";

        string unit = "Unknow";

        string unit = "Unknow";
@@ -42,8 +63,8 @@ namespace ETSI.ARF.WorldStorage.UI 




        private ARFGraphView myGraph;

        private ARFGraphView myGraph;





        [MenuItem("[ ISG-ARF ]/Graph Editor")]

        [MenuItem("ARFWorldStorage/Graph Editor")]

        public static void ShowWindow()//WorldStorageSettings ws)

        public static void ShowWindow()//WorldStorageServer ws)

        {

        {

            GraphWindow win = EditorWindow.GetWindow(typeof(GraphWindow), false, WorldStorageWindow.winName) as GraphWindow;

            GraphWindow win = EditorWindow.GetWindow(typeof(GraphWindow), false, WorldStorageWindow.winName) as GraphWindow;

            //win.worldStorageSettings = ws;

            //win.worldStorageSettings = ws;
@@ -117,6 +138,7 @@ namespace ETSI.ARF.WorldStorage.UI 
            //graph.Draw();

            //graph.Draw();

        }

        }





        /*

        void DrawTrackableStuffs()// Trackable trackable)

        void DrawTrackableStuffs()// Trackable trackable)

        {

        {

            GUILayout.BeginVertical("AR Trackable", gsTest);

            GUILayout.BeginVertical("AR Trackable", gsTest);
@@ -133,9 +155,9 @@ namespace ETSI.ARF.WorldStorage.UI 
            if (GUILayout.Button("Get Parameters"))

            if (GUILayout.Button("Get Parameters"))

            {

            {

                Trackable t = RESTfulTrackableRequest.GetTrackable(worldStorageSettings, uid);

                Trackable t = RESTfulTrackableRequest.GetTrackable(worldStorageSettings, uid);

                creatorUid = t.CreatorUID.ToString();

                creatorUid = t.CreatorUUID.ToString();

                type = t.GetType().ToString();

                type = t.GetType().ToString();

                unit = t.UnitSystem.ToString();

                unit = t.Unit.ToString();

            }

            }

            GUI.backgroundColor = ori;

            GUI.backgroundColor = ori;
@@ -177,18 +199,18 @@ namespace ETSI.ARF.WorldStorage.UI 
            {

            {

                Debug.Log("PostAddTrackable");

                Debug.Log("PostAddTrackable");

                if (string.IsNullOrEmpty(uid) || uid == "0") uid = System.Guid.Empty.ToString();

                if (string.IsNullOrEmpty(uid) || uid == "0") uid = System.Guid.Empty.ToString();

                Trackable t = RESTfulTrackableRequest.TrackableFromStrings(uid, worldStorageSettings.creatorUID);

                Trackable t = RESTfulTrackableRequest.TrackableFromStrings(uid, cus, worldStorageSettings.creatorUID);

                RESTfulTrackableRequest.PostAddTrackable(worldStorageSettings, t);

                RESTfulTrackableRequest.PostAddTrackable(worldStorageSettings, t);

                WorldStorageWindow.WorldStorageWindowSingleton.UpdateList();

                WorldStorageWindow.WorldStorageWindowSingleton.UpdateList();

                WorldStorageWindow.WorldStorageWindowSingleton.Repaint();

                WorldStorageWindow.WorldStorageWindowSingleton.Repaint();





                uid = t.UID.ToString();

                uid = t.UUID.ToString();

                type = t.GetType().ToString();

                type = t.GetType().ToString();

                unit = t.UnitSystem.ToString();

                unit = t.Unit.ToString();

            }

            }

            GUI.backgroundColor = ori;

            GUI.backgroundColor = ori;

        }

        }





  

  */

    }

    }

}
 
}
 
 No newline at end of file