HumanoidControl/HumanoidControl_Free
HumanoidControl/HumanoidControl_Free
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Visitor Scene no longer needs to be in build settings.

Browse Source
This commit is contained in:
Pascal Serrarens 2022-02-03 10:55:24 +01:00
parent 1f4e410688
commit 9541a8c4a7
6 changed files with 32 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Editor/HumanoidFree/Configuration_Editor.cs
View File

@ -270,7 +270,7 @@ namespace Passer.Humanoid {
//anyChanged |= NetworkingSettingUI(serializedConfiguration); //anyChanged |= NetworkingSettingUI(serializedConfiguration);
anyChanged |= HumanoidSceneInspector(serializedConfiguration); //anyChanged |= HumanoidSceneInspector(serializedConfiguration);
return anyChanged; return anyChanged;
} }
@ -279,33 +279,33 @@ namespace Passer.Humanoid {
private static string[] personalHumanoidNames; private static string[] personalHumanoidNames;
public static bool HumanoidSceneInspector(SerializedObject serializedConfiguration) { //public static bool HumanoidSceneInspector(SerializedObject serializedConfiguration) {
bool anyChanged = false; // bool anyChanged = false;
SerializedProperty humanoidSceneNameProp = serializedConfiguration.FindProperty("humanoidSceneName"); // SerializedProperty humanoidSceneNameProp = serializedConfiguration.FindProperty("humanoidSceneName");
if (HumanoidVisitors.visitors.Count <= 0) // if (HumanoidVisitors.visitors.Count <= 0)
return false; // return false;
personalHumanoidNames = new string[HumanoidVisitors.visitors.Count]; // personalHumanoidNames = new string[HumanoidVisitors.visitors.Count];
int i = 0; // int i = 0;
int ix; // int ix;
foreach (string personalHumanoid in HumanoidVisitors.visitors) { // foreach (string personalHumanoid in HumanoidVisitors.visitors) {
string name = personalHumanoid; // string name = personalHumanoid;
ix = name.LastIndexOf('/'); // ix = name.LastIndexOf('/');
name = name.Substring(ix + 1); // name = name.Substring(ix + 1);
name = name.Substring(0, name.Length - 6); // remove .unity // name = name.Substring(0, name.Length - 6); // remove .unity
personalHumanoidNames[i++] = name; // personalHumanoidNames[i++] = name;
} // }
ix = HumanoidVisitors.visitors.FindIndex(name => name == humanoidSceneNameProp.stringValue); // ix = HumanoidVisitors.visitors.FindIndex(name => name == humanoidSceneNameProp.stringValue);
if (ix < 0) // if (ix < 0)
ix = 0; // ix = 0;
ix = EditorGUILayout.Popup("Testing Visitor", ix, personalHumanoidNames); // ix = EditorGUILayout.Popup("Testing Visitor", ix, personalHumanoidNames);
anyChanged = humanoidSceneNameProp.stringValue != HumanoidVisitors.visitors[ix]; // anyChanged = humanoidSceneNameProp.stringValue != HumanoidVisitors.visitors[ix];
humanoidSceneNameProp.stringValue = HumanoidVisitors.visitors[ix]; // humanoidSceneNameProp.stringValue = HumanoidVisitors.visitors[ix];
return anyChanged; // return anyChanged;
} //}
public static bool OpenVRSettingUI(SerializedObject serializedConfiguration) { public static bool OpenVRSettingUI(SerializedObject serializedConfiguration) {
bool anyChanged = false; bool anyChanged = false;

4
Editor/Sites/SiteNavigator_Editor.cs
View File

@ -20,8 +20,8 @@ namespace Passer {
} }
protected virtual void InitializeSiteNames() { protected virtual void InitializeSiteNames() {
HumanoidVisitors.CheckScenes(); //HumanoidVisitors.CheckScenes();
List<string> humanoidVisitors = HumanoidVisitors.visitors; //List<string> humanoidVisitors = HumanoidVisitors.visitors;
EditorBuildSettingsScene[] editorBuildSettingsScenes = EditorBuildSettings.scenes; EditorBuildSettingsScene[] editorBuildSettingsScenes = EditorBuildSettings.scenes;
int siteCount = editorBuildSettingsScenes.Length; // - HumanoidVisitors.visitors.Count; int siteCount = editorBuildSettingsScenes.Length; // - HumanoidVisitors.visitors.Count;

30
Runtime/HumanoidFree/HumanoidPreferences.cs
View File

@ -151,33 +151,15 @@ namespace Passer.Humanoid {
private static string[] visitorNames; private static string[] visitorNames;
private static bool VisitorSceneInspector() { private static bool VisitorSceneInspector() {
bool anyChanged = false; string visitorScenePath = HumanoidPreferences.visitorSceneName;
HumanoidVisitors.CheckScenes(); SceneAsset sceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(visitorScenePath);
if (HumanoidVisitors.visitors == null || HumanoidVisitors.visitors.Count <= 0) sceneAsset = (SceneAsset) EditorGUILayout.ObjectField("Visitor Scene", sceneAsset, typeof(SceneAsset), false);
return false; visitorScenePath = AssetDatabase.GetAssetPath(sceneAsset);
visitorNames = new string[HumanoidVisitors.visitors.Count]; bool anyChanged = visitorScenePath != HumanoidPreferences.visitorSceneName;
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;
}
}
string visitorSceneName = HumanoidPreferences.visitorSceneName; HumanoidPreferences.visitorSceneName = visitorScenePath;
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];
return anyChanged; return anyChanged;
} }

1
Runtime/Sites/Scripts/Site.cs
View File

@ -47,7 +47,6 @@ namespace Passer {
if (humanoid == null) { if (humanoid == null) {
string visitorScenePath = HumanoidPreferences.visitorSceneName; string visitorScenePath = HumanoidPreferences.visitorSceneName;
if (!string.IsNullOrEmpty(visitorScenePath)) { if (!string.IsNullOrEmpty(visitorScenePath)) {
//Debug.Log(visitorSceneName);
UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode(visitorScenePath, new LoadSceneParameters(LoadSceneMode.Additive)); UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode(visitorScenePath, new LoadSceneParameters(LoadSceneMode.Additive));
} }
else else

27
Runtime/Visitors/Scripts/HumanoidVisitors.cs
View File

@ -1,27 +0,0 @@
using System.Collections.Generic;
using UnityEditor;
namespace Passer.Humanoid {
#if UNITY_EDITOR
[InitializeOnLoad]
public class HumanoidVisitors {
public static List<string> visitors = new List<string>();
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
}

11
Runtime/Visitors/Scripts/HumanoidVisitors.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 19899e56fc3dbbe4ca6012685d51f69d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: