fix(Pointers): stop direction indicator working when script disabled

The Pointer Direction Indicator will now only work when the script is active in the current GameObject hierarchy which is useful for turning the direction indicator on and off by simply disabling a container parent GameObject.
ExtendRealityLtd · Dec 12, 2017 · 6776623 · 6776623
1 parent 564983e
commit 6776623
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Assets/VRTK/Prefabs/PointerDirectionIndicator/VRTK_PointerDirectionIndicator.cs b/Assets/VRTK/Prefabs/PointerDirectionIndicator/VRTK_PointerDirectionIndicator.cs
@@ -116,8 +116,15 @@ public virtual Quaternion GetRotation()
         /// <param name="validity">Determines if the colour being set is based from a valid location or invalid location.</param>
         public virtual void SetMaterialColor(Color color, bool validity)
         {
-            validLocation.SetActive(validity);
-            invalidLocation.SetActive((displayOnInvalidLocation ? !validity : validity));
+            if (validLocation != null)
+            {
+                validLocation.SetActive(validity);
+            }
+
+            if (invalidLocation != null)
+            {
+                invalidLocation.SetActive((displayOnInvalidLocation ? !validity : validity));
+            }
 
             if (usePointerColor)
             {

diff --git a/Assets/VRTK/Source/Scripts/Pointers/VRTK_PlayAreaCursor.cs b/Assets/VRTK/Source/Scripts/Pointers/VRTK_PlayAreaCursor.cs
@@ -198,7 +198,7 @@ public virtual void SetPlayAreaCursorTransform(Vector3 location)
                         headsetOutOfBounds = false;
                     }
                 }
-                playAreaCursor.transform.rotation = (directionIndicator != null ? directionIndicator.transform.rotation : playArea.rotation);
+                playAreaCursor.transform.rotation = (directionIndicator != null && directionIndicator.gameObject.activeInHierarchy ? directionIndicator.transform.rotation : playArea.rotation);
                 playAreaCursor.transform.position = location + offset;
             }
         }

diff --git a/Assets/VRTK/Source/Scripts/Pointers/VRTK_Pointer.cs b/Assets/VRTK/Source/Scripts/Pointers/VRTK_Pointer.cs
@@ -300,7 +300,10 @@ protected override void OnEnable()
 #pragma warning restore 0618
             base.OnEnable();
             attachedTo = (attachedTo == null ? gameObject : attachedTo);
-            VRTK_PlayerObject.SetPlayerObject(gameObject, VRTK_PlayerObject.ObjectTypes.Pointer);
+            if (!VRTK_PlayerObject.IsPlayerObject(gameObject))
+            {
+                VRTK_PlayerObject.SetPlayerObject(gameObject, VRTK_PlayerObject.ObjectTypes.Pointer);
+            }
             SetDefaultValues();
 
             if (NoPointerRenderer())
@@ -389,7 +392,7 @@ protected virtual void HandleEnabledPointer()
 
         protected virtual Quaternion? GetCursorRotation()
         {
-            if (EnabledPointerRenderer() && pointerRenderer.directionIndicator != null)
+            if (EnabledPointerRenderer() && pointerRenderer.directionIndicator != null && pointerRenderer.directionIndicator.gameObject.activeInHierarchy)
             {
                 return pointerRenderer.directionIndicator.GetRotation();
             }