fix: highlighted objects recover their renderer when they become disa…

…bled (#65)
Innoactive · Sep 18, 2020 · 03be66d · 03be66d
1 parent d175842
commit 03be66d
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Runtime/Interaction/Highlighters/InteractableHighlighter.cs b/Runtime/Interaction/Highlighters/InteractableHighlighter.cs
@@ -72,6 +72,7 @@ public bool AllowOnUseHighlight
         [SerializeField]
         private Color useHighlightColor = new Color32(0, 255, 0, 50);
 
+        private bool isBeingHighlighted;
         private Material colorTouchMaterial;
         private Material colorGrabMaterial;
         private Material colorUseMaterial;
@@ -98,6 +99,14 @@ private void OnEnable()
 
         private void OnDisable()
         {
+            if (isBeingHighlighted)
+            {
+                ReenableRenderers(cachedSkinnedRenderers);
+                ReenableRenderers(cachedMeshRenderers);
+
+                externalHighlights.Clear();
+            }
+
             interactableObject.onFirstHoverEnter.RemoveListener(OnTouched);
             interactableObject.onSelectEnter.RemoveListener(OnGrabbed);
             interactableObject.onSelectExit.RemoveListener(OnReleased);
@@ -212,6 +221,7 @@ private IEnumerator Highlight(Material highlightMaterial, Func<bool> shouldConti
 
             while (shouldContinueHighlighting())
             {
+                isBeingHighlighted = true;
                 DisableRenders(cachedSkinnedRenderers);
                 DisableRenders(cachedMeshRenderers);
 
@@ -228,6 +238,7 @@ private IEnumerator Highlight(Material highlightMaterial, Func<bool> shouldConti
                 yield return null;
             }
 
+            isBeingHighlighted = false;
             ReenableRenderers(cachedSkinnedRenderers);
             ReenableRenderers(cachedMeshRenderers);