Moved Visitors to Samples

This commit is contained in:
Pascal Serrarens 2022-01-13 15:05:10 +01:00
parent eb6f660c6b
commit d742c13fb4
46 changed files with 375 additions and 1140 deletions

View File

@ -117,8 +117,8 @@ namespace Passer.Humanoid {
} }
[CustomEditor(typeof(Configuration))] [CustomEditor(typeof(Configuration))]
public class Configuration_Editor : Editor /*: Pawn.Configuration_Editor */{ public class Configuration_Editor : Editor {
private Configuration configuration; private static Configuration configuration;
private static string humanoidPath; private static string humanoidPath;
@ -136,71 +136,74 @@ namespace Passer.Humanoid {
private const string facePath = "FaceControl/EyeTarget.cs"; private const string facePath = "FaceControl/EyeTarget.cs";
public static Configuration CreateDefaultConfiguration() { //public static Configuration CreateDefaultConfiguration() {
Configuration configuration; // Configuration configuration;
Debug.Log("Created new Default Configuration"); // Debug.Log("Created new Default Configuration");
// Create new Default Configuration // // Create new Default Configuration
configuration = CreateInstance<Configuration>(); // configuration = CreateInstance<Configuration>();
configuration.oculusSupport = true; // configuration.oculusSupport = true;
configuration.openVRSupport = true; // configuration.openVRSupport = true;
configuration.windowsMRSupport = true; // configuration.windowsMRSupport = true;
string path = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / // string path = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last /
path = path.Substring(0, path.LastIndexOf('/') + 1); // strip Scripts; // path = path.Substring(0, path.LastIndexOf('/') + 1); // strip Scripts;
path = "Assets" + path + "DefaultConfiguration.asset"; // path = "Assets" + path + "DefaultConfiguration.asset";
AssetDatabase.CreateAsset(configuration, path); // AssetDatabase.CreateAsset(configuration, path);
AssetDatabase.SaveAssets(); // AssetDatabase.SaveAssets();
return configuration; // return configuration;
} //}
public static Configuration GetConfiguration() { public static Configuration GetConfiguration() {
string humanoidPath = FindHumanoidFolder(); //string humanoidPath = FindHumanoidFolder();
humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last / //humanoidPath = humanoidPath.Substring(0, humanoidPath.Length - 1); // strip last /
humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts; //humanoidPath = humanoidPath.Substring(0, humanoidPath.LastIndexOf('/') + 1); // strip Scripts;
string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); //configuration.networkingSupport = (NetworkingSystems)EditorPrefs.GetInt("HumanoidNetworkingSupport", 0);
var settings = AssetDatabase.LoadAssetAtPath<HumanoidPreferences>("Assets" + humanoidPath + "HumanoidPreferences.asset"); //configuration.humanoidSceneName = EditorPrefs.GetString("HumanoidSceneName", "");
if (settings == null) { //string configurationString = EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration");
settings = CreateInstance<HumanoidPreferences>(); //var settings = AssetDatabase.LoadAssetAtPath<HumanoidPreferences>("Assets" + humanoidPath + "HumanoidPreferences.asset");
//if (settings == null) {
// settings = CreateInstance<HumanoidPreferences>();
// Creating assets in a package is not possible because the package is read-only // // Creating assets in a package is not possible because the package is read-only
// Configuration file feature is to be removed. // // Configuration file feature is to be removed.
//AssetDatabase.CreateAsset(settings, HumanoidPreferences.settingsPath); // //AssetDatabase.CreateAsset(settings, HumanoidPreferences.settingsPath);
AssetDatabase.SaveAssets(); // AssetDatabase.SaveAssets();
} //}
SerializedObject serializedSettings = new SerializedObject(settings); //SerializedObject serializedSettings = new SerializedObject(settings);
SerializedProperty configurationProp = serializedSettings.FindProperty("configuration"); //SerializedProperty configurationProp = serializedSettings.FindProperty("configuration");
if (settings.configuration == null) { //if (settings.configuration == null) {
Configuration configuration = LoadConfiguration(configurationString); // Configuration configuration = LoadConfiguration(configurationString);
if (configuration == null) { // if (configuration == null) {
configurationString = "DefaultConfiguration"; // configurationString = "DefaultConfiguration";
configuration = LoadConfiguration(configurationString); // configuration = LoadConfiguration(configurationString);
if (configuration == null) { // if (configuration == null) {
Debug.Log("Created new Default Configuration"); // Debug.Log("Created new Default Configuration");
// Create new Default Configuration // // Create new Default Configuration
configuration = CreateInstance<Configuration>(); // configuration = CreateInstance<Configuration>();
configuration.oculusSupport = true; // configuration.oculusSupport = true;
configuration.openVRSupport = true; // configuration.openVRSupport = true;
configuration.windowsMRSupport = true; // configuration.windowsMRSupport = true;
string path = "Assets" + humanoidPath + configurationString + ".asset"; // string path = "Assets" + humanoidPath + configurationString + ".asset";
Debug.Log(configuration + " " + path); // Debug.Log(configuration + " " + path);
AssetDatabase.CreateAsset(configuration, path); // AssetDatabase.CreateAsset(configuration, path);
AssetDatabase.SaveAssets(); // AssetDatabase.SaveAssets();
} // }
EditorPrefs.SetString("HumanoidConfigurationKey", configurationString); // EditorPrefs.SetString("HumanoidConfigurationKey", configurationString);
} // }
configurationProp.objectReferenceValue = configuration; // configurationProp.objectReferenceValue = configuration;
} //}
serializedSettings.ApplyModifiedProperties(); //serializedSettings.ApplyModifiedProperties();
return (Configuration)configurationProp.objectReferenceValue; //return (Configuration)configurationProp.objectReferenceValue;
return configuration;
} }
#region Enable #region Enable
public void OnEnable() { public void OnEnable() {
configuration = (Configuration)target; //configuration = (Configuration)target;
humanoidPath = FindHumanoidFolder(); humanoidPath = FindHumanoidFolder();
} }
@ -231,10 +234,10 @@ namespace Passer.Humanoid {
public override void OnInspectorGUI() { public override void OnInspectorGUI() {
serializedObject.Update(); serializedObject.Update();
bool anyChanged = ConfigurationGUI(serializedObject); //bool anyChanged = ConfigurationGUI(serializedObject);
if (GUI.changed || anyChanged) { //if (GUI.changed || anyChanged) {
EditorUtility.SetDirty(configuration); // EditorUtility.SetDirty(configuration);
} //}
serializedObject.ApplyModifiedProperties(); serializedObject.ApplyModifiedProperties();
} }
@ -244,28 +247,28 @@ namespace Passer.Humanoid {
//anyChanged |= OpenVRSettingUI(serializedConfiguration); //anyChanged |= OpenVRSettingUI(serializedConfiguration);
anyChanged |= SteamVRSettingUI(serializedConfiguration); //anyChanged |= SteamVRSettingUI(serializedConfiguration);
anyChanged |= OculusSettingUI(serializedConfiguration); //anyChanged |= OculusSettingUI(serializedConfiguration);
anyChanged |= WindowsMRSettingUI(serializedConfiguration); //anyChanged |= WindowsMRSettingUI(serializedConfiguration);
anyChanged |= VrtkSettingUI(serializedConfiguration); //anyChanged |= VrtkSettingUI(serializedConfiguration);
anyChanged |= LeapSettingUI(serializedConfiguration); //anyChanged |= LeapSettingUI(serializedConfiguration);
anyChanged |= Kinect1SettingUI(serializedConfiguration); //anyChanged |= Kinect1SettingUI(serializedConfiguration);
anyChanged |= Kinect2SettingUI(serializedConfiguration); //anyChanged |= Kinect2SettingUI(serializedConfiguration);
anyChanged |= Kinect4SettingUI(serializedConfiguration); //anyChanged |= Kinect4SettingUI(serializedConfiguration);
anyChanged |= AstraSettingUI(serializedConfiguration); //anyChanged |= AstraSettingUI(serializedConfiguration);
anyChanged |= RealsenseSettingUI(serializedConfiguration); //anyChanged |= RealsenseSettingUI(serializedConfiguration);
anyChanged |= HydraSettingUI(serializedConfiguration); //anyChanged |= HydraSettingUI(serializedConfiguration);
anyChanged |= TobiiSettingUI(serializedConfiguration); //anyChanged |= TobiiSettingUI(serializedConfiguration);
anyChanged |= ArkitSettingUI(serializedConfiguration); //anyChanged |= ArkitSettingUI(serializedConfiguration);
anyChanged |= PupilSettingUI(serializedConfiguration); //anyChanged |= PupilSettingUI(serializedConfiguration);
anyChanged |= NeuronSettingUI(serializedConfiguration); //anyChanged |= NeuronSettingUI(serializedConfiguration);
anyChanged |= Hi5SettingUI(serializedConfiguration); //anyChanged |= Hi5SettingUI(serializedConfiguration);
anyChanged |= OptitrackSettingUI(serializedConfiguration); //anyChanged |= OptitrackSettingUI(serializedConfiguration);
anyChanged |= AntilatencySettingUI(serializedConfiguration); //anyChanged |= AntilatencySettingUI(serializedConfiguration);
anyChanged |= NetworkingSettingUI(serializedConfiguration); //anyChanged |= NetworkingSettingUI(serializedConfiguration);
anyChanged |= HumanoidSceneInspector(serializedConfiguration); anyChanged |= HumanoidSceneInspector(serializedConfiguration);
@ -792,6 +795,8 @@ namespace Passer.Humanoid {
CheckExtensionUnityXR(); CheckExtensionUnityXR();
// configuration should become replace by HumanoidPreferences
configuration = new Configuration();
configuration.openVRSupport = CheckExtensionOpenVR(configuration); configuration.openVRSupport = CheckExtensionOpenVR(configuration);
configuration.steamVrSupport = CheckExtensionSteamVR(configuration); configuration.steamVrSupport = CheckExtensionSteamVR(configuration);
configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration); configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration);
@ -829,7 +834,7 @@ namespace Passer.Humanoid {
} }
public static bool CheckExtensionOpenVR(Configuration configuration) { public static bool CheckExtensionOpenVR(Configuration configuration) {
bool enabled = configuration.openVRSupport; bool enabled = true; // configuration.openVRSupport;
CheckExtension(isViveHandTrackingAvailable, "hVIVEHAND"); CheckExtension(isViveHandTrackingAvailable, "hVIVEHAND");
return CheckExtension(enabled, openVRPath, "hOPENVR"); return CheckExtension(enabled, openVRPath, "hOPENVR");
} }
@ -1079,15 +1084,15 @@ namespace Passer.Humanoid {
} }
} }
public static Configuration LoadConfiguration(string configurationName) { //public static Configuration LoadConfiguration(string configurationName) {
string[] foundAssets = AssetDatabase.FindAssets(configurationName + " t:Configuration"); // string[] foundAssets = AssetDatabase.FindAssets(configurationName + " t:Configuration");
if (foundAssets.Length == 0) // if (foundAssets.Length == 0)
return null; // return null;
string path = AssetDatabase.GUIDToAssetPath(foundAssets[0]); // string path = AssetDatabase.GUIDToAssetPath(foundAssets[0]);
Configuration configuration = AssetDatabase.LoadAssetAtPath<Configuration>(path); // Configuration configuration = AssetDatabase.LoadAssetAtPath<Configuration>(path);
return configuration; // return configuration;
} //}
public static void GlobalDefine(string name) { public static void GlobalDefine(string name) {
//Debug.Log("Define " + name); //Debug.Log("Define " + name);

View File

@ -1,158 +0,0 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace Passer.Humanoid {
/// <summary>
/// Sets preferences for \ref Humanoid "Humanoid Control"
/// </summary>
///
/// 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<HumanoidPreferences>(settingsPath);
SerializedObject serializedSettings = new SerializedObject(settings);
if (settings == null) {
settings = CreateInstance<HumanoidPreferences>();
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<Configuration>();
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<HumanoidPreferences>(settingsPath);
if (settings == null) {
Debug.Log("Created new Settings");
settings = CreateInstance<HumanoidPreferences>();
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<Configuration>();
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<string>(
new[] { "Humanoid", "Oculus", "SteamVR" }
)
};
return provider;
}
}
}

View File

@ -11,7 +11,7 @@ namespace Passer.Humanoid {
[InitializeOnLoad] [InitializeOnLoad]
public class OnLoadHumanoidPlayer { public class OnLoadHumanoidPlayer {
static OnLoadHumanoidPlayer() { static OnLoadHumanoidPlayer() {
HumanoidPreferencesIMGUIRegister.reload = true; //HumanoidPreferencesIMGUIRegister.reload = true;
} }
public static string GetHumanoidPlayerPrefabPath() { public static string GetHumanoidPlayerPrefabPath() {

View File

@ -1,4 +1,5 @@
#if UNITY_EDITOR /*
#if UNITY_EDITOR
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEditor; using UnityEditor;
@ -32,4 +33,5 @@ namespace Passer {
} }
} }
#endif #endif
*/

View File

@ -26,50 +26,51 @@ namespace Passer {
[InitializeOnLoad] [InitializeOnLoad]
public class SiteBuilder { public class SiteBuilder {
static SiteBuilder() { public static Sites siteBuilds = null;
if (siteBuilds == null) {
siteBuilds = AssetDatabase.LoadAssetAtPath<Sites>("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;
private class SiteBuilderWindow : EditorWindow { private class SiteBuilderWindow : EditorWindow {
[MenuItem("File/Build Sites", false, 100)] // somehow priority does not work in File Menu? [MenuItem("File/Build Sites", false, 100)] // somehow priority does not work in File Menu?
public static void OpenWindow() { public static void OpenWindow() {
GenerateSiteBuilds();
SiteBuilderWindow window = (SiteBuilderWindow)EditorWindow.GetWindow(typeof(SiteBuilderWindow), true, "Build Sites"); SiteBuilderWindow window = (SiteBuilderWindow)EditorWindow.GetWindow(typeof(SiteBuilderWindow), true, "Build Sites");
window.ShowUtility(); window.ShowUtility();
} }
private static void GenerateSiteBuilds() {
string[] assetbundles = AssetDatabase.GetAllAssetBundleNames();
if (assetbundles.Length > 0) {
if (siteBuilds == null) {
siteBuilds = AssetDatabase.LoadAssetAtPath<Sites>("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 Vector2 scrollPos;
private void OnGUI() { private void OnGUI() {
//GUI.contentColor = Color.red;
EditorGUILayout.LabelField("Sites in Build", EditorStyles.boldLabel); EditorGUILayout.LabelField("Sites in Build", EditorStyles.boldLabel);
scrollPos = scrollPos =
@ -228,7 +229,7 @@ namespace Passer {
if (!Directory.Exists(assetBundleDirectory)) if (!Directory.Exists(assetBundleDirectory))
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
AssetBundleBuild[] buildMap = GetBuildmap(); AssetBundleBuild[] buildMap = GetBuildmap();
BuildPipeline.BuildAssetBundles(assetBundleDirectory, buildMap, BuildAssetBundleOptions.None, BuildTarget.WebGL); BuildPipeline.BuildAssetBundles(assetBundleDirectory, buildMap, BuildAssetBundleOptions.None, BuildTarget.WebGL);
string[] filePaths = Directory.GetFiles(assetBundleDirectory); string[] filePaths = Directory.GetFiles(assetBundleDirectory);

View File

@ -12,12 +12,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f15f0b7c56552b443a87b2cf84b2083c, type: 3} m_Script: {fileID: 11500000, guid: f15f0b7c56552b443a87b2cf84b2083c, type: 3}
m_Name: DefaultConfiguration m_Name: DefaultConfiguration
m_EditorClassIdentifier: m_EditorClassIdentifier:
openVRSupport: 0 openVRSupport: 1
steamVrSupport: 0 steamVrSupport: 0
viveTrackerSupport: 0 viveTrackerSupport: 0
oculusSupport: 0 oculusSupport: 1
windowsMRSupport: 0 windowsMRSupport: 1
vrtkSupport: 0 vrtkSupport: 1
neuronSupport: 0 neuronSupport: 0
hi5Support: 0 hi5Support: 0
realsenseSupport: 0 realsenseSupport: 0
@ -32,6 +32,6 @@ MonoBehaviour:
optitrackSupport: 0 optitrackSupport: 0
pupilSupport: 0 pupilSupport: 0
antilatencySupport: 0 antilatencySupport: 0
networkingSupport: 1 networkingSupport: 0
networkingVoiceSupport: 0 networkingVoiceSupport: 0
humanoidSceneName: Assets/Passer/Visitors/HumanoidVisitor Desktop.unity humanoidSceneName:

View File

@ -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

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: edd90499d1806be48b5dea435a646f7f
timeCreated: 1535520381
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -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}

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 097ce2940be8c824f91c48a19afd5e7e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,211 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace Passer.Humanoid {
/// <summary>
/// Sets preferences for \ref Humanoid "Humanoid Control"
/// </summary>
///
/// 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<HumanoidPreferences>(settingsPath);
// SerializedObject serializedSettings = new SerializedObject(settings);
// if (settings == null) {
// settings = CreateInstance<HumanoidPreferences>();
// 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<Configuration>();
// 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<HumanoidPreferences>(settingsPath);
// if (settings == null) {
// Debug.Log("Created new Settings");
// settings = CreateInstance<HumanoidPreferences>();
// 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<Configuration>();
// 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<string>(
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;
}
}
}

View File

@ -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}

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 76ff944d08708bb45b485b302c72264a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,9 +2,9 @@
namespace Passer.Humanoid { namespace Passer.Humanoid {
[CreateAssetMenu(menuName = "Humanoid/Configuration", fileName = "HumanoidConfiguration", order = 100)] //[CreateAssetMenu(menuName = "Humanoid/Configuration", fileName = "HumanoidConfiguration", order = 100)]
[System.Serializable] //[System.Serializable]
public class Configuration : ScriptableObject { public class Configuration /*: ScriptableObject*/ {
public bool openVRSupport = false; public bool openVRSupport = false;
public bool steamVrSupport = false; public bool steamVrSupport = false;
public bool viveTrackerSupport = false; public bool viveTrackerSupport = false;
@ -31,18 +31,18 @@ namespace Passer.Humanoid {
public string humanoidSceneName; public string humanoidSceneName;
public static Configuration Load(string configurationName) { // public static Configuration Load(string configurationName) {
#if UNITY_EDITOR //#if UNITY_EDITOR
string[] foundAssets = UnityEditor.AssetDatabase.FindAssets(configurationName + " t:Configuration"); // string[] foundAssets = UnityEditor.AssetDatabase.FindAssets(configurationName + " t:Configuration");
if (foundAssets.Length == 0) // if (foundAssets.Length == 0)
return null; // return null;
string path = UnityEditor.AssetDatabase.GUIDToAssetPath(foundAssets[0]); // string path = UnityEditor.AssetDatabase.GUIDToAssetPath(foundAssets[0]);
Configuration configuration = UnityEditor.AssetDatabase.LoadAssetAtPath<Configuration>(path); // Configuration configuration = UnityEditor.AssetDatabase.LoadAssetAtPath<Configuration>(path);
return configuration; // return configuration;
#else //#else
return null; // return null;
#endif //#endif
} // }
} }
} }

View File

@ -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

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e3da9e54a6754384f8fbcf4b1c668924
timeCreated: 1535553673
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -44,11 +44,13 @@ namespace Passer {
HumanoidControl humanoid = FindObjectOfType<HumanoidControl>(); HumanoidControl humanoid = FindObjectOfType<HumanoidControl>();
if (humanoid == null) { if (humanoid == null) {
string configurationString = UnityEditor.EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration"); string visitorSceneName = Passer.Humanoid.HumanoidPreferences.visitorSceneName;
Humanoid.Configuration configuration = Humanoid.Configuration.Load(configurationString); //string configurationString = UnityEditor.EditorPrefs.GetString("HumanoidConfigurationKey", "DefaultConfiguration");
if (configuration != null) { //Humanoid.Configuration configuration = Humanoid.Configuration.Load(configurationString);
Debug.Log(configuration.humanoidSceneName); //if (configuration != null) {
UnityEngine.SceneManagement.SceneManager.LoadScene(configuration.humanoidSceneName, LoadSceneMode.Additive); if (!string.IsNullOrEmpty(visitorSceneName)) {
Debug.Log(visitorSceneName);
UnityEngine.SceneManagement.SceneManager.LoadScene(visitorSceneName, LoadSceneMode.Additive);
} }
else else
Debug.LogWarning("Could not load configuration: Visitor is not spawned"); Debug.LogWarning("Could not load configuration: Visitor is not spawned");

View File

@ -1,3 +0,0 @@
{
"reference": "GUID:8d71350a0583ead4aaa1142233af2cd7"
}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b0fcea095e5f43944b2b0e7af7bfd9a3
AssemblyDefinitionReferenceImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -14,7 +14,7 @@ namespace Passer.Humanoid {
CheckVisitors(); CheckVisitors();
} }
private const string fileName = "Editor\\HumanoidVisitors.cs"; private const string fileName = "HumanoidVisitors.cs";
private static void CheckVisitors() { private static void CheckVisitors() {
string[] names = Directory.GetFiles(Application.dataPath, "HumanoidVisitors.cs", SearchOption.AllDirectories); string[] names = Directory.GetFiles(Application.dataPath, "HumanoidVisitors.cs", SearchOption.AllDirectories);
@ -27,12 +27,8 @@ namespace Passer.Humanoid {
string[] sceneNames = Directory.GetFiles(dirName, "*.unity"); string[] sceneNames = Directory.GetFiles(dirName, "*.unity");
foreach (string sceneName in sceneNames) { foreach (string sceneName in sceneNames) {
//Debug.Log(sceneName);
string localSceneName = "Assets" + sceneName.Substring(dataPathLength); string localSceneName = "Assets" + sceneName.Substring(dataPathLength);
localSceneName = localSceneName.Replace('\\', '/'); localSceneName = localSceneName.Replace('\\', '/');
//if (!SceneExists(localSceneName)) {
// AddScene(localSceneName);
//}
if (!visitors.Contains(localSceneName)) if (!visitors.Contains(localSceneName))
visitors.Add(localSceneName); visitors.Add(localSceneName);
} }

View File

@ -282,41 +282,6 @@ BoxCollider:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 400, y: 50, z: 1} m_Size: {x: 400, y: 50, z: 1}
m_Center: {x: 0, y: 0, z: 0} 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 --- !u!1 &200713427
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -565,416 +530,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 448194152} m_GameObject: {fileID: 448194152}
m_CullTransparentMesh: 0 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 --- !u!1001 &527799174
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1022,52 +577,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 527799174} m_PrefabInstance: {fileID: 527799174}
m_PrefabAsset: {fileID: 0} 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 --- !u!1 &669597481
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1185,82 +694,6 @@ MonoBehaviour:
unityEvents: unityEvents:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] 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 --- !u!1 &760078894
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1339,123 +772,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 760078894} m_GameObject: {fileID: 760078894}
m_CullTransparentMesh: 0 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 --- !u!1 &820568514
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3084,7 +2400,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3} - target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3} - target: {fileID: 4771669736763168, guid: 1b4c481b3e4fa594980a1129304a25cd, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -3179,7 +2495,7 @@ Transform:
- {fileID: 527799175} - {fileID: 527799175}
- {fileID: 2075206561} - {fileID: 2075206561}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1928735075 --- !u!1 &1928735075
GameObject: GameObject:
@ -3327,7 +2643,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1993615571 --- !u!114 &1993615571
MonoBehaviour: MonoBehaviour:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: da374295c8582ef489b961a4dbd01837 guid: 03517ba7d9815ac47985f7ce3a768240
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB