Updated server values/names (scriptables)

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

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

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

@@ -70,12 +70,12 @@ 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
+            new Color(1f, 0.3f, 0.3f),      // color for trackables
             new Color(1f, 0.7f, 0f),        // color for anchors
-            new Color(.66f, .4f, 1f)         // color for links
+            new Color(.66f, .4f, 1f)        // color for links
         };
 
 
@@ -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

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

-fileFormatVersion: 2
-guid: 748585a50399fd64883147cd731ae0b7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset → Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef dev.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
-  m_Name: HHI Server - detlef
+  m_Name: HHI Server - detlef dev
   m_EditorClassIdentifier: 
   serverName: HHI Server (Detlef)
   company: Fraunhofer HHI

Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset → Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF620.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
-  m_Name: HHI Server
+  m_Name: HHI Server STF620
   m_EditorClassIdentifier: 
   serverName: HHI World Storage Server
   company: Fraunhofer HHI

Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset → Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset

@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}
-  m_Name: TEST
+  m_Name: HHI Server STF669
   m_EditorClassIdentifier: 
-  serverName: HHI
-  company: 
-  basePath: http://172.17.132.19
-  port: 8080
+  serverName: HHI WS Server STF669
+  company: Fraunhofer HHI
+  basePath: https://etsi.hhi.fraunhofer.de
+  port: 0
   currentUser: {fileID: 11400000, guid: 748585a50399fd64883147cd731ae0b7, type: 2}

Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset.meta → Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta

 fileFormatVersion: 2
-guid: 43336abb94a86b84cbb89e4a607dc12d
+guid: a3bbdc2753015174d9cf466761005897
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

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

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8a1e3e7961eae84468e6ee20d5b09ffd, type: 3}
-  m_Name: Nathan
+  m_Name: User Nathan
   m_EditorClassIdentifier: 
   userName: Nathan
   company: b<>com

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

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8a1e3e7961eae84468e6ee20d5b09ffd, type: 3}
-  m_Name: Sylvain
+  m_Name: User Sylvain
   m_EditorClassIdentifier: 
   userName: Sylvain
   company: Fraunhofer HHI

unity-world-storage-package @ fbe3790e

-Subproject commit 8d0b687c978d5319b2903b24bf9e63b289c7777f
+Subproject commit fbe3790e81f4e5ce7d3837aaa28171f61fd9aec4