Commit 9dbc0e0c authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Updated server values/names (scriptables)

parent b1eaa0a7

Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ namespace ETSI.ARF.WorldStorage.Editor.Windows 
            leftStyle.alignment = TextAnchor.UpperLeft;



            GUILayout.Label("Augmented Reality Framework", leftStyle);

            GUILayout.Label("Copyright (C) 2022, ETSI (BSD 3-Clause License)", leftStyle);

            GUILayout.Label("Copyright (C) 2024, ETSI (BSD 3-Clause License)", leftStyle);





            switch (type)

Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs

+8 −9
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ namespace ETSI.ARF.WorldStorage.Editor.Windows 
{

    public class WorldGraphWindow : EditorWindow

    {



        [HideInInspector] public WorldStorageServer worldStorageServer;

        [HideInInspector] public WorldStorageUser worldStorageUser;
@@ -46,9 +45,17 @@ namespace ETSI.ARF.WorldStorage.Editor.Windows 
        //to delay the reframe (otherwise it reframes when the graph isn't built yet)

        int twoFrames = 0;



        [MenuItem("ARFWorldStorage/Edit Graph...")]

        public static void ShowWindow()

        {

            GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));

        }



        public static void ShowWindowFromWorldStorageWindow(WorldStorageServer server, WorldStorageUser user)

        {

            var window = GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));

            window.worldStorageServer = server;

            window.worldStorageUser = user;

            if (window.myGraph != null)

            {

                if (window.myGraph.ServerAndLocalDifferent() && EditorUtility.DisplayDialog("Saving node positions", "The World Graph has been modified. \nWould you like to push the modifications to the server ?", "Yes", "No"))
@@ -58,18 +65,10 @@ namespace ETSI.ARF.WorldStorage.Editor.Windows 
                window.rootVisualElement.Remove(window.myGraph);

            }

            GraphEditorWindow.ResetWindow();

            window.worldStorageServer = server;

            window.worldStorageUser = user;

            SaveInfo.instance.nodePositions = null;

            window.OnEnable();

        }



        [MenuItem("ARFWorldStorage/Edit Graph...")]

        public static void ShowWindow()

        {

            GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));

        }



        public void OnEnable()

        {

            if (worldStorageServer != null)

Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs

+4 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ namespace ETSI.ARF.WorldStorage.UI 
            new Color(0.3f, 1f, 1f),        // button REST

            new Color(0.3f, 1f, 0.3f),      // button create

            new Color(1f, 0f, 0f),          // button delete (red)

            new Color(.7f, .5f, 1f),          // button graph window

            new Color(.5f, .7f, 1f),        // button graph window

            new Color(.3f, .7f, 1f),        // button generate prefab

            new Color(1f, 1f, 0.3f),        // button request

            new Color(1f, 0.3f, 0.3f),      // color for trackables
@@ -94,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) 2024, ETSI (BSD 3-Clause License)");

        }



        void OnGUI()

Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
%YAML 1.1

%TAG !u! tag:unity3d.com,2011:

--- !u!114 &11400000

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 0}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: 8a1e3e7961eae84468e6ee20d5b09ffd, type: 3}

  m_Name: ETSI User

  m_EditorClassIdentifier: 

  userName: ARF User

  company: ETSI Org

  UUID: 5090fd9f-64bf-4e06-843f-26aaf2eb8e40

Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset.meta

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
fileFormatVersion: 2

guid: 748585a50399fd64883147cd731ae0b7

NativeFormatImporter:

  externalObjects: {}

  mainObjectFileID: 11400000

  userData: 

  assetBundleName: 

  assetBundleVariant: