From 9541a8c4a7fa758c221f95d85888fec8bc1b7a2b Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Thu, 3 Feb 2022 10:55:24 +0100 Subject: [PATCH] Visitor Scene no longer needs to be in build settings. --- Editor/HumanoidFree/Configuration_Editor.cs | 48 +++++++++---------- Editor/Sites/SiteNavigator_Editor.cs | 4 +- Runtime/HumanoidFree/HumanoidPreferences.cs | 30 +++--------- Runtime/Sites/Scripts/Site.cs | 1 - Runtime/Visitors/Scripts/HumanoidVisitors.cs | 27 ----------- .../Visitors/Scripts/HumanoidVisitors.cs.meta | 11 ----- 6 files changed, 32 insertions(+), 89 deletions(-) delete mode 100644 Runtime/Visitors/Scripts/HumanoidVisitors.cs delete mode 100644 Runtime/Visitors/Scripts/HumanoidVisitors.cs.meta diff --git a/Editor/HumanoidFree/Configuration_Editor.cs b/Editor/HumanoidFree/Configuration_Editor.cs index e8f9ef5..5ff6022 100644 --- a/Editor/HumanoidFree/Configuration_Editor.cs +++ b/Editor/HumanoidFree/Configuration_Editor.cs @@ -270,7 +270,7 @@ namespace Passer.Humanoid { //anyChanged |= NetworkingSettingUI(serializedConfiguration); - anyChanged |= HumanoidSceneInspector(serializedConfiguration); + //anyChanged |= HumanoidSceneInspector(serializedConfiguration); return anyChanged; } @@ -279,33 +279,33 @@ namespace Passer.Humanoid { private static string[] personalHumanoidNames; - public static bool HumanoidSceneInspector(SerializedObject serializedConfiguration) { - bool anyChanged = false; - SerializedProperty humanoidSceneNameProp = serializedConfiguration.FindProperty("humanoidSceneName"); + //public static bool HumanoidSceneInspector(SerializedObject serializedConfiguration) { + // bool anyChanged = false; + // SerializedProperty humanoidSceneNameProp = serializedConfiguration.FindProperty("humanoidSceneName"); - if (HumanoidVisitors.visitors.Count <= 0) - return false; + // if (HumanoidVisitors.visitors.Count <= 0) + // return false; - personalHumanoidNames = new string[HumanoidVisitors.visitors.Count]; - int i = 0; - int ix; - foreach (string personalHumanoid in HumanoidVisitors.visitors) { - string name = personalHumanoid; - ix = name.LastIndexOf('/'); - name = name.Substring(ix + 1); - name = name.Substring(0, name.Length - 6); // remove .unity - personalHumanoidNames[i++] = name; - } + // personalHumanoidNames = new string[HumanoidVisitors.visitors.Count]; + // int i = 0; + // int ix; + // foreach (string personalHumanoid in HumanoidVisitors.visitors) { + // string name = personalHumanoid; + // ix = name.LastIndexOf('/'); + // name = name.Substring(ix + 1); + // name = name.Substring(0, name.Length - 6); // remove .unity + // personalHumanoidNames[i++] = name; + // } - ix = HumanoidVisitors.visitors.FindIndex(name => name == humanoidSceneNameProp.stringValue); - if (ix < 0) - ix = 0; - ix = EditorGUILayout.Popup("Testing Visitor", ix, personalHumanoidNames); - anyChanged = humanoidSceneNameProp.stringValue != HumanoidVisitors.visitors[ix]; + // ix = HumanoidVisitors.visitors.FindIndex(name => name == humanoidSceneNameProp.stringValue); + // if (ix < 0) + // ix = 0; + // ix = EditorGUILayout.Popup("Testing Visitor", ix, personalHumanoidNames); + // anyChanged = humanoidSceneNameProp.stringValue != HumanoidVisitors.visitors[ix]; - humanoidSceneNameProp.stringValue = HumanoidVisitors.visitors[ix]; - return anyChanged; - } + // humanoidSceneNameProp.stringValue = HumanoidVisitors.visitors[ix]; + // return anyChanged; + //} public static bool OpenVRSettingUI(SerializedObject serializedConfiguration) { bool anyChanged = false; diff --git a/Editor/Sites/SiteNavigator_Editor.cs b/Editor/Sites/SiteNavigator_Editor.cs index 34d4c2c..bec2d88 100644 --- a/Editor/Sites/SiteNavigator_Editor.cs +++ b/Editor/Sites/SiteNavigator_Editor.cs @@ -20,8 +20,8 @@ namespace Passer { } protected virtual void InitializeSiteNames() { - HumanoidVisitors.CheckScenes(); - List humanoidVisitors = HumanoidVisitors.visitors; + //HumanoidVisitors.CheckScenes(); + //List humanoidVisitors = HumanoidVisitors.visitors; EditorBuildSettingsScene[] editorBuildSettingsScenes = EditorBuildSettings.scenes; int siteCount = editorBuildSettingsScenes.Length; // - HumanoidVisitors.visitors.Count; diff --git a/Runtime/HumanoidFree/HumanoidPreferences.cs b/Runtime/HumanoidFree/HumanoidPreferences.cs index 6434544..f29e5e4 100644 --- a/Runtime/HumanoidFree/HumanoidPreferences.cs +++ b/Runtime/HumanoidFree/HumanoidPreferences.cs @@ -151,33 +151,15 @@ namespace Passer.Humanoid { private static string[] visitorNames; private static bool VisitorSceneInspector() { - bool anyChanged = false; + string visitorScenePath = HumanoidPreferences.visitorSceneName; - HumanoidVisitors.CheckScenes(); - if (HumanoidVisitors.visitors == null || HumanoidVisitors.visitors.Count <= 0) - return false; + SceneAsset sceneAsset = AssetDatabase.LoadAssetAtPath(visitorScenePath); + sceneAsset = (SceneAsset) EditorGUILayout.ObjectField("Visitor Scene", sceneAsset, typeof(SceneAsset), false); + visitorScenePath = AssetDatabase.GetAssetPath(sceneAsset); - visitorNames = new string[HumanoidVisitors.visitors.Count]; - int i = 0; - int ix; - foreach (string visitor in HumanoidVisitors.visitors) { - string name = visitor; - ix = name.LastIndexOf('/'); - if (ix >= 0) { - name = name.Substring(ix + 1); - name = name.Substring(0, name.Length - 6); // remove .unity - visitorNames[i++] = name; - } - } + bool anyChanged = visitorScenePath != HumanoidPreferences.visitorSceneName; - string visitorSceneName = HumanoidPreferences.visitorSceneName; - ix = HumanoidVisitors.visitors.FindIndex(name => name == visitorSceneName); - if (ix < 0) - ix = 0; - ix = EditorGUILayout.Popup("Default Visitor scene", ix, visitorNames); - anyChanged = visitorSceneName != HumanoidVisitors.visitors[ix]; - - HumanoidPreferences.visitorSceneName = HumanoidVisitors.visitors[ix]; + HumanoidPreferences.visitorSceneName = visitorScenePath; return anyChanged; } diff --git a/Runtime/Sites/Scripts/Site.cs b/Runtime/Sites/Scripts/Site.cs index 776d972..3a116c0 100644 --- a/Runtime/Sites/Scripts/Site.cs +++ b/Runtime/Sites/Scripts/Site.cs @@ -47,7 +47,6 @@ namespace Passer { if (humanoid == null) { string visitorScenePath = HumanoidPreferences.visitorSceneName; if (!string.IsNullOrEmpty(visitorScenePath)) { - //Debug.Log(visitorSceneName); UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode(visitorScenePath, new LoadSceneParameters(LoadSceneMode.Additive)); } else diff --git a/Runtime/Visitors/Scripts/HumanoidVisitors.cs b/Runtime/Visitors/Scripts/HumanoidVisitors.cs deleted file mode 100644 index 4f3c4f3..0000000 --- a/Runtime/Visitors/Scripts/HumanoidVisitors.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using UnityEditor; - -namespace Passer.Humanoid { - -#if UNITY_EDITOR - [InitializeOnLoad] - public class HumanoidVisitors { - - public static List visitors = new List(); - - static HumanoidVisitors() { - CheckScenes(); - } - - public static void CheckScenes() { - EditorBuildSettingsScene[] editorBuildSettingsScenes = EditorBuildSettings.scenes; - foreach (EditorBuildSettingsScene editorBuildSettingsScene in editorBuildSettingsScenes) { - string localSceneName = editorBuildSettingsScene.path; - if (!visitors.Contains(localSceneName)) { - visitors.Add(localSceneName); - } - } - } - } -#endif -} \ No newline at end of file diff --git a/Runtime/Visitors/Scripts/HumanoidVisitors.cs.meta b/Runtime/Visitors/Scripts/HumanoidVisitors.cs.meta deleted file mode 100644 index 50d27ec..0000000 --- a/Runtime/Visitors/Scripts/HumanoidVisitors.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19899e56fc3dbbe4ca6012685d51f69d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: