diff --git a/Editor/HumanoidFree/Configuration_Editor.cs b/Editor/HumanoidFree/Configuration_Editor.cs index cc945a0..c3e8ba2 100644 --- a/Editor/HumanoidFree/Configuration_Editor.cs +++ b/Editor/HumanoidFree/Configuration_Editor.cs @@ -117,8 +117,8 @@ namespace Passer.Humanoid { } [CustomEditor(typeof(Configuration))] - public class Configuration_Editor : Editor /*: Pawn.Configuration_Editor */{ - private Configuration configuration; + public class Configuration_Editor : Editor { + private static Configuration configuration; private static string humanoidPath; @@ -136,71 +136,74 @@ namespace Passer.Humanoid { private const string facePath = "FaceControl/EyeTarget.cs"; - public static Configuration CreateDefaultConfiguration() { - Configuration configuration; + //public static Configuration CreateDefaultConfiguration() { + // Configuration configuration; - Debug.Log("Created new Default Configuration"); - // Create new Default Configuration - configuration = CreateInstance(); - configuration.oculusSupport = true; - configuration.openVRSupport = true; - configuration.windowsMRSupport = true; + // Debug.Log("Created new Default Configuration"); + // // Create new Default Configuration + // configuration = CreateInstance(); + // configuration.oculusSupport = true; + // configuration.openVRSupport = true; + // configuration.windowsMRSupport = true; - string path = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / - path = path.Substring(0, path.LastIndexOf('/') + 1); // strip Scripts; - path = "Assets" + path + "DefaultConfiguration.asset"; - AssetDatabase.CreateAsset(configuration, path); - AssetDatabase.SaveAssets(); - return configuration; - } + // string path = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / + // path = path.Substring(0, path.LastIndexOf('/') + 1); // strip Scripts; + // path = "Assets" + path + "DefaultConfiguration.asset"; + // AssetDatabase.CreateAsset(configuration, path); + // AssetDatabase.SaveAssets(); + // return configuration; + //} public static Configuration GetConfiguration() { - string humanoidPath = FindHumanoidFolder(); - humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / - humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; + //string humanoidPath = FindHumanoidFolder(); + //humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / + //humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; - string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); - var settings = AssetDatabase.LoadAssetAtPath("Assets" + humanoidPath + "HumanoidPreferences.asset"); - if (settings == null) { - settings = CreateInstance(); + //configuration.networkingSupport = (NetworkingSystems)EditorPrefs.GetInt("HumanoidNetworkingSupport", 0); + //configuration.humanoidSceneName = EditorPrefs.GetString("HumanoidSceneName", ""); + //string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); + //var settings = AssetDatabase.LoadAssetAtPath("Assets" + humanoidPath + "HumanoidPreferences.asset"); + //if (settings == null) { + // settings = CreateInstance(); - // Creating assets in a package is not possible because the package is read-only - // Configuration file feature is to be removed. - //AssetDatabase.CreateAsset(settings, HumanoidPreferences.settingsPath); - AssetDatabase.SaveAssets(); - } + // // Creating assets in a package is not possible because the package is read-only + // // Configuration file feature is to be removed. + // //AssetDatabase.CreateAsset(settings, HumanoidPreferences.settingsPath); + // AssetDatabase.SaveAssets(); + //} - SerializedObject serializedSettings = new SerializedObject(settings); - SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); - if (settings.configuration == null) { - Configuration configuration = LoadConfiguration(configurationString); - if (configuration == null) { - configurationString = "DefaultConfiguration"; - configuration = LoadConfiguration(configurationString); - if (configuration == null) { - Debug.Log("Created new Default Configuration"); - // Create new Default Configuration - configuration = CreateInstance(); - configuration.oculusSupport = true; - configuration.openVRSupport = true; - configuration.windowsMRSupport = true; - string path = "Assets" + humanoidPath + configurationString + ".asset"; - Debug.Log(configuration + " " + path); - AssetDatabase.CreateAsset(configuration, path); - AssetDatabase.SaveAssets(); - } - EditorPrefs.SetString("HumanoidConfigurationKey", configurationString); - } - configurationProp.objectReferenceValue = configuration; - } - serializedSettings.ApplyModifiedProperties(); - return (Configuration)configurationProp.objectReferenceValue; + //SerializedObject serializedSettings = new SerializedObject(settings); + //SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); + //if (settings.configuration == null) { + // Configuration configuration = LoadConfiguration(configurationString); + // if (configuration == null) { + // configurationString = "DefaultConfiguration"; + // configuration = LoadConfiguration(configurationString); + // if (configuration == null) { + // Debug.Log("Created new Default Configuration"); + // // Create new Default Configuration + // configuration = CreateInstance(); + // configuration.oculusSupport = true; + // configuration.openVRSupport = true; + // configuration.windowsMRSupport = true; + // string path = "Assets" + humanoidPath + configurationString + ".asset"; + // Debug.Log(configuration + " " + path); + // AssetDatabase.CreateAsset(configuration, path); + // AssetDatabase.SaveAssets(); + // } + // EditorPrefs.SetString("HumanoidConfigurationKey", configurationString); + // } + // configurationProp.objectReferenceValue = configuration; + //} + //serializedSettings.ApplyModifiedProperties(); + //return (Configuration)configurationProp.objectReferenceValue; + return configuration; } #region Enable public void OnEnable() { - configuration = (Configuration)target; + //configuration = (Configuration)target; humanoidPath = FindHumanoidFolder(); } @@ -231,10 +234,10 @@ namespace Passer.Humanoid { public override void OnInspectorGUI() { serializedObject.Update(); - bool anyChanged = ConfigurationGUI(serializedObject); - if (GUI.changed || anyChanged) { - EditorUtility.SetDirty(configuration); - } + //bool anyChanged = ConfigurationGUI(serializedObject); + //if (GUI.changed || anyChanged) { + // EditorUtility.SetDirty(configuration); + //} serializedObject.ApplyModifiedProperties(); } @@ -244,28 +247,28 @@ namespace Passer.Humanoid { //anyChanged |= OpenVRSettingUI(serializedConfiguration); - anyChanged |= SteamVRSettingUI(serializedConfiguration); - anyChanged |= OculusSettingUI(serializedConfiguration); - anyChanged |= WindowsMRSettingUI(serializedConfiguration); - anyChanged |= VrtkSettingUI(serializedConfiguration); + //anyChanged |= SteamVRSettingUI(serializedConfiguration); + //anyChanged |= OculusSettingUI(serializedConfiguration); + //anyChanged |= WindowsMRSettingUI(serializedConfiguration); + //anyChanged |= VrtkSettingUI(serializedConfiguration); - anyChanged |= LeapSettingUI(serializedConfiguration); - anyChanged |= Kinect1SettingUI(serializedConfiguration); - anyChanged |= Kinect2SettingUI(serializedConfiguration); - anyChanged |= Kinect4SettingUI(serializedConfiguration); - anyChanged |= AstraSettingUI(serializedConfiguration); + //anyChanged |= LeapSettingUI(serializedConfiguration); + //anyChanged |= Kinect1SettingUI(serializedConfiguration); + //anyChanged |= Kinect2SettingUI(serializedConfiguration); + //anyChanged |= Kinect4SettingUI(serializedConfiguration); + //anyChanged |= AstraSettingUI(serializedConfiguration); - anyChanged |= RealsenseSettingUI(serializedConfiguration); - anyChanged |= HydraSettingUI(serializedConfiguration); - anyChanged |= TobiiSettingUI(serializedConfiguration); - anyChanged |= ArkitSettingUI(serializedConfiguration); - anyChanged |= PupilSettingUI(serializedConfiguration); - anyChanged |= NeuronSettingUI(serializedConfiguration); - anyChanged |= Hi5SettingUI(serializedConfiguration); - anyChanged |= OptitrackSettingUI(serializedConfiguration); - anyChanged |= AntilatencySettingUI(serializedConfiguration); + //anyChanged |= RealsenseSettingUI(serializedConfiguration); + //anyChanged |= HydraSettingUI(serializedConfiguration); + //anyChanged |= TobiiSettingUI(serializedConfiguration); + //anyChanged |= ArkitSettingUI(serializedConfiguration); + //anyChanged |= PupilSettingUI(serializedConfiguration); + //anyChanged |= NeuronSettingUI(serializedConfiguration); + //anyChanged |= Hi5SettingUI(serializedConfiguration); + //anyChanged |= OptitrackSettingUI(serializedConfiguration); + //anyChanged |= AntilatencySettingUI(serializedConfiguration); - anyChanged |= NetworkingSettingUI(serializedConfiguration); + //anyChanged |= NetworkingSettingUI(serializedConfiguration); anyChanged |= HumanoidSceneInspector(serializedConfiguration); @@ -792,6 +795,8 @@ namespace Passer.Humanoid { CheckExtensionUnityXR(); + // configuration should become replace by HumanoidPreferences + configuration = new Configuration(); configuration.openVRSupport = CheckExtensionOpenVR(configuration); configuration.steamVrSupport = CheckExtensionSteamVR(configuration); configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration); @@ -829,7 +834,7 @@ namespace Passer.Humanoid { } public static bool CheckExtensionOpenVR(Configuration configuration) { - bool enabled = configuration.openVRSupport; + bool enabled = true; // configuration.openVRSupport; CheckExtension(isViveHandTrackingAvailable, "hVIVEHAND"); return CheckExtension(enabled, openVRPath, "hOPENVR"); } @@ -1079,15 +1084,15 @@ namespace Passer.Humanoid { } } - public static Configuration LoadConfiguration(string configurationName) { - string[] foundAssets = AssetDatabase.FindAssets(configurationName + " t:Configuration"); - if (foundAssets.Length == 0) - return null; + //public static Configuration LoadConfiguration(string configurationName) { + // string[] foundAssets = AssetDatabase.FindAssets(configurationName + " t:Configuration"); + // if (foundAssets.Length == 0) + // return null; - string path = AssetDatabase.GUIDToAssetPath(foundAssets[0]); - Configuration configuration = AssetDatabase.LoadAssetAtPath(path); - return configuration; - } + // string path = AssetDatabase.GUIDToAssetPath(foundAssets[0]); + // Configuration configuration = AssetDatabase.LoadAssetAtPath(path); + // return configuration; + //} public static void GlobalDefine(string name) { //Debug.Log("Define " + name); diff --git a/Editor/HumanoidFree/HumanoidPreferences.cs b/Editor/HumanoidFree/HumanoidPreferences.cs deleted file mode 100644 index 84a18eb..0000000 --- a/Editor/HumanoidFree/HumanoidPreferences.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System.Collections.Generic; -using UnityEditor; -using UnityEngine; - -namespace Passer.Humanoid { - - /// - /// Sets preferences for \ref Humanoid "Humanoid Control" - /// - /// - /// The preferences can be accessed by the Edit->Preferences... menu. - /// - /// \image html HumanoidPreferences.png - /// - /// * SteamVR Support, enables support for SteamVR devices beyound Unity XR (VR, Plus, Pro) - /// * Vive Tracker Support, enables support for Vive Trackers (Plus, Pro) - /// * Leap Motion Support, enables support for Leap Motion (Plus, Pro) - /// * Kinect 1 Support, enables support for Microsoft Kinect 360/Kinect for Windows (Plus, Pro) - /// * Kinect 2 Support, enables support for Microsoft Kinect 2 (Plus, Pro) - /// * Azure Kinect Support, enables support for Azure Kinect (Plus, Pro) - /// * Orbbec Astra Support, enables support for Orbbec Astra (Plus, Pro) - /// * Hydra Support, enables support for Razer Hydra (Pro) - /// * Tobii Support, enables support for Tobii desktop eye tracking (Pro) - /// * Perception Neuron Support, enables support for Perception Neuron (Pro) - /// * OptiTrack Support, enables support for OptiTrack (Pro) - /// * Antilatency Support, enables support for Antilatency (Pro) - /// - /// * The Testing Visitor selects which Visitor Scene will be used when a Site is started in Play mode. - /// - [System.Serializable] - public class HumanoidPreferences : ScriptableObject { - public static bool help = false; - public const string settingsPath = "Assets/Passer/Humanoid/HumanoidPreferences.asset"; - - public Configuration configuration; - - internal static HumanoidPreferences GetOrCreateSettings() { - string humanoidPath = Configuration_Editor.FindHumanoidFolder(); - humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / - humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; - string settingsPath = "Assets" + humanoidPath + "HumanoidPreferences.asset"; - HumanoidPreferences settings = AssetDatabase.LoadAssetAtPath(settingsPath); - SerializedObject serializedSettings = new SerializedObject(settings); - if (settings == null) { - settings = CreateInstance(); - - AssetDatabase.CreateAsset(settings, settingsPath); - } - if (settings.configuration == null) { - string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); - Configuration configuration = Configuration_Editor.LoadConfiguration(configurationString); - if (configuration == null) { - configurationString = "DefaultConfiguration"; - Configuration_Editor.LoadConfiguration(configurationString); - if (configuration == null) { - Debug.Log("Created new Default Configuration"); - // Create new Default Configuration - configuration = CreateInstance(); - string path = "Assets" + humanoidPath + configurationString + ".asset"; - AssetDatabase.CreateAsset(configuration, path); - AssetDatabase.SaveAssets(); - } - } - SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); - configurationProp.objectReferenceValue = configuration; - EditorUtility.SetDirty(settings); - } - serializedSettings.ApplyModifiedProperties(); - return (HumanoidPreferences)serializedSettings.targetObject;//settings; - } - - internal static SerializedObject GetOrCreateSerializedSettings() { - string humanoidPath = Configuration_Editor.FindHumanoidFolder(); - humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / - humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; - string settingsPath = "Assets" + humanoidPath + "HumanoidPreferences.asset"; - HumanoidPreferences settings = AssetDatabase.LoadAssetAtPath(settingsPath); - - if (settings == null) { - Debug.Log("Created new Settings"); - settings = CreateInstance(); - - AssetDatabase.CreateAsset(settings, settingsPath); - } - if (settings.configuration == null) { - Debug.Log("Settings Configuration is not set"); - string configurationString = "DefaultConfiguration"; - Configuration configuration = Configuration_Editor.LoadConfiguration(configurationString); - if (configuration == null) { - configurationString = "DefaultConfiguration"; - Configuration_Editor.LoadConfiguration(configurationString); - if (configuration == null) { - Debug.Log("Created new Default Configuration"); - // Create new Default Configuration - configuration = CreateInstance(); - string path = "Assets" + humanoidPath + configurationString + ".asset"; - AssetDatabase.CreateAsset(configuration, path); - AssetDatabase.SaveAssets(); - } - } - settings.configuration = configuration; - } - SerializedObject serializedSettings = new SerializedObject(settings); - return serializedSettings; - } - } - - static class HumanoidPreferencesIMGUIRegister { - public static bool reload; - - [SettingsProvider] - public static SettingsProvider CreateHumanoidSettingsProvider() { - var provider = new SettingsProvider("Preferences/HumanoidControlSettings", SettingsScope.User) { - label = "Humanoid Control", - guiHandler = (searchContext) => { - - SerializedObject serializedSettings = HumanoidPreferences.GetOrCreateSerializedSettings(); - - SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); - Configuration oldConfiguration = (Configuration)configurationProp.objectReferenceValue; - - configurationProp.objectReferenceValue = EditorGUILayout.ObjectField("Configuration", configurationProp.objectReferenceValue, typeof(Configuration), false); - SerializedObject serializedConfiguration = new SerializedObject(configurationProp.objectReferenceValue); - - bool anyChanged = false; - anyChanged |= (configurationProp.objectReferenceValue != oldConfiguration); - anyChanged |= Configuration_Editor.ConfigurationGUI(serializedConfiguration); - serializedConfiguration.ApplyModifiedProperties(); - serializedSettings.ApplyModifiedProperties(); - - Configuration_Editor.CheckExtensions((Configuration)configurationProp.objectReferenceValue); - - if (reload) { - reload = false; -#if hUNET - OnLoadHumanoidPlayerUnet.CheckHumanoidPlayer(); -#endif -#if hPHOTON1 || hPHOTON2 - OnLoadHumanoidPlayerPun.CheckHumanoidPlayer(); -#endif -#if hBOLT - OnLoadHumanoidPlayerBolt.CheckHumanoidPlayer(); -#endif -#if hMIRROR - OnLoadHumanoidPlayerMirror.CheckHumanoidPlayer(); -#endif - } - }, - keywords = new HashSet( - new[] { "Humanoid", "Oculus", "SteamVR" } - ) - }; - return provider; - } - - } - -} \ No newline at end of file diff --git a/Editor/HumanoidFree/Networking/HumanoidPlayer_Editor.cs b/Editor/HumanoidFree/Networking/HumanoidPlayer_Editor.cs index 804af76..24b3df1 100644 --- a/Editor/HumanoidFree/Networking/HumanoidPlayer_Editor.cs +++ b/Editor/HumanoidFree/Networking/HumanoidPlayer_Editor.cs @@ -11,7 +11,7 @@ namespace Passer.Humanoid { [InitializeOnLoad] public class OnLoadHumanoidPlayer { static OnLoadHumanoidPlayer() { - HumanoidPreferencesIMGUIRegister.reload = true; + //HumanoidPreferencesIMGUIRegister.reload = true; } public static string GetHumanoidPlayerPrefabPath() { diff --git a/Editor/HumanoidFree/Preferences.cs b/Editor/HumanoidFree/Preferences.cs index de50cfe..254e903 100644 --- a/Editor/HumanoidFree/Preferences.cs +++ b/Editor/HumanoidFree/Preferences.cs @@ -1,4 +1,5 @@ -#if UNITY_EDITOR +/* +#if UNITY_EDITOR using System; using System.Runtime.InteropServices; using UnityEditor; @@ -32,4 +33,5 @@ namespace Passer { } } -#endif \ No newline at end of file +#endif +*/ \ No newline at end of file diff --git a/Editor/Sites/SiteBuilder.cs b/Editor/Sites/SiteBuilder.cs index 97d4750..e0c6d76 100644 --- a/Editor/Sites/SiteBuilder.cs +++ b/Editor/Sites/SiteBuilder.cs @@ -26,50 +26,51 @@ namespace Passer { [InitializeOnLoad] public class SiteBuilder { - static SiteBuilder() { - if (siteBuilds == null) { - siteBuilds = AssetDatabase.LoadAssetAtPath("Assets/HumanoidControl/Runtime/Sites/SiteList.asset"); - if (siteBuilds == null) { - if (!Directory.Exists("Assets/HumanoidControl/Runtime/Sites")) - Directory.CreateDirectory("Assets/HumanoidControl/Runtime/Sites"); - - siteBuilds = (Sites)ScriptableObject.CreateInstance(typeof(Sites)); - AssetDatabase.CreateAsset(siteBuilds, "Assets/HumanoidControl/Runtime/Sites/SiteList.asset"); - } - } - bool hasChanged = false; - - string[] assetbundles = AssetDatabase.GetAllAssetBundleNames(); - for (int i = 0; i < assetbundles.Length; i++) { - Sites.SiteBuild siteBuild = siteBuilds.list.Find(sb => sb.siteName == assetbundles[i]); - if (siteBuild == null) { - siteBuild = new Sites.SiteBuild() { - siteName = assetbundles[i], - enabled = true, - }; - siteBuilds.list.Add(siteBuild); - hasChanged = true; - } - } - if (hasChanged) - AssetDatabase.SaveAssets(); - } - - public static Sites siteBuilds; + public static Sites siteBuilds = null; private class SiteBuilderWindow : EditorWindow { [MenuItem("File/Build Sites", false, 100)] // somehow priority does not work in File Menu? public static void OpenWindow() { - + GenerateSiteBuilds(); SiteBuilderWindow window = (SiteBuilderWindow)EditorWindow.GetWindow(typeof(SiteBuilderWindow), true, "Build Sites"); window.ShowUtility(); } + private static void GenerateSiteBuilds() { + string[] assetbundles = AssetDatabase.GetAllAssetBundleNames(); + + if (assetbundles.Length > 0) { + if (siteBuilds == null) { + siteBuilds = AssetDatabase.LoadAssetAtPath("Assets/SiteBuilds/SiteList.asset"); + if (siteBuilds == null) { + if (!Directory.Exists("Assets/SiteBuilds")) + Directory.CreateDirectory("Assets/SiteBuilds"); + + siteBuilds = (Sites)ScriptableObject.CreateInstance(typeof(Sites)); + AssetDatabase.CreateAsset(siteBuilds, "Assets/SiteBuilds/SiteList.asset"); + } + } + } + bool hasChanged = false; + + for (int i = 0; i < assetbundles.Length; i++) { + Sites.SiteBuild siteBuild = siteBuilds.list.Find(sb => sb.siteName == assetbundles[i]); + if (siteBuild == null) { + siteBuild = new Sites.SiteBuild() { + siteName = assetbundles[i], + enabled = true, + }; + siteBuilds.list.Add(siteBuild); + hasChanged = true; + } + } + if (hasChanged) + AssetDatabase.SaveAssets(); + } private Vector2 scrollPos; private void OnGUI() { - //GUI.contentColor = Color.red; EditorGUILayout.LabelField("Sites in Build", EditorStyles.boldLabel); scrollPos = @@ -228,7 +229,7 @@ namespace Passer { if (!Directory.Exists(assetBundleDirectory)) Directory.CreateDirectory(assetBundleDirectory); - AssetBundleBuild[] buildMap = GetBuildmap(); + AssetBundleBuild[] buildMap = GetBuildmap(); BuildPipeline.BuildAssetBundles(assetBundleDirectory, buildMap, BuildAssetBundleOptions.None, BuildTarget.WebGL); string[] filePaths = Directory.GetFiles(assetBundleDirectory); diff --git a/Runtime/HumanoidFree/DefaultConfiguration.asset b/Runtime/HumanoidFree/DefaultConfiguration.asset index c7ac3b6..35aed9c 100644 --- a/Runtime/HumanoidFree/DefaultConfiguration.asset +++ b/Runtime/HumanoidFree/DefaultConfiguration.asset @@ -12,12 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f15f0b7c56552b443a87b2cf84b2083c, type: 3} m_Name: DefaultConfiguration m_EditorClassIdentifier: - openVRSupport: 0 + openVRSupport: 1 steamVrSupport: 0 viveTrackerSupport: 0 - oculusSupport: 0 - windowsMRSupport: 0 - vrtkSupport: 0 + oculusSupport: 1 + windowsMRSupport: 1 + vrtkSupport: 1 neuronSupport: 0 hi5Support: 0 realsenseSupport: 0 @@ -32,6 +32,6 @@ MonoBehaviour: optitrackSupport: 0 pupilSupport: 0 antilatencySupport: 0 - networkingSupport: 1 + networkingSupport: 0 networkingVoiceSupport: 0 - humanoidSceneName: Assets/Passer/Visitors/HumanoidVisitor Desktop.unity + humanoidSceneName: diff --git a/Runtime/HumanoidFree/Full Configuration.asset b/Runtime/HumanoidFree/Full Configuration.asset deleted file mode 100644 index edf49af..0000000 --- a/Runtime/HumanoidFree/Full Configuration.asset +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f15f0b7c56552b443a87b2cf84b2083c, type: 3} - m_Name: Full Configuration - m_EditorClassIdentifier: - openVRSupport: 1 - viveTrackerSupport: 1 - oculusSupport: 1 - windowsMRSupport: 0 - vrtkSupport: 0 - neuronSupport: 1 - hi5Support: 1 - realsenseSupport: 1 - leapSupport: 1 - kinect1Support: 1 - kinect2Support: 1 - kinect4Support: 1 - astraSupport: 1 - hydraSupport: 1 - arkitSupport: 0 - tobiiSupport: 1 - optitrackSupport: 1 - pupilSupport: 0 - antilatencySupport: 1 - networkingSupport: 1 - networkingVoiceSupport: 0 diff --git a/Runtime/HumanoidFree/Full Configuration.asset.meta b/Runtime/HumanoidFree/Full Configuration.asset.meta deleted file mode 100644 index 0f274d6..0000000 --- a/Runtime/HumanoidFree/Full Configuration.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: edd90499d1806be48b5dea435a646f7f -timeCreated: 1535520381 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/HumanoidFree/HumanoidPreferences.asset b/Runtime/HumanoidFree/HumanoidPreferences.asset deleted file mode 100644 index 686ea59..0000000 --- a/Runtime/HumanoidFree/HumanoidPreferences.asset +++ /dev/null @@ -1,15 +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: 6021fe10956d4fe4e847551130851c03, type: 3} - m_Name: HumanoidPreferences - m_EditorClassIdentifier: - configuration: {fileID: 11400000, guid: 7c620c6539f83ba4a9ef59558546da7f, type: 2} diff --git a/Runtime/HumanoidFree/HumanoidPreferences.asset.meta b/Runtime/HumanoidFree/HumanoidPreferences.asset.meta deleted file mode 100644 index af8c8a5..0000000 --- a/Runtime/HumanoidFree/HumanoidPreferences.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 097ce2940be8c824f91c48a19afd5e7e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/HumanoidFree/HumanoidPreferences.cs b/Runtime/HumanoidFree/HumanoidPreferences.cs new file mode 100644 index 0000000..a0fcb0d --- /dev/null +++ b/Runtime/HumanoidFree/HumanoidPreferences.cs @@ -0,0 +1,211 @@ +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace Passer.Humanoid { + + /// + /// Sets preferences for \ref Humanoid "Humanoid Control" + /// + /// + /// The preferences can be accessed by the Edit->Preferences... menu. + /// + /// \image html HumanoidPreferences.png + /// + /// * SteamVR Support, enables support for SteamVR devices beyound Unity XR (VR, Plus, Pro) + /// * Vive Tracker Support, enables support for Vive Trackers (Plus, Pro) + /// * Leap Motion Support, enables support for Leap Motion (Plus, Pro) + /// * Kinect 1 Support, enables support for Microsoft Kinect 360/Kinect for Windows (Plus, Pro) + /// * Kinect 2 Support, enables support for Microsoft Kinect 2 (Plus, Pro) + /// * Azure Kinect Support, enables support for Azure Kinect (Plus, Pro) + /// * Orbbec Astra Support, enables support for Orbbec Astra (Plus, Pro) + /// * Hydra Support, enables support for Razer Hydra (Pro) + /// * Tobii Support, enables support for Tobii desktop eye tracking (Pro) + /// * Perception Neuron Support, enables support for Perception Neuron (Pro) + /// * OptiTrack Support, enables support for OptiTrack (Pro) + /// * Antilatency Support, enables support for Antilatency (Pro) + /// + /// * The Testing Visitor selects which Visitor Scene will be used when a Site is started in Play mode. + /// + //[System.Serializable] + public class HumanoidPreferences : ScriptableObject { + public static bool help = false; + public const string settingsPath = "Assets/Passer/Humanoid/HumanoidPreferences.asset"; + + public Configuration configuration; + + //internal static HumanoidPreferences GetOrCreateSettings() { + // string humanoidPath = Configuration_Editor.FindHumanoidFolder(); + // humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / + // humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; + // string settingsPath = "Assets" + humanoidPath + "HumanoidPreferences.asset"; + // HumanoidPreferences settings = AssetDatabase.LoadAssetAtPath(settingsPath); + // SerializedObject serializedSettings = new SerializedObject(settings); + // if (settings == null) { + // settings = CreateInstance(); + + // AssetDatabase.CreateAsset(settings, settingsPath); + // } + // if (settings.configuration == null) { + // string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); + // Configuration configuration = Configuration_Editor.LoadConfiguration(configurationString); + // if (configuration == null) { + // configurationString = "DefaultConfiguration"; + // Configuration_Editor.LoadConfiguration(configurationString); + // if (configuration == null) { + // Debug.Log("Created new Default Configuration"); + // // Create new Default Configuration + // configuration = CreateInstance(); + // string path = "Assets" + humanoidPath + configurationString + ".asset"; + // AssetDatabase.CreateAsset(configuration, path); + // AssetDatabase.SaveAssets(); + // } + // } + // SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); + // configurationProp.objectReferenceValue = configuration; + // EditorUtility.SetDirty(settings); + // } + // serializedSettings.ApplyModifiedProperties(); + // return (HumanoidPreferences)serializedSettings.targetObject;//settings; + //} + + //internal static SerializedObject GetOrCreateSerializedSettings() { + // string humanoidPath = Configuration_Editor.FindHumanoidFolder(); + // humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / + // humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; + // string settingsPath = "Assets" + humanoidPath + "HumanoidPreferences.asset"; + // HumanoidPreferences settings = AssetDatabase.LoadAssetAtPath(settingsPath); + + // if (settings == null) { + // Debug.Log("Created new Settings"); + // settings = CreateInstance(); + + // AssetDatabase.CreateAsset(settings, settingsPath); + // } + // if (settings.configuration == null) { + // Debug.Log("Settings Configuration is not set"); + // string configurationString = "DefaultConfiguration"; + // Configuration configuration = Configuration_Editor.LoadConfiguration(configurationString); + // if (configuration == null) { + // configurationString = "DefaultConfiguration"; + // Configuration_Editor.LoadConfiguration(configurationString); + // if (configuration == null) { + // Debug.Log("Created new Default Configuration"); + // // Create new Default Configuration + // configuration = CreateInstance(); + // string path = "Assets" + humanoidPath + configurationString + ".asset"; + // AssetDatabase.CreateAsset(configuration, path); + // AssetDatabase.SaveAssets(); + // } + // } + // settings.configuration = configuration; + // } + // SerializedObject serializedSettings = new SerializedObject(settings); + // return serializedSettings; + //} + + private const string networkingSupportKey = "HumanoidNetworkingSupport"; + public static NetworkingSystems networkingSupport { + get { + NetworkingSystems networkingSupport = (NetworkingSystems)EditorPrefs.GetInt(networkingSupportKey, 0); + return networkingSupport; + } + set { + EditorPrefs.SetInt(networkingSupportKey, (int)value); + } + } + + private const string visitorSceneNameKey = "VisitorSceneName"; + public static string visitorSceneName { + get { + string visitorSceneName = EditorPrefs.GetString(visitorSceneNameKey, ""); + return visitorSceneName; + } + set { + EditorPrefs.SetString(visitorSceneNameKey, value); + } + } + } + + static class HumanoidPreferencesIMGUIRegister { + public static bool reload; + + [SettingsProvider] + public static SettingsProvider CreateHumanoidSettingsProvider() { + var provider = new SettingsProvider("Preferences/HumanoidControlSettings", SettingsScope.User) { + label = "Humanoid Control", + guiHandler = (searchContext) => { + + //SerializedObject serializedSettings = HumanoidPreferences.GetOrCreateSerializedSettings(); + + //SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); + //Configuration oldConfiguration = (Configuration)configurationProp.objectReferenceValue; + + //configurationProp.objectReferenceValue = EditorGUILayout.ObjectField("Configuration", configurationProp.objectReferenceValue, typeof(Configuration), false); + //SerializedObject serializedConfiguration = new SerializedObject(configurationProp.objectReferenceValue); + + //bool anyChanged = false; + //anyChanged |= (configurationProp.objectReferenceValue != oldConfiguration); + //anyChanged |= Configuration_Editor.ConfigurationGUI(serializedConfiguration); + //serializedConfiguration.ApplyModifiedProperties(); + //serializedSettings.ApplyModifiedProperties(); + + //Configuration_Editor.CheckExtensions((Configuration)configurationProp.objectReferenceValue); + + HumanoidSceneInspector(); + + if (reload) { + reload = false; +#if hUNET + OnLoadHumanoidPlayerUnet.CheckHumanoidPlayer(); +#endif +#if hPHOTON1 || hPHOTON2 + OnLoadHumanoidPlayerPun.CheckHumanoidPlayer(); +#endif +#if hBOLT + OnLoadHumanoidPlayerBolt.CheckHumanoidPlayer(); +#endif +#if hMIRROR + OnLoadHumanoidPlayerMirror.CheckHumanoidPlayer(); +#endif + } + }, + keywords = new HashSet( + new[] { "Humanoid", "Oculus", "SteamVR" } + ) + }; + return provider; + } + + private static string[] personalHumanoidNames; + private static bool HumanoidSceneInspector() { + bool anyChanged = false; + if (HumanoidVisitors.visitors == null || 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; + } + + string visitorSceneName = HumanoidPreferences.visitorSceneName; + ix = HumanoidVisitors.visitors.FindIndex(name => name == visitorSceneName); + if (ix < 0) + ix = 0; + ix = EditorGUILayout.Popup("Testing Visitor", ix, personalHumanoidNames); + anyChanged = visitorSceneName != HumanoidVisitors.visitors[ix]; + if (anyChanged) + HumanoidVisitors.SetPersonalHumanoid(visitorSceneName, HumanoidVisitors.visitors[ix]); + + HumanoidPreferences.visitorSceneName = HumanoidVisitors.visitors[ix]; + return anyChanged; + } + } + +} \ No newline at end of file diff --git a/Editor/HumanoidFree/HumanoidPreferences.cs.meta b/Runtime/HumanoidFree/HumanoidPreferences.cs.meta similarity index 100% rename from Editor/HumanoidFree/HumanoidPreferences.cs.meta rename to Runtime/HumanoidFree/HumanoidPreferences.cs.meta diff --git a/Runtime/HumanoidFree/HumanoidSettings.asset b/Runtime/HumanoidFree/HumanoidSettings.asset deleted file mode 100644 index 461bba8..0000000 --- a/Runtime/HumanoidFree/HumanoidSettings.asset +++ /dev/null @@ -1,15 +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: 6021fe10956d4fe4e847551130851c03, type: 3} - m_Name: HumanoidSettings - m_EditorClassIdentifier: - configuration: {fileID: 11400000, guid: 7c620c6539f83ba4a9ef59558546da7f, type: 2} diff --git a/Runtime/HumanoidFree/HumanoidSettings.asset.meta b/Runtime/HumanoidFree/HumanoidSettings.asset.meta deleted file mode 100644 index 2c8036a..0000000 --- a/Runtime/HumanoidFree/HumanoidSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 76ff944d08708bb45b485b302c72264a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/HumanoidFree/Scripts/Configuration.cs b/Runtime/HumanoidFree/Scripts/Configuration.cs index 6f08042..3f171f7 100644 --- a/Runtime/HumanoidFree/Scripts/Configuration.cs +++ b/Runtime/HumanoidFree/Scripts/Configuration.cs @@ -2,9 +2,9 @@ namespace Passer.Humanoid { - [CreateAssetMenu(menuName = "Humanoid/Configuration", fileName = "HumanoidConfiguration", order = 100)] - [System.Serializable] - public class Configuration : ScriptableObject { + //[CreateAssetMenu(menuName = "Humanoid/Configuration", fileName = "HumanoidConfiguration", order = 100)] + //[System.Serializable] + public class Configuration /*: ScriptableObject*/ { public bool openVRSupport = false; public bool steamVrSupport = false; public bool viveTrackerSupport = false; @@ -31,18 +31,18 @@ namespace Passer.Humanoid { public string humanoidSceneName; - public static Configuration Load(string configurationName) { -#if UNITY_EDITOR - string[] foundAssets = UnityEditor.AssetDatabase.FindAssets(configurationName + " t:Configuration"); - if (foundAssets.Length == 0) - return null; +// public static Configuration Load(string configurationName) { +//#if UNITY_EDITOR +// string[] foundAssets = UnityEditor.AssetDatabase.FindAssets(configurationName + " t:Configuration"); +// if (foundAssets.Length == 0) +// return null; - string path = UnityEditor.AssetDatabase.GUIDToAssetPath(foundAssets[0]); - Configuration configuration = UnityEditor.AssetDatabase.LoadAssetAtPath(path); - return configuration; -#else - return null; -#endif - } +// string path = UnityEditor.AssetDatabase.GUIDToAssetPath(foundAssets[0]); +// Configuration configuration = UnityEditor.AssetDatabase.LoadAssetAtPath(path); +// return configuration; +//#else +// return null; +//#endif +// } } } \ No newline at end of file diff --git a/Runtime/HumanoidFree/VR Configuration.asset b/Runtime/HumanoidFree/VR Configuration.asset deleted file mode 100644 index ffa6774..0000000 --- a/Runtime/HumanoidFree/VR Configuration.asset +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f15f0b7c56552b443a87b2cf84b2083c, type: 3} - m_Name: VR Configuration - m_EditorClassIdentifier: - openVRSupport: 1 - viveTrackerSupport: 0 - oculusSupport: 1 - windowsMRSupport: 0 - vrtkSupport: 0 - neuronSupport: 0 - hi5Support: 0 - realsenseSupport: 0 - leapSupport: 0 - kinect1Support: 0 - kinect2Support: 0 - kinect4Support: 0 - astraSupport: 0 - hydraSupport: 0 - arkitSupport: 0 - tobiiSupport: 0 - optitrackSupport: 0 - pupilSupport: 0 - antilatencySupport: 0 - networkingSupport: 1 - networkingVoiceSupport: 0 diff --git a/Runtime/HumanoidFree/VR Configuration.asset.meta b/Runtime/HumanoidFree/VR Configuration.asset.meta deleted file mode 100644 index 871e1bd..0000000 --- a/Runtime/HumanoidFree/VR Configuration.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e3da9e54a6754384f8fbcf4b1c668924 -timeCreated: 1535553673 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/Sites/Scripts/Site.cs b/Runtime/Sites/Scripts/Site.cs index 3243c0d..a4093a0 100644 --- a/Runtime/Sites/Scripts/Site.cs +++ b/Runtime/Sites/Scripts/Site.cs @@ -44,11 +44,13 @@ namespace Passer { HumanoidControl humanoid = FindObjectOfType(); if (humanoid == null) { - string configurationString = UnityEditor.EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); - Humanoid.Configuration configuration = Humanoid.Configuration.Load(configurationString); - if (configuration != null) { - Debug.Log(configuration.humanoidSceneName); - UnityEngine.SceneManagement.SceneManager.LoadScene(configuration.humanoidSceneName, LoadSceneMode.Additive); + string visitorSceneName = Passer.Humanoid.HumanoidPreferences.visitorSceneName; + //string configurationString = UnityEditor.EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); + //Humanoid.Configuration configuration = Humanoid.Configuration.Load(configurationString); + //if (configuration != null) { + if (!string.IsNullOrEmpty(visitorSceneName)) { + Debug.Log(visitorSceneName); + UnityEngine.SceneManagement.SceneManager.LoadScene(visitorSceneName, LoadSceneMode.Additive); } else Debug.LogWarning("Could not load configuration: Visitor is not spawned"); diff --git a/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref b/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref deleted file mode 100644 index a36392f..0000000 --- a/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref +++ /dev/null @@ -1,3 +0,0 @@ -{ - "reference": "GUID:8d71350a0583ead4aaa1142233af2cd7" -} \ No newline at end of file diff --git a/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref.meta b/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref.meta deleted file mode 100644 index eb948ea..0000000 --- a/Runtime/Visitors/Editor/Passer.Editor_Reference.asmref.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b0fcea095e5f43944b2b0e7af7bfd9a3 -AssemblyDefinitionReferenceImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/Visitors/Editor/HumanoidVisitors.cs b/Runtime/Visitors/HumanoidVisitors.cs similarity index 94% rename from Runtime/Visitors/Editor/HumanoidVisitors.cs rename to Runtime/Visitors/HumanoidVisitors.cs index 171dc1e..56f1fef 100644 --- a/Runtime/Visitors/Editor/HumanoidVisitors.cs +++ b/Runtime/Visitors/HumanoidVisitors.cs @@ -14,7 +14,7 @@ namespace Passer.Humanoid { CheckVisitors(); } - private const string fileName = "Editor\\HumanoidVisitors.cs"; + private const string fileName = "HumanoidVisitors.cs"; private static void CheckVisitors() { string[] names = Directory.GetFiles(Application.dataPath, "HumanoidVisitors.cs", SearchOption.AllDirectories); @@ -27,12 +27,8 @@ namespace Passer.Humanoid { string[] sceneNames = Directory.GetFiles(dirName, "*.unity"); foreach (string sceneName in sceneNames) { - //Debug.Log(sceneName); string localSceneName = "Assets" + sceneName.Substring(dataPathLength); localSceneName = localSceneName.Replace('\\', '/'); - //if (!SceneExists(localSceneName)) { - // AddScene(localSceneName); - //} if (!visitors.Contains(localSceneName)) visitors.Add(localSceneName); } diff --git a/Runtime/Visitors/Editor/HumanoidVisitors.cs.meta b/Runtime/Visitors/HumanoidVisitors.cs.meta similarity index 100% rename from Runtime/Visitors/Editor/HumanoidVisitors.cs.meta rename to Runtime/Visitors/HumanoidVisitors.cs.meta diff --git a/Samples/Sites/Start.unity b/Samples/Sites/Start.unity index 37c5464..e246d47 100644 --- a/Samples/Sites/Start.unity +++ b/Samples/Sites/Start.unity @@ -282,41 +282,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 400, y: 50, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &48159530 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 48159531} - m_Layer: 0 - m_Name: Column Clip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &48159531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 48159530} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 809797647} - - {fileID: 739489389} - - {fileID: 461883035} - - {fileID: 546140792} - - {fileID: 697741900} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &200713427 GameObject: m_ObjectHideFlags: 0 @@ -565,416 +530,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 448194152} m_CullTransparentMesh: 0 ---- !u!1 &461883034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 461883035} - - component: {fileID: 461883038} - - component: {fileID: 461883037} - - component: {fileID: 461883036} - m_Layer: 0 - m_Name: Socket - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &461883035 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461883034} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 48159531} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &461883036 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461883034} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1fdf6bb225e95246b0a0a46135637fd, type: 3} - m_Name: - m_EditorClassIdentifier: - triggerHandlers: - id: 0 - label: Trigger Event - tooltip: 'Call functions using the trigger collider state - - Parameter: the - GameObject entering the trigger' - eventTypeLabels: - - Never - - On Trigger Enter - - On Trigger Exit - - On Trigger Stay - - On Trigger Empty - - On Trigger Change - - Always - fromEventLabel: - events: - - eventType: 1 - eventNetworking: 0 - functionCall: - targetGameObject: {fileID: 461883034} - methodName: Passer.Socket/Attach - parameters: - - fromEvent: 1 - localProperty: From Event - type: 5 - floatConstant: 0 - intConstant: 0 - boolConstant: 0 - stringConstant: - vector3Constant: {x: 0, y: 0, z: 0} - gameObjectConstant: {fileID: 0} - rigidbodyConstant: {fileID: 0} - boolInverse: 0 - overrideMode: 0 - leftInputEvents: - - id: 0 - label: Left Vertical - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 1 - label: Left Horizontal - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 2 - label: Left Stick Button - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 3 - label: Left Button 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 4 - label: Left Button 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 5 - label: Left Button 3 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 6 - label: Left Button 4 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 7 - label: Left Trigger 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 8 - label: Left Trigger 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 9 - label: Left Option - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - rightInputEvents: - - id: 0 - label: Right Vertical - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 1 - label: Right Horizontal - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 2 - label: Right Stick Button - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 3 - label: Right Button 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 4 - label: Right Button 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 5 - label: Right Button 3 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 6 - label: Right Button 4 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 7 - label: Right Trigger 1 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 8 - label: Right Trigger 2 - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: - - id: 9 - label: Right Option - tooltip: - eventTypeLabels: - - Never - - On Press - - On Release - - While Down - - While Up - - On Change - - Continuous - fromEventLabel: - events: [] - defaultParameterProperty: ---- !u!65 &461883037 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461883034} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.1, y: 0.1, z: 0.1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &461883038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461883034} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 420729d57aa3e734982a265b400401d5, type: 3} - m_Name: - m_EditorClassIdentifier: - attachedPrefab: {fileID: 0} - attachedTransform: {fileID: 0} - attachedHandle: {fileID: 0} - socketTag: Untagged - attachMethod: 0 - destroyOnLoad: 0 - attachEvent: - id: 0 - label: Hold Event - tooltip: 'Call functions using what the socket is holding - - Parameter: the - GameObject held by the socket' - eventTypeLabels: - - Never - - On Attach - - On Release - - While Attached - - While Released - - When Changed - - Always - fromEventLabel: - events: [] --- !u!1001 &527799174 PrefabInstance: m_ObjectHideFlags: 0 @@ -1022,52 +577,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 527799174} m_PrefabAsset: {fileID: 0} ---- !u!1001 &546140791 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 48159531} - m_Modifications: - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalPosition.y - value: 1.3 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4074872513570674, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d922a236d2eee524ea8a8eeba60ccf8d, type: 2} ---- !u!4 &546140792 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 546140791} - m_PrefabAsset: {fileID: 0} --- !u!1 &669597481 GameObject: m_ObjectHideFlags: 0 @@ -1185,82 +694,6 @@ MonoBehaviour: unityEvents: m_PersistentCalls: m_Calls: [] ---- !u!1 &697741899 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 697741900} - m_Layer: 0 - m_Name: Teleport Point - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &697741900 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 697741899} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.70000005} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 48159531} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &739489388 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 739489389} - - component: {fileID: 739489390} - m_Layer: 0 - m_Name: Site Navigator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &739489389 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 739489388} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 48159531} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &739489390 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 739489388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f3f9caadb394b5542bb33fe728ca2ad4, type: 3} - m_Name: - m_EditorClassIdentifier: - loadSiteAtStart: 0 - startSite: - startScene: --- !u!1 &760078894 GameObject: m_ObjectHideFlags: 0 @@ -1339,123 +772,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 760078894} m_CullTransparentMesh: 0 ---- !u!1 &809797646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 809797647} - - component: {fileID: 809797650} - - component: {fileID: 809797649} - - component: {fileID: 809797648} - - component: {fileID: 809797651} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &809797647 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809797646} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.6, z: 0} - m_LocalScale: {x: 0.3, y: 1.2, z: 0.3} - m_Children: [] - m_Father: {fileID: 48159531} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &809797648 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809797646} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 6cbba3a789d43564e8ab97b29489a06f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!65 &809797649 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809797646} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &809797650 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809797646} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &809797651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809797646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59fbdf36d3ccc604291afcbbb7b99016, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: [] - teleportRoot: 0 - checkCollision: 0 - movementType: 0 - targetPosRot: 1 - targetTransform: {fileID: 697741900} - pose: {fileID: 0} - enableAnimators: 1 - unityEvents: - m_PersistentCalls: - m_Calls: [] --- !u!1 &820568514 GameObject: m_ObjectHideFlags: 0 @@ -3084,7 +2400,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3} propertyPath: m_LocalPosition.x @@ -3179,7 +2495,7 @@ Transform: - {fileID: 527799175} - {fileID: 2075206561} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1928735075 GameObject: @@ -3327,7 +2643,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1993615571 MonoBehaviour: diff --git a/Runtime/Visitors/Editor.meta b/Samples/Visitors.meta similarity index 77% rename from Runtime/Visitors/Editor.meta rename to Samples/Visitors.meta index 251485e..27edab5 100644 --- a/Runtime/Visitors/Editor.meta +++ b/Samples/Visitors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da374295c8582ef489b961a4dbd01837 +guid: 03517ba7d9815ac47985f7ce3a768240 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/Visitors/Characters.meta b/Samples/Visitors/Characters.meta similarity index 100% rename from Runtime/Visitors/Characters.meta rename to Samples/Visitors/Characters.meta diff --git a/Runtime/Visitors/Characters/DefaultPasserAvatar.meta b/Samples/Visitors/Characters/DefaultPasserAvatar.meta similarity index 100% rename from Runtime/Visitors/Characters/DefaultPasserAvatar.meta rename to Samples/Visitors/Characters/DefaultPasserAvatar.meta diff --git a/Runtime/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab b/Samples/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab similarity index 100% rename from Runtime/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab rename to Samples/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab diff --git a/Runtime/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab.meta b/Samples/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab.meta similarity index 100% rename from Runtime/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab.meta rename to Samples/Visitors/Characters/DefaultPasserAvatar/DefaultPasserAvatar.prefab.meta diff --git a/Runtime/Visitors/Materials.meta b/Samples/Visitors/Materials.meta similarity index 100% rename from Runtime/Visitors/Materials.meta rename to Samples/Visitors/Materials.meta diff --git a/Runtime/Visitors/Materials/OrangeUnlit.mat b/Samples/Visitors/Materials/OrangeUnlit.mat similarity index 100% rename from Runtime/Visitors/Materials/OrangeUnlit.mat rename to Samples/Visitors/Materials/OrangeUnlit.mat diff --git a/Runtime/Visitors/Materials/OrangeUnlit.mat.meta b/Samples/Visitors/Materials/OrangeUnlit.mat.meta similarity index 100% rename from Runtime/Visitors/Materials/OrangeUnlit.mat.meta rename to Samples/Visitors/Materials/OrangeUnlit.mat.meta diff --git a/Runtime/Visitors/Materials/PasserLogo.mat b/Samples/Visitors/Materials/PasserLogo.mat similarity index 100% rename from Runtime/Visitors/Materials/PasserLogo.mat rename to Samples/Visitors/Materials/PasserLogo.mat diff --git a/Runtime/Visitors/Materials/PasserLogo.mat.meta b/Samples/Visitors/Materials/PasserLogo.mat.meta similarity index 100% rename from Runtime/Visitors/Materials/PasserLogo.mat.meta rename to Samples/Visitors/Materials/PasserLogo.mat.meta diff --git a/Runtime/Visitors/Prefabs.meta b/Samples/Visitors/Prefabs.meta similarity index 100% rename from Runtime/Visitors/Prefabs.meta rename to Samples/Visitors/Prefabs.meta diff --git a/Runtime/Visitors/Prefabs/ArmButton.prefab b/Samples/Visitors/Prefabs/ArmButton.prefab similarity index 100% rename from Runtime/Visitors/Prefabs/ArmButton.prefab rename to Samples/Visitors/Prefabs/ArmButton.prefab diff --git a/Runtime/Visitors/Prefabs/ArmButton.prefab.meta b/Samples/Visitors/Prefabs/ArmButton.prefab.meta similarity index 100% rename from Runtime/Visitors/Prefabs/ArmButton.prefab.meta rename to Samples/Visitors/Prefabs/ArmButton.prefab.meta diff --git a/Runtime/Visitors/Prefabs/HumanoidMenu.prefab b/Samples/Visitors/Prefabs/HumanoidMenu.prefab similarity index 100% rename from Runtime/Visitors/Prefabs/HumanoidMenu.prefab rename to Samples/Visitors/Prefabs/HumanoidMenu.prefab diff --git a/Runtime/Visitors/Prefabs/HumanoidMenu.prefab.meta b/Samples/Visitors/Prefabs/HumanoidMenu.prefab.meta similarity index 100% rename from Runtime/Visitors/Prefabs/HumanoidMenu.prefab.meta rename to Samples/Visitors/Prefabs/HumanoidMenu.prefab.meta diff --git a/Runtime/Visitors/Scripts/Resources.meta b/Samples/Visitors/Resources.meta similarity index 100% rename from Runtime/Visitors/Scripts/Resources.meta rename to Samples/Visitors/Resources.meta diff --git a/Runtime/Visitors/Scripts/Resources/InputField.prefab b/Samples/Visitors/Resources/InputField.prefab similarity index 100% rename from Runtime/Visitors/Scripts/Resources/InputField.prefab rename to Samples/Visitors/Resources/InputField.prefab diff --git a/Runtime/Visitors/Scripts/Resources/InputField.prefab.meta b/Samples/Visitors/Resources/InputField.prefab.meta similarity index 100% rename from Runtime/Visitors/Scripts/Resources/InputField.prefab.meta rename to Samples/Visitors/Resources/InputField.prefab.meta diff --git a/Runtime/Visitors/Scripts/Resources/MenuButton.prefab b/Samples/Visitors/Resources/MenuButton.prefab similarity index 100% rename from Runtime/Visitors/Scripts/Resources/MenuButton.prefab rename to Samples/Visitors/Resources/MenuButton.prefab diff --git a/Runtime/Visitors/Scripts/Resources/MenuButton.prefab.meta b/Samples/Visitors/Resources/MenuButton.prefab.meta similarity index 100% rename from Runtime/Visitors/Scripts/Resources/MenuButton.prefab.meta rename to Samples/Visitors/Resources/MenuButton.prefab.meta diff --git a/Runtime/Visitors/Sprites.meta b/Samples/Visitors/Sprites.meta similarity index 100% rename from Runtime/Visitors/Sprites.meta rename to Samples/Visitors/Sprites.meta diff --git a/Runtime/Visitors/Sprites/PasserLogo.png b/Samples/Visitors/Sprites/PasserLogo.png similarity index 100% rename from Runtime/Visitors/Sprites/PasserLogo.png rename to Samples/Visitors/Sprites/PasserLogo.png diff --git a/Runtime/Visitors/Sprites/PasserLogo.png.meta b/Samples/Visitors/Sprites/PasserLogo.png.meta similarity index 100% rename from Runtime/Visitors/Sprites/PasserLogo.png.meta rename to Samples/Visitors/Sprites/PasserLogo.png.meta