From 9dbc0e0ccfec68407d6e7ffec787f0dfb98175d6 Mon Sep 17 00:00:00 2001
From: Sylvain Renault <sylvain.renault@hhi.fraunhofer.de>
Date: Mon, 17 Jun 2024 11:38:59 +0200
Subject: [PATCH] Updated server values/names (scriptables)
---
.../Editor/Windows/GraphEditorWindow.cs | 2 +-
.../Editor/Windows/WorldGraphWindow.cs | 17 ++++++++---------
.../Editor/Windows/WorldStorageWindow.cs | 8 ++++----
.../World Storage/ETSI User.asset | 17 -----------------
.../World Storage/ETSI User.asset.meta | 8 --------
...tlef.asset => HHI Server - detlef dev.asset} | 2 +-
....meta => HHI Server - detlef dev.asset.meta} | 0
...HHI Server.asset => HHI Server STF620.asset} | 2 +-
....asset.meta => HHI Server STF620.asset.meta} | 0
.../{TEST.asset => HHI Server STF669.asset} | 10 +++++-----
....asset.meta => HHI Server STF669.asset.meta} | 2 +-
.../{Nathan.asset => User Nathan.asset} | 2 +-
...Nathan.asset.meta => User Nathan.asset.meta} | 0
.../{Sylvain.asset => User Sylvain.asset} | 2 +-
...lvain.asset.meta => User Sylvain.asset.meta} | 0
Packages/unity-world-storage-package | 2 +-
16 files changed, 24 insertions(+), 50 deletions(-)
delete mode 100644 Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset
delete mode 100644 Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset.meta
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{HHI Server - detlef.asset => HHI Server - detlef dev.asset} (94%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{HHI Server - detlef.asset.meta => HHI Server - detlef dev.asset.meta} (100%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{HHI Server.asset => HHI Server STF620.asset} (95%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{HHI Server.asset.meta => HHI Server STF620.asset.meta} (100%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{TEST.asset => HHI Server STF669.asset} (76%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{TEST.asset.meta => HHI Server STF669.asset.meta} (79%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{Nathan.asset => User Nathan.asset} (95%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{Nathan.asset.meta => User Nathan.asset.meta} (100%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{Sylvain.asset => User Sylvain.asset} (95%)
rename Assets/ETSI.ARF/ARF World Storage API/World Storage/{Sylvain.asset.meta => User Sylvain.asset.meta} (100%)
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs
index 947189d..20903e1 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs
+++ b/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)
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs
index c5b8970..a8526c9 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs
+++ b/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)
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs
index 5725d51..40ed1a9 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs
+++ b/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()
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset
deleted file mode 100644
index 5a96f53..0000000
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset
+++ /dev/null
@@ -1,17 +0,0 @@
-%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
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset.meta
deleted file mode 100644
index 08ca9e2..0000000
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/ETSI User.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 748585a50399fd64883147cd731ae0b7
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef dev.asset
similarity index 94%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef dev.asset
index 0cbcde4..d8f20dd 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset
+++ b/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
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef dev.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef.asset.meta
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server - detlef dev.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF620.asset
similarity index 95%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF620.asset
index 21f9baa..8269e6a 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset
+++ b/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
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF620.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server.asset.meta
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF620.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset
similarity index 76%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset
index 4746e88..713263e 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset
+++ b/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}
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta
similarity index 79%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset.meta
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta
index 63dfdf3..7172a51 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/TEST.asset.meta
+++ b/Assets/ETSI.ARF/ARF World Storage API/World Storage/HHI Server STF669.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 43336abb94a86b84cbb89e4a607dc12d
+guid: a3bbdc2753015174d9cf466761005897
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Nathan.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset
similarity index 95%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Nathan.asset
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset
index 7d94f17..41a6509 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Nathan.asset
+++ b/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
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Nathan.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Nathan.asset.meta
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/User Nathan.asset.meta
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Sylvain.asset b/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset
similarity index 95%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Sylvain.asset
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset
index 8dfe29c..b577d97 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Sylvain.asset
+++ b/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
diff --git a/Assets/ETSI.ARF/ARF World Storage API/World Storage/Sylvain.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset.meta
similarity index 100%
rename from Assets/ETSI.ARF/ARF World Storage API/World Storage/Sylvain.asset.meta
rename to Assets/ETSI.ARF/ARF World Storage API/World Storage/User Sylvain.asset.meta
diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package
index 8d0b687..fbe3790 160000
--- a/Packages/unity-world-storage-package
+++ b/Packages/unity-world-storage-package
@@ -1 +1 @@
-Subproject commit 8d0b687c978d5319b2903b24bf9e63b289c7777f
+Subproject commit fbe3790e81f4e5ce7d3837aaa28171f61fd9aec4
--
GitLab