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

Further cleanup of old VRTK stuff

Browse Source
This commit is contained in:
Pascal Serrarens 2022-06-30 15:22:12 +02:00
parent 13a43aa1e5
commit 47223965a2
4 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Editor/HumanoidControl/Configuration_Editor.cs
View File

@ -250,7 +250,6 @@ namespace Passer.Humanoid {
//anyChanged |= SteamVRSettingUI(serializedConfiguration); //anyChanged |= SteamVRSettingUI(serializedConfiguration);
//anyChanged |= OculusSettingUI(serializedConfiguration); //anyChanged |= OculusSettingUI(serializedConfiguration);
//anyChanged |= WindowsMRSettingUI(serializedConfiguration); //anyChanged |= WindowsMRSettingUI(serializedConfiguration);
//anyChanged |= VrtkSettingUI(serializedConfiguration);
//anyChanged |= LeapSettingUI(serializedConfiguration); //anyChanged |= LeapSettingUI(serializedConfiguration);
//anyChanged |= Kinect1SettingUI(serializedConfiguration); //anyChanged |= Kinect1SettingUI(serializedConfiguration);
@ -430,24 +429,6 @@ namespace Passer.Humanoid {
return anyChanged; 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) { public static bool LeapSettingUI(SerializedObject serializedConfiguration) {
SerializedProperty leapSupportProp = serializedConfiguration.FindProperty("leapSupport"); SerializedProperty leapSupportProp = serializedConfiguration.FindProperty("leapSupport");
@ -800,7 +781,6 @@ namespace Passer.Humanoid {
configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration); configuration.viveTrackerSupport = CheckExtensionViveTracker(configuration);
configuration.oculusSupport = CheckExtensionOculus(configuration); configuration.oculusSupport = CheckExtensionOculus(configuration);
configuration.windowsMRSupport = CheckExtensionWindowsMR(configuration); configuration.windowsMRSupport = CheckExtensionWindowsMR(configuration);
configuration.vrtkSupport = CheckExtensionVRTK(configuration);
configuration.neuronSupport = CheckExtensionNeuron(configuration); configuration.neuronSupport = CheckExtensionNeuron(configuration);
configuration.hi5Support = CheckExtensionHi5(configuration); configuration.hi5Support = CheckExtensionHi5(configuration);
configuration.realsenseSupport = CheckExtensionRealsense(configuration); configuration.realsenseSupport = CheckExtensionRealsense(configuration);
@ -869,12 +849,6 @@ namespace Passer.Humanoid {
return CheckExtension(enabled, windowsMRPath, "hWINDOWSMR"); 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) { public static bool CheckExtensionNeuron(Configuration configuration) {
bool enabled = configuration.neuronSupport; bool enabled = configuration.neuronSupport;
return CheckExtension(enabled, neuronPath, "hNEURON"); 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 { private static bool isLeapAvailable {
get { get {
return DoesTypeExist("Leap.Hand"); return DoesTypeExist("Leap.Hand");
@ -1330,11 +1298,6 @@ namespace Passer.Humanoid {
} }
} }
#endif #endif
private static bool isVrtkSupportAvailable {
get {
return DoesTypeExist("Passer.Humanoid.VrtkTracker");
}
}
private static bool isLeapSupportAvailable { private static bool isLeapSupportAvailable {
get { get {

3
Editor/HumanoidControl/HumanoidControl_Editor.cs
View File

@ -305,9 +305,6 @@ namespace Passer {
#if hWAVEVR #if hWAVEVR
new WaveVR_Editor.TrackerProps(serializedObject, targetObjs, humanoid.waveVR), new WaveVR_Editor.TrackerProps(serializedObject, targetObjs, humanoid.waveVR),
#endif #endif
#if hVRTK
new Vrtk_Editor.TrackerProps(serializedObject, targetObjs, humanoid.vrtk),
#endif
#if hHYDRA && (UNITY_STANDALONE_WIN || UNITY_WSA_10_0) #if hHYDRA && (UNITY_STANDALONE_WIN || UNITY_WSA_10_0)
new Hydra_Editor.TrackerProps(serializedObject, targetObjs, humanoid.hydra), new Hydra_Editor.TrackerProps(serializedObject, targetObjs, humanoid.hydra),
#endif #endif

3
Editor/HumanoidControl/Targets/HandTarget_Editor.cs
View File

@ -56,9 +56,6 @@ namespace Passer.Humanoid {
#if hWAVEVR #if hWAVEVR
new WaveVR_Editor.HandTargetProps(serializedObject, handTarget), new WaveVR_Editor.HandTargetProps(serializedObject, handTarget),
#endif #endif
#if hVRTK
new Vrtk_Editor.HandTargetProps(serializedObject, handTarget),
#endif
#if hLEAP #if hLEAP
new LeapMotion_Editor.HandTargetProps(serializedObject, handTarget), new LeapMotion_Editor.HandTargetProps(serializedObject, handTarget),
#endif #endif

3
Editor/HumanoidControl/Targets/HeadTarget_Editor.cs
View File

@ -43,9 +43,6 @@ namespace Passer.Humanoid {
#if hWAVEVR #if hWAVEVR
new WaveVR_Editor.HeadTargetProps(serializedObject, headTarget), new WaveVR_Editor.HeadTargetProps(serializedObject, headTarget),
#endif #endif
#if hVRTK
new Vrtk_Editor.HeadTargetProps(serializedObject, headTarget),
#endif
#if hREALSENSE #if hREALSENSE
new Realsense_Editor.HeadTargetProps(serializedObject, headTarget), new Realsense_Editor.HeadTargetProps(serializedObject, headTarget),
#endif #endif