Further cleanup of old VRTK stuff
This commit is contained in:
parent
13a43aa1e5
commit
47223965a2
@ -250,7 +250,6 @@ namespace Passer.Humanoid {
|
||||
//anyChanged |= SteamVRSettingUI(serializedConfiguration);
|
||||
//anyChanged |= OculusSettingUI(serializedConfiguration);
|
||||
//anyChanged |= WindowsMRSettingUI(serializedConfiguration);
|
||||
//anyChanged |= VrtkSettingUI(serializedConfiguration);
|
||||
|
||||
//anyChanged |= LeapSettingUI(serializedConfiguration);
|
||||
//anyChanged |= Kinect1SettingUI(serializedConfiguration);
|
||||
@ -430,24 +429,6 @@ namespace Passer.Humanoid {
|
||||
return anyChanged;
|
||||
}
|
||||
|
||||
public static bool VrtkSettingUI(SerializedObject serializedConfiguration) {
|
||||
|
||||
SerializedProperty vrtkSupportProp = serializedConfiguration.FindProperty("vrtkSupport");
|
||||
|
||||
if (!isVrtkSupportAvailable)
|
||||
vrtkSupportProp.boolValue = false;
|
||||
|
||||
else if (!isVrtkAvailable) {
|
||||
using (new EditorGUI.DisabledScope(true)) {
|
||||
EditorGUILayout.Toggle("VRTK Supoort", false);
|
||||
}
|
||||
EditorGUILayout.HelpBox("VRTK is not available. Please download it from the Asset Store.", MessageType.Warning, true);
|
||||
}
|
||||
else
|
||||
vrtkSupportProp.boolValue = EditorGUILayout.Toggle("VRTK Support", vrtkSupportProp.boolValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool LeapSettingUI(SerializedObject serializedConfiguration) {
|
||||
SerializedProperty leapSupportProp = serializedConfiguration.FindProperty("leapSupport");
|
||||
|
||||
@ -800,7 +781,6 @@ namespace Passer.Humanoid {
|
||||
configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration);
|
||||
configuration.oculusSupport = CheckExtensionOculus(configuration);
|
||||
configuration.windowsMRSupport = CheckExtensionWindowsMR(configuration);
|
||||
configuration.vrtkSupport = CheckExtensionVRTK(configuration);
|
||||
configuration.neuronSupport = CheckExtensionNeuron(configuration);
|
||||
configuration.hi5Support = CheckExtensionHi5(configuration);
|
||||
configuration.realsenseSupport = CheckExtensionRealsense(configuration);
|
||||
@ -869,12 +849,6 @@ namespace Passer.Humanoid {
|
||||
return CheckExtension(enabled, windowsMRPath, "hWINDOWSMR");
|
||||
}
|
||||
|
||||
public static bool CheckExtensionVRTK(Configuration configuration) {
|
||||
bool enabled = configuration.vrtkSupport && isVrtkAvailable;
|
||||
CheckExtension(enabled, "hVRTK");
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public static bool CheckExtensionNeuron(Configuration configuration) {
|
||||
bool enabled = configuration.neuronSupport;
|
||||
return CheckExtension(enabled, neuronPath, "hNEURON");
|
||||
@ -1167,12 +1141,6 @@ namespace Passer.Humanoid {
|
||||
}
|
||||
}
|
||||
|
||||
private static bool isVrtkAvailable {
|
||||
get {
|
||||
return DoesTypeExist("VRTK.VRTK_SDKManager");
|
||||
}
|
||||
}
|
||||
|
||||
private static bool isLeapAvailable {
|
||||
get {
|
||||
return DoesTypeExist("Leap.Hand");
|
||||
@ -1330,11 +1298,6 @@ namespace Passer.Humanoid {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
private static bool isVrtkSupportAvailable {
|
||||
get {
|
||||
return DoesTypeExist("Passer.Humanoid.VrtkTracker");
|
||||
}
|
||||
}
|
||||
|
||||
private static bool isLeapSupportAvailable {
|
||||
get {
|
||||
|
@ -305,9 +305,6 @@ namespace Passer {
|
||||
#if hWAVEVR
|
||||
new WaveVR_Editor.TrackerProps(serializedObject, targetObjs, humanoid.waveVR),
|
||||
#endif
|
||||
#if hVRTK
|
||||
new Vrtk_Editor.TrackerProps(serializedObject, targetObjs, humanoid.vrtk),
|
||||
#endif
|
||||
#if hHYDRA && (UNITY_STANDALONE_WIN || UNITY_WSA_10_0)
|
||||
new Hydra_Editor.TrackerProps(serializedObject, targetObjs, humanoid.hydra),
|
||||
#endif
|
||||
|
@ -56,9 +56,6 @@ namespace Passer.Humanoid {
|
||||
#if hWAVEVR
|
||||
new WaveVR_Editor.HandTargetProps(serializedObject, handTarget),
|
||||
#endif
|
||||
#if hVRTK
|
||||
new Vrtk_Editor.HandTargetProps(serializedObject, handTarget),
|
||||
#endif
|
||||
#if hLEAP
|
||||
new LeapMotion_Editor.HandTargetProps(serializedObject, handTarget),
|
||||
#endif
|
||||
|
@ -43,9 +43,6 @@ namespace Passer.Humanoid {
|
||||
#if hWAVEVR
|
||||
new WaveVR_Editor.HeadTargetProps(serializedObject, headTarget),
|
||||
#endif
|
||||
#if hVRTK
|
||||
new Vrtk_Editor.HeadTargetProps(serializedObject, headTarget),
|
||||
#endif
|
||||
#if hREALSENSE
|
||||
new Realsense_Editor.HeadTargetProps(serializedObject, headTarget),
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user