Further removal of old VRTK stuff
This commit is contained in:
parent
cb6f90da98
commit
13a43aa1e5
@ -10,7 +10,6 @@ namespace Passer.Humanoid {
|
|||||||
public bool viveTrackerSupport = false;
|
public bool viveTrackerSupport = false;
|
||||||
public bool oculusSupport = true;
|
public bool oculusSupport = true;
|
||||||
public bool windowsMRSupport = true;
|
public bool windowsMRSupport = true;
|
||||||
public bool vrtkSupport = true;
|
|
||||||
public bool neuronSupport;
|
public bool neuronSupport;
|
||||||
public bool hi5Support;
|
public bool hi5Support;
|
||||||
public bool realsenseSupport;
|
public bool realsenseSupport;
|
||||||
|
@ -1106,9 +1106,6 @@ namespace Passer.Humanoid {
|
|||||||
#if hWAVEVR
|
#if hWAVEVR
|
||||||
waveVR,
|
waveVR,
|
||||||
#endif
|
#endif
|
||||||
#if hVRTK
|
|
||||||
vrtk,
|
|
||||||
#endif
|
|
||||||
#if hNEURON
|
#if hNEURON
|
||||||
neuronTracker,
|
neuronTracker,
|
||||||
#endif
|
#endif
|
||||||
|
@ -284,10 +284,6 @@ namespace Passer.Humanoid {
|
|||||||
viveTracker,
|
viveTracker,
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if hVRTK
|
|
||||||
vrtk,
|
|
||||||
#endif
|
|
||||||
#if hREALSENSE
|
#if hREALSENSE
|
||||||
//realsenseHand,
|
//realsenseHand,
|
||||||
#endif
|
#endif
|
||||||
@ -1306,14 +1302,7 @@ namespace Passer.Humanoid {
|
|||||||
//fingers.CalculateFingerRetargeting();
|
//fingers.CalculateFingerRetargeting();
|
||||||
|
|
||||||
CheckColliders();
|
CheckColliders();
|
||||||
#if hVRTK
|
|
||||||
// VRTK is not compatible with touch interaction
|
|
||||||
// because it uses its own EventSystem
|
|
||||||
// which will be destroyed by humanoid control
|
|
||||||
if (touchInteraction && !(humanoid.vrtk.enabled && vrtk.enabled))
|
|
||||||
#else
|
|
||||||
if (touchInteraction)
|
if (touchInteraction)
|
||||||
#endif
|
|
||||||
StartInteraction();
|
StartInteraction();
|
||||||
|
|
||||||
|
|
||||||
|
@ -223,9 +223,6 @@ namespace Passer.Humanoid {
|
|||||||
unityXR,
|
unityXR,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if hVRTK
|
|
||||||
vrtk,
|
|
||||||
#endif
|
|
||||||
#if hKINECT1
|
#if hKINECT1
|
||||||
kinect1,
|
kinect1,
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user