Fix Teleportable.UseSteamVRFade is not working

lawwong · lawwong · commit 26da55bdb49f · 2020-06-19T14:51:32.000+08:00
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/Teleportable.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/Teleportable.cs
@@ -246,10 +246,9 @@ protected virtual void OnPointerTeleport(PointerEventData eventData)
 
             abort = false;
 
-            if (useSteamVRFade && fadeDuration > 0f && VRModule.isSteamVRPluginDetected && VRModule.activeModule != VRModuleActiveEnum.SteamVR)
+            if (useSteamVRFade && fadeDuration > 0f && !VRModule.isSteamVRPluginDetected)
             {
                 Debug.LogWarning("Install SteamVR plugin and enable SteamVRModule support to enable fading");
-                fadeDuration = 0f;
             }
 
             var delay = Mathf.Max(0f, fadeDuration * 0.5f);
@@ -277,7 +276,7 @@ protected bool IsValidTeleportButton(PointerEventData eventData)
 
         public IEnumerator StartTeleport(RaycastResult hitResult, Vector3 position, Quaternion rotation, float delay)
         {
-            if (VRModule.activeModule == VRModuleActiveEnum.SteamVR && !Mathf.Approximately(delay, 0f))
+            if (useSteamVRFade && VRModule.activeModule == VRModuleActiveEnum.SteamVR && !Mathf.Approximately(delay, 0f))
             {
                 if (!m_steamVRFadeInitialized)
                 {

Original file line number	Diff line number	Diff line change
`@@ -246,10 +246,9 @@ protected virtual void OnPointerTeleport(PointerEventData eventData)`
`246`	`246`
`247`	`247`	`abort = false;`
`248`	`248`
`249`		`- if (useSteamVRFade && fadeDuration > 0f && VRModule.isSteamVRPluginDetected && VRModule.activeModule != VRModuleActiveEnum.SteamVR)`
	`249`	`+ if (useSteamVRFade && fadeDuration > 0f && !VRModule.isSteamVRPluginDetected)`
`250`	`250`	`{`
`251`	`251`	`Debug.LogWarning("Install SteamVR plugin and enable SteamVRModule support to enable fading");`
`252`		`- fadeDuration = 0f;`
`253`	`252`	`}`
`254`	`253`
`255`	`254`	`var delay = Mathf.Max(0f, fadeDuration * 0.5f);`
`@@ -277,7 +276,7 @@ protected bool IsValidTeleportButton(PointerEventData eventData)`
`277`	`276`
`278`	`277`	`public IEnumerator StartTeleport(RaycastResult hitResult, Vector3 position, Quaternion rotation, float delay)`
`279`	`278`	`{`
`280`		`- if (VRModule.activeModule == VRModuleActiveEnum.SteamVR && !Mathf.Approximately(delay, 0f))`
	`279`	`+ if (useSteamVRFade && VRModule.activeModule == VRModuleActiveEnum.SteamVR && !Mathf.Approximately(delay, 0f))`
`281`	`280`	`{`
`282`	`281`	`if (!m_steamVRFadeInitialized)`
`283`	`282`	`{`