diff --git a/.gitignore b/.gitignore
index c211a83a6b8f994e5bbcbc32c432e61ebe8b327e..90758be5d4b8a2fdad01978ad735ba6b45bbc594 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,17 @@
-# This .gitignore file should be placed at the root of your Unity project directory
-#
-# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
-#
+# Modified from:
+# https://github.com/github/gitignore/blob/master/Unity.gitignore
+
/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
+/[Uu]serSettings/
+[Tt]emp/
+[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/
-# Fraunhofer HHI / IMC / Unity settings
-#/[Aa]ssets/Fraunhofer
-/[Aa]pp
-/[Bb]in
-/[Ee]xe
-
-# Never ignore Asset meta data
-!/[Aa]ssets/**/*.meta
-
# Uncomment this line if you wish to ignore the asset store tools plugin
-# /[Aa]ssets/AssetStoreTools*
-
-# TextMesh Pro files
-#[Aa]ssets/TextMesh*Pro/
-
-# Autogenerated Jetbrains Rider plugin
-[Aa]ssets/Plugins/Editor/JetBrains*
+# [Aa]ssets/AssetStoreTools*
# Visual Studio cache directory
.vs/
@@ -65,4 +50,14 @@ sysinfo.txt
*.unitypackage
# Crashlytics generated file
-crashlytics-build.properties
\ No newline at end of file
+crashlytics-build.properties
+
+# Windows
+Thumbs.db
+Thumbs.db.meta
+
+# MacOS
+*.DS_Store
+
+# VS Code
+*.vscode
\ No newline at end of file
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 cee8642cd14fb32286b203ddc5b7a33f116fea3a..5e996fc251224443f1c4394b2608f28d3c162e0c 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
@@ -44,6 +44,20 @@ namespace Assets.ETSI.ARF.ARF_World_Storage_API.Editor.Windows
//to delay the reframe (otherwise it reframes when the graph isn't built yet)
int twoFrames = 0;
+ public static void ShowWindowFromWorldStorageWindow(WorldStorageServer server, WorldStorageUser user)
+ {
+ var window = GetWindow<WorldGraphWindow>("Graph Editor", true, typeof(SceneView));
+ if (window.myGraph != null && 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"))
+ {
+ window.myGraph.SaveInServer();
+ }
+ GraphEditorWindow.ResetWindow();
+ window.worldStorageServer = server;
+ window.worldStorageUser = user;
+ SaveInfo.instance.nodePositions = null;
+ window.OnEnable();
+ }
+
[MenuItem("ARFWorldStorage/Edit Graph...")]
public static void ShowWindow()
{
@@ -52,7 +66,6 @@ namespace Assets.ETSI.ARF.ARF_World_Storage_API.Editor.Windows
public void OnEnable()
{
- //rootVisualElement.Add(GenerateToolbar());
if (worldStorageServer != null)
{
try {
diff --git a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta
index e3ea974b57161d7c987a1c3343cc2e501be9898c..add62927e11e960a03f3343413c056b51ab7b98d 100644
--- a/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta
+++ b/Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
serializedVersion: 2
defaultReferences:
- m_ViewDataDictionary: {instanceID: 0}
- - worldStorageServer: {fileID: 11400000, guid: 3a9ba82f4e8dd124ca2b005861c64d01, type: 2}
+ - worldStorageServer: {instanceID: 0}
- worldStorageUser: {fileID: 11400000, guid: c0696089e4a855b46ad490437919b1e8, type: 2}
executionOrder: 0
icon: {instanceID: 0}
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 375bf795d885a801f1d38df9c86f3299a2eaa3aa..a41c5e58e22ab47e61367b798455eaf602eca5a9 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
@@ -27,7 +27,8 @@ using UnityEngine;
using UnityEditor;
using ETSI.ARF.WorldStorage;
using ETSI.ARF.WorldStorage.REST;
-
+using Assets.ETSI.ARF.ARF_World_Storage_API.Editor.Windows;
+
#if USING_OPENAPI_GENERATOR
using Org.OpenAPITools.Api;
using Org.OpenAPITools.Model;
@@ -133,6 +134,7 @@ namespace ETSI.ARF.WorldStorage.UI
GUI.backgroundColor = WorldStorageWindow.arfColors[4];
if (GUILayout.Button("Open World Representation Graph Window..."))
{
+ WorldGraphWindow.ShowWindowFromWorldStorageWindow(worldStorageServer, worldStorageUser);
}
GUI.backgroundColor = ori;
@@ -194,12 +196,6 @@ namespace ETSI.ARF.WorldStorage.UI
ScriptableObject target = this;
SerializedObject so = new SerializedObject(target);
- GUI.backgroundColor = WorldStorageWindow.arfColors[4];
- if (GUILayout.Button("Open World Graph Window..."))
- {
- }
- GUI.backgroundColor = ori;
-
// ###########################################################
// Get creators
// ###########################################################
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
index 04523d7c50374d57e53d72368e0ce49e8fc029b8..400c2eb75e0ea9e51f0b12cd5352caca98e59cd0 100644
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -10,27 +10,17 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
-<<<<<<< HEAD
- x: 6.5
- y: 48.5
- width: 1587
- height: 805
+ x: 2249
+ y: 302.5
+ width: 1206
+ height: 715
m_ShowMode: 4
- m_Title: Element Editor
+ m_Title:
m_RootView: {fileID: 6}
-=======
- x: 29.333334
- y: 79.111115
- width: 1642.6666
- height: 888.44446
- m_ShowMode: 4
- m_Title: Hierarchy
- m_RootView: {fileID: 12}
->>>>>>> develop
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 0
@@ -42,196 +32,24 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
-<<<<<<< HEAD
-=======
- m_EditorHideFlags: 0
- m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_PixelRect:
- serializedVersion: 2
- x: 417.77777
- y: 175.11111
- width: 711.55554
- height: 812.44446
- m_ShowMode: 0
- m_Title: ETSI ARF - Authoring Editor
- m_RootView: {fileID: 4}
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 8096, y: 8096}
- m_Maximized: 0
---- !u!114 &3
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: WorldStorageWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 711.55554
- height: 812.44446
- m_MinSize: {x: 100, y: 121}
- m_MaxSize: {x: 4000, y: 4021}
- m_ActualView: {fileID: 21}
- m_Panes:
- - {fileID: 21}
- - {fileID: 20}
- - {fileID: 19}
- - {fileID: 18}
- m_Selected: 0
- m_LastSelected: 3
---- !u!114 &4
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 3}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 711.55554
- height: 812.44446
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 8096, y: 8096}
- vertical: 0
- controlID: 8146
---- !u!114 &5
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 785.3333
- y: 0
- width: 466.22223
- height: 614.6667
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 27}
- m_Panes:
- - {fileID: 27}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &6
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ConsoleWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 584.8889
- y: 0
- width: 666.6666
- height: 223.77777
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 28}
- m_Panes:
- - {fileID: 28}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &7
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 11}
- - {fileID: 6}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 614.6667
- width: 1251.5555
- height: 223.77777
- m_MinSize: {x: 200, y: 100}
- m_MaxSize: {x: 16192, y: 8096}
- vertical: 0
- controlID: 8228
---- !u!114 &8
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
->>>>>>> develop
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children:
-<<<<<<< HEAD
- {fileID: 9}
- {fileID: 3}
-=======
- - {fileID: 15}
- - {fileID: 9}
->>>>>>> develop
m_Position:
serializedVersion: 2
x: 0
y: 30
-<<<<<<< HEAD
- width: 1587
- height: 755
- m_MinSize: {x: 300, y: 200}
- m_MaxSize: {x: 24288, y: 16192}
+ width: 1206
+ height: 665
+ m_MinSize: {x: 679, y: 492}
+ m_MaxSize: {x: 14002, y: 14042}
vertical: 0
- controlID: 90
+ controlID: 119
--- !u!114 &3
-=======
- width: 1642.6666
- height: 838.44446
- m_MinSize: {x: 400, y: 200}
- m_MaxSize: {x: 32384, y: 16192}
- vertical: 0
- controlID: 8209
---- !u!114 &9
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -241,39 +59,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GraphEditorWindow
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
-<<<<<<< HEAD
- x: 1212
+ x: 921
y: 0
- width: 375
- height: 755
- m_MinSize: {x: 101, y: 121}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 12}
- m_Panes:
- - {fileID: 15}
- - {fileID: 12}
- m_Selected: 1
- m_LastSelected: 0
---- !u!114 &4
-=======
- x: 1251.5555
- y: 0
- width: 391.11108
- height: 838.44446
+ width: 285
+ height: 665
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 24}
+ m_ActualView: {fileID: 13}
m_Panes:
- - {fileID: 24}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &10
->>>>>>> develop
+--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -283,36 +85,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
-<<<<<<< HEAD
- width: 300
- height: 448
+ width: 228
+ height: 394
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 16}
+ m_ActualView: {fileID: 14}
m_Panes:
- - {fileID: 16}
+ - {fileID: 14}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &5
-=======
- width: 249.33333
- height: 614.6667
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 25}
- m_Panes:
- - {fileID: 25}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &11
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -323,37 +112,23 @@ MonoBehaviour:
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
- m_EditorClassIdentifier:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
-<<<<<<< HEAD
- y: 448
- width: 1212
- height: 307
+ y: 394
+ width: 921
+ height: 271
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 14}
+ m_ActualView: {fileID: 12}
m_Panes:
- - {fileID: 14}
- - {fileID: 19}
+ - {fileID: 12}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &6
-=======
- y: 0
- width: 584.8889
- height: 223.77777
- m_MinSize: {x: 231, y: 271}
- m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 23}
- m_Panes:
- - {fileID: 23}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &12
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -363,35 +138,21 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children:
-<<<<<<< HEAD
- {fileID: 7}
- {fileID: 2}
- {fileID: 8}
-=======
- - {fileID: 13}
- - {fileID: 8}
- - {fileID: 14}
->>>>>>> develop
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 1587
- height: 805
+ width: 1206
+ height: 715
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
- m_UseTopView: 1
- m_TopViewHeight: 30
- m_UseBottomView: 1
- m_BottomViewHeight: 20
-<<<<<<< HEAD
--- !u!114 &7
-=======
---- !u!114 &13
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -401,24 +162,20 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 1587
+ width: 1206
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
-<<<<<<< HEAD
- m_LastLoadedLayoutName:
+ m_LoadedToolbars: []
+ m_LastLoadedLayoutName: Default
--- !u!114 &8
-=======
- m_LastLoadedLayoutName: ETSI
---- !u!114 &14
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -428,22 +185,18 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 785
- width: 1587
+ y: 695
+ width: 1206
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
-<<<<<<< HEAD
--- !u!114 &9
-=======
---- !u!114 &15
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -453,37 +206,22 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children:
-<<<<<<< HEAD
- {fileID: 10}
- {fileID: 5}
-=======
- - {fileID: 16}
- - {fileID: 7}
->>>>>>> develop
m_Position:
serializedVersion: 2
x: 0
y: 0
-<<<<<<< HEAD
- width: 1212
- height: 755
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 16192, y: 16192}
+ width: 921
+ height: 665
+ m_MinSize: {x: 403, y: 492}
+ m_MaxSize: {x: 10001, y: 14042}
vertical: 1
- controlID: 49
+ controlID: 92
--- !u!114 &10
-=======
- width: 1251.5555
- height: 838.44446
- m_MinSize: {x: 300, y: 200}
- m_MaxSize: {x: 24288, y: 16192}
- vertical: 1
- controlID: 8210
---- !u!114 &16
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -493,38 +231,22 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children:
-<<<<<<< HEAD
- {fileID: 4}
- {fileID: 11}
-=======
- - {fileID: 10}
- - {fileID: 17}
- - {fileID: 5}
->>>>>>> develop
m_Position:
serializedVersion: 2
x: 0
y: 0
-<<<<<<< HEAD
- width: 1212
- height: 448
- m_MinSize: {x: 200, y: 100}
- m_MaxSize: {x: 16192, y: 8096}
+ width: 921
+ height: 394
+ m_MinSize: {x: 403, y: 221}
+ m_MaxSize: {x: 8003, y: 4021}
vertical: 0
- controlID: 28
+ controlID: 93
--- !u!114 &11
-=======
- width: 1251.5555
- height: 614.6667
- m_MinSize: {x: 300, y: 100}
- m_MaxSize: {x: 24288, y: 8096}
- vertical: 0
- controlID: 8211
---- !u!114 &17
->>>>>>> develop
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -534,252 +256,24 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-<<<<<<< HEAD
- m_Name: WorldGraphWindow
-=======
- m_Name: SceneView
->>>>>>> develop
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
-<<<<<<< HEAD
- x: 300
- y: 0
- width: 912
- height: 448
- m_MinSize: {x: 102, y: 121}
- m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 13}
- m_Panes:
- - {fileID: 17}
- - {fileID: 18}
- - {fileID: 13}
- m_Selected: 2
- m_LastSelected: 0
---- !u!114 &12
-=======
- x: 249.33333
+ x: 228
y: 0
- width: 536
- height: 614.6667
+ width: 693
+ height: 394
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 26}
+ m_ActualView: {fileID: 15}
m_Panes:
- - {fileID: 26}
- - {fileID: 22}
+ - {fileID: 15}
+ - {fileID: 16}
m_Selected: 0
m_LastSelected: 1
---- !u!114 &18
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: f66d40f8781c5784cbe1013328d78ae6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: ETSI ARF - World Link
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 417.77777
- y: 175.11111
- width: 711.55554
- height: 625.6667
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
- worldStorageUser: {fileID: 11400000, guid: 748585a50399fd64883147cd731ae0b7, type: 2}
- anchors: []
---- !u!114 &19
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: a0f67f823dd6ff246be6c656b120756e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: ETSI ARF - World Anchor
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 585.3333
- y: 274.66666
- width: 711.55554
- height: 625.6667
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
- worldStorageUser: {fileID: 11400000, guid: 748585a50399fd64883147cd731ae0b7, type: 2}
- anchors: []
---- !u!114 &20
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 229d5ea484d30f945b9318581fb4f2da, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: ETSI ARF - Trackable
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 585.3333
- y: 274.66666
- width: 711.55554
- height: 625.6667
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
- worldStorageUser: {fileID: 11400000, guid: 748585a50399fd64883147cd731ae0b7, type: 2}
- trackables: []
---- !u!114 &21
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: a1647df9b48bf4f49a664a929fff57ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: ETSI ARF - Authoring Editor
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 417.77777
- y: 175.11111
- width: 711.55554
- height: 791.44446
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2}
- worldStorageUser: {fileID: 11400000, guid: 748585a50399fd64883147cd731ae0b7, type: 2}
- creators: []
- trackables:
- - AR Marker Left [a71ecb62-701a-4a9b-a642-7bcb7d6a5241]
- - AR Marker Right [a13f8da9-d7b0-4b26-9a72-b3381c04a538]
- anchors:
- - Nose World Anchor [b0eca848-4716-4662-8dcf-73a62af6905b]
- - Pedestal Anchor [12bf99dc-3e8c-49b6-b943-408427074a50]
- links:
- - 366de337-ff00-4268-8069-c8d3092e435a
- - f926ab30-d27e-4498-8cf0-20b3a1779685
- - 04d4f81e-d424-47ad-8928-871da6e736d0
---- !u!114 &22
->>>>>>> develop
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: e219817d65c8b1f40ad85e6185e89e92, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Element Editor
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
-<<<<<<< HEAD
- x: 1218.5
- y: 78.5
- width: 374
- height: 734
-=======
- x: 292.44446
- y: 109.333336
- width: 516.6666
- height: 485.66666
->>>>>>> develop
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
-<<<<<<< HEAD
- type: 0
- local_size: {x: 0, y: 0, z: 0}
- local_rot: {x: 326.0875, y: 321.98138, z: 321.98138}
- local_pos: {x: 0, y: 0, z: 0}
---- !u!114 &13
-MonoBehaviour:
- m_ObjectHideFlags: 52
- 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: 2c1a0c92306453d46897c1af6cb5c2f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Graph Editor
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 306.5
- y: 78.5
- width: 910
- height: 427
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- worldStorageServer: {fileID: 11400000, guid: 777684ed8f62c9d408a1813e8382c676, type: 2}
- worldStorageUser: {fileID: 11400000, guid: c0696089e4a855b46ad490437919b1e8, type: 2}
---- !u!114 &14
-=======
---- !u!114 &23
->>>>>>> develop
+--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -789,81 +283,53 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
- m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
-<<<<<<< HEAD
- x: 6.5
- y: 526.5
- width: 1211
- height: 286
-=======
- x: 29.333334
- y: 724
- width: 583.8889
- height: 202.77777
->>>>>>> develop
+ x: 2249
+ y: 726.5
+ width: 920
+ height: 250
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
m_SearchFilter:
- m_NameFilter:
+ m_NameFilter:
m_ClassNames: []
m_AssetLabels: []
m_AssetBundleNames: []
m_VersionControlStates: []
m_SoftLockControlStates: []
- m_ReferencingInstanceIDs:
- m_SceneHandles:
+ m_ReferencingInstanceIDs:
+ m_SceneHandles:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
-<<<<<<< HEAD
- Assets
-=======
- - Assets/ETSI.ARF/ARF World Storage API/Resources
->>>>>>> develop
m_Globs: []
- m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
-<<<<<<< HEAD
- Assets
m_LastFoldersGridSize: -1
- m_LastProjectPath: C:\Dev\unity-world-storage-editor
+ m_LastProjectPath: U:\layout
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 484d0000
- m_LastClickedID: 19784
- m_ExpandedIDs: 00000000484d00004a4d00004c4d00004e4d000000ca9a3bffffff7f
-=======
- - Assets/ETSI.ARF/ARF World Storage API/Resources
- m_LastFoldersGridSize: 16
- m_LastProjectPath: D:\Fraunhofer\Projects\ETSI\GitLab (STF)\unity-world-storage-editor
- m_LockTracker:
- m_IsLocked: 0
- m_FolderTreeState:
- scrollPos: {x: 0, y: 141.18651}
- m_SelectedIDs: ae4d0000
- m_LastClickedID: 19886
- m_ExpandedIDs: 00000000904d0000924d0000944d0000964d0000984d00009a4d00009c4d000000ca9a3bffffff7f
->>>>>>> develop
+ m_SelectedIDs: f4350000
+ m_LastClickedID: 13812
+ m_ExpandedIDs: 00000000f435000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
@@ -875,31 +341,23 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
-<<<<<<< HEAD
m_ClientGUIView: {fileID: 0}
-=======
- m_ClientGUIView: {fileID: 11}
->>>>>>> develop
- m_SearchString:
+ m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
- m_Path:
+ m_Path:
m_Icon: {fileID: 0}
- m_ResourceFile:
+ m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
+ m_SelectedIDs:
m_LastClickedID: 0
-<<<<<<< HEAD
- m_ExpandedIDs: 00000000484d00004a4d00004c4d00004e4d0000
-=======
- m_ExpandedIDs: 00000000904d0000924d0000944d0000964d0000984d00009a4d00009c4d000000ca9a3bffffff7f
->>>>>>> develop
+ m_ExpandedIDs: 00000000f4350000
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
@@ -912,26 +370,22 @@ MonoBehaviour:
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0}
- m_SearchString:
+ m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
- m_Path:
+ m_Path:
m_Icon: {fileID: 0}
- m_ResourceFile:
+ m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs:
+ m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
-<<<<<<< HEAD
m_ExpandedInstanceIDs: c6230000
-=======
- m_ExpandedInstanceIDs: c6230000de4b000000000000
->>>>>>> develop
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
@@ -943,28 +397,19 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
-<<<<<<< HEAD
m_ClientGUIView: {fileID: 0}
-=======
- m_ClientGUIView: {fileID: 11}
->>>>>>> develop
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
- m_Path:
+ m_Path:
m_Icon: {fileID: 0}
- m_ResourceFile:
+ m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_SkipHiddenPackages: 0
-<<<<<<< HEAD
m_DirectoriesAreaWidth: 207
---- !u!114 &15
-=======
- m_DirectoriesAreaWidth: 248.11111
---- !u!114 &24
->>>>>>> develop
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -974,49 +419,35 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
- m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
-<<<<<<< HEAD
- x: 1218.5
- y: 78.5
- width: 374
- height: 734
-=======
- x: 1280.8889
- y: 109.333336
- width: 390.11108
- height: 817.44446
->>>>>>> develop
+ x: 3170
+ y: 332.5
+ width: 284
+ height: 644
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
m_ObjectsLockedBeforeSerialization: []
- m_InstanceIDsLockedBeforeSerialization:
+ m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
- m_GlobalObjectId:
- m_InspectorMode: 0
+ m_AssetGUID:
+ m_InstanceID: 0
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
-<<<<<<< HEAD
---- !u!114 &16
-=======
---- !u!114 &25
->>>>>>> develop
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1026,47 +457,31 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
- m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
-<<<<<<< HEAD
- x: 6.5
- y: 78.5
- width: 299
- height: 427
-=======
- x: 29.333334
- y: 109.333336
- width: 248.33333
- height: 593.6667
->>>>>>> develop
+ x: 2249
+ y: 332.5
+ width: 227
+ height: 373
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
-<<<<<<< HEAD
- m_SelectedIDs:
+ m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 38fbffff
-=======
- m_SelectedIDs: eabcffff
- m_LastClickedID: -17174
- m_ExpandedIDs: 8a22fffff028fffff428ffff8a4affffb652ffff545dffff88f9ffff34fbffff1a4b00004c4b0000e24b0000b04c0000d24c0000
->>>>>>> develop
+ m_ExpandedIDs: 42fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
@@ -1078,24 +493,15 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
-<<<<<<< HEAD
m_ClientGUIView: {fileID: 0}
-=======
- m_ClientGUIView: {fileID: 10}
->>>>>>> develop
- m_SearchString:
+ m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
-<<<<<<< HEAD
m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &17
-=======
- m_WindowGUID: 26d3cc4a749ad3148bdaac8cbfc0727d
---- !u!114 &26
->>>>>>> develop
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1105,222 +511,22 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
- m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
-<<<<<<< HEAD
- x: 306.5
- y: 78.5
- width: 910
- height: 427
-=======
- x: 278.66666
- y: 109.333336
- width: 534
- height: 593.6667
->>>>>>> develop
+ x: 2477
+ y: 332.5
+ width: 691
+ height: 373
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData:
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
-<<<<<<< HEAD
- snapOffsetDelta: {x: -98, y: -26}
-=======
- snapOffsetDelta: {x: -98.22223, y: -25.777771}
->>>>>>> develop
- snapCorner: 3
- id: Tool Settings
- index: 0
- layout: 1
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -141, y: 149}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-grid-and-snap-toolbar
- index: 1
- layout: 1
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-scene-view-toolbar
- index: 0
- layout: 1
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-search-toolbar
- index: 1
- layout: 1
- - dockPosition: 0
- containerId: overlay-container--left
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-transform-toolbar
- index: 0
- layout: 2
- - dockPosition: 0
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 67.5, y: 86}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Orientation
- index: 0
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Light Settings
- index: 0
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Camera
- index: 1
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Constraints
- index: 2
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Collisions
- index: 3
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Navmesh Display
- index: 4
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Agent Display
- index: 5
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Obstacle Display
- index: 6
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Occlusion Culling
- index: 7
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Physics Debugger
- index: 8
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Scene Visibility
- index: 9
- layout: 4
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Particles
- index: 10
- layout: 4
+ m_ShowContextualTools: 0
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856
@@ -1331,15 +537,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
-<<<<<<< HEAD
- m_Target: {x: 1.3304825, y: 3.9150038, z: -3.6284218}
+ m_Target: {x: 0, y: 0, z: 0}
speed: 2
- m_Value: {x: 1.3304825, y: 3.9150038, z: -3.6284218}
-=======
- m_Target: {x: -0.7099275, y: 0.80373764, z: 2.400144}
- speed: 2
- m_Value: {x: -0.7099275, y: 0.80373764, z: 2.400144}
->>>>>>> develop
+ m_Value: {x: 0, y: 0, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -1349,14 +549,13 @@ MonoBehaviour:
m_DoValidateTrueMetals: 0
m_ExposureSliderValue: 0
m_SceneViewState:
- m_AlwaysRefresh: 0
- showFog: 0
- showSkybox: 0
- showFlares: 0
+ showFog: 1
+ showMaterialUpdate: 0
+ showSkybox: 1
+ showFlares: 1
showImageEffects: 1
showParticleSystems: 1
showVisualEffectGraphs: 1
- m_FxEnabled: 1
m_Grid:
xGrid:
m_Fade:
@@ -1386,23 +585,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
-<<<<<<< HEAD
- m_Target: {x: -0.037954368, y: 0.9214571, z: -0.09320772, w: -0.37521872}
+ m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
speed: 2
- m_Value: {x: -0.03795436, y: 0.9214569, z: -0.093207695, w: -0.37521863}
+ m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Size:
m_Target: 10
speed: 2
m_Value: 10
-=======
- m_Target: {x: 0.037111662, y: -0.14191893, z: 0.0053241164, w: 0.9891731}
- speed: 2
- m_Value: {x: 0.037111476, y: -0.14191821, z: 0.00532409, w: 0.98916817}
- m_Size:
- m_Target: 2.3866298
- speed: 2
- m_Value: 2.3866298
->>>>>>> develop
m_Ortho:
m_Target: 0
speed: 2
@@ -1415,7 +604,7 @@ MonoBehaviour:
m_EasingEnabled: 1
m_EasingDuration: 0.4
m_AccelerationEnabled: 1
- m_FieldOfViewHorizontalOrVertical: 60
+ m_FieldOfView: 90
m_NearClip: 0.03
m_FarClip: 10000
m_DynamicClip: 1
@@ -1423,15 +612,11 @@ MonoBehaviour:
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
- m_ReplacementString:
+ m_ReplacementString:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
-<<<<<<< HEAD
---- !u!114 &18
-=======
---- !u!114 &27
->>>>>>> develop
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1441,39 +626,32 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
- m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 814.6667
- y: 109.333336
- width: 464.22223
- height: 593.6667
+ x: 507
+ y: 94
+ width: 1532
+ height: 790
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_SerializedViewNames: []
- m_SerializedViewValues: []
+ m_SerializedViewsNames: []
+ m_SerializedViewsValues: []
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-<<<<<<< HEAD
- m_TargetSize: {x: 1532, y: 769}
-=======
- m_TargetSize: {x: 1044.5, y: 1288.5}
->>>>>>> develop
+ m_TargetSize: {x: 640, y: 480}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
- m_RenderIMGUI: 1
- m_EnterPlayModeBehavior: 0
+ m_RenderIMGUI: 0
+ m_MaximizeOnPlay: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
@@ -1484,17 +662,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
-<<<<<<< HEAD
- m_HBaseRangeMin: -383
- m_HBaseRangeMax: 383
- m_VBaseRangeMin: -192.25
- m_VBaseRangeMax: 192.25
-=======
- m_HBaseRangeMin: -232.11111
- m_HBaseRangeMax: 232.11111
- m_VBaseRangeMin: -286.33334
- m_VBaseRangeMax: 286.33334
->>>>>>> develop
+ m_HBaseRangeMin: -766
+ m_HBaseRangeMax: 766
+ m_VBaseRangeMin: -395
+ m_VBaseRangeMax: 395
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -1511,51 +682,30 @@ MonoBehaviour:
m_DrawArea:
serializedVersion: 2
x: 0
- y: 21
-<<<<<<< HEAD
+ y: 0
width: 1532
- height: 769
- m_Scale: {x: 2, y: 2}
- m_Translation: {x: 766, y: 384.5}
-=======
- width: 464.22223
- height: 572.6667
+ height: 790
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 232.11111, y: 286.33334}
->>>>>>> develop
+ m_Translation: {x: 766, y: 395}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
-<<<<<<< HEAD
- x: -383
- y: -192.25
- width: 766
- height: 384.5
- m_MinimalGUI: 1
- m_defaultScale: 2
- m_LastWindowPixelSize: {x: 3064, y: 1580}
-=======
- x: -232.11111
- y: -286.33334
- width: 464.22223
- height: 572.6667
+ x: -766
+ y: -395
+ width: 1532
+ height: 790
m_MinimalGUI: 1
m_defaultScale: 1
- m_LastWindowPixelSize: {x: 1044.5, y: 1335.75}
->>>>>>> develop
+ m_LastWindowPixelSize: {x: 1532, y: 790}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
-<<<<<<< HEAD
---- !u!114 &19
-=======
---- !u!114 &28
->>>>>>> develop
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1565,28 +715,19 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
+ m_Name:
+ m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
- m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
+ m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
m_Pos:
serializedVersion: 2
-<<<<<<< HEAD
x: 2249
y: 726.5
width: 920
height: 250
-=======
- x: 614.2222
- y: 724
- width: 664.6666
- height: 202.77777
->>>>>>> develop
m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
+