Merge pull request #9939 from keveleigh/perf-indirection

keveleigh · web-flow · commit 64593c666bc9 · 2021-06-08T09:23:20.000-07:00
Remove calls to .gameObject on GameObjects
diff --git a/Assets/MRTK/Core/Utilities/Gltf/Serialization/ConstructGltf.cs b/Assets/MRTK/Core/Utilities/Gltf/Serialization/ConstructGltf.cs
@@ -507,8 +507,8 @@ private static async Task ConstructMeshAsync(GltfObject gltfObject, GameObject p
         {
             GltfMesh gltfMesh = gltfObject.meshes[meshId];
 
-            var renderer = parent.gameObject.AddComponent<MeshRenderer>();
-            var filter = parent.gameObject.AddComponent<MeshFilter>();
+            var renderer = parent.AddComponent<MeshRenderer>();
+            var filter = parent.AddComponent<MeshFilter>();
 
             if (gltfMesh.primitives.Length == 1)
             {
diff --git a/Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Scripts/TargetGroupCreatorRadial.cs b/Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Scripts/TargetGroupCreatorRadial.cs
@@ -171,7 +171,7 @@ private void InstantiateRadialLayoutedTarget(float radius, float viewingDist, in
             // Assign parent
             _target.transform.SetParent(transform);
 
-            _target.gameObject.SetActive(true);
+            _target.SetActive(true);
 
             // Add it to our list of instantiated targets
             instantiatedTargets.Add(_target);
diff --git a/Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Scripts/TargetGroupIterator.cs b/Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetSelections/Scripts/TargetGroupIterator.cs
@@ -132,7 +132,7 @@ private void ProceedToNextTarget()
 
                 // 2. If "DisableDistractors" is true then let's hide the selected target
                 if (DeactiveDistractors)
-                    CurrentTarget.gameObject.SetActive(false);
+                    CurrentTarget.SetActive(false);
 
                 // 3. Let's update to highlight the new target.
                 currTargetIndex++;
@@ -205,7 +205,7 @@ private void HighlightTarget()
             if (CurrentTarget == null)
                 ProceedToNextTarget();
 
-            CurrentTarget.gameObject.SetActive(true);
+            CurrentTarget.SetActive(true);
             HighlightTarget(highlightColor);
         }
 
diff --git a/Assets/MRTK/Examples/Demos/EyeTracking/DemoVisualizer/Scripts/InputPointerVisualizer.cs b/Assets/MRTK/Examples/Demos/EyeTracking/DemoVisualizer/Scripts/InputPointerVisualizer.cs
@@ -148,7 +148,7 @@ private void ResetVis(ref GameObject[] array)
             {
                 for (int i = array.Length - 1; i >= 0; i--)
                 {
-                    Destroy(array[i].gameObject);
+                    Destroy(array[i]);
                 }
             }
         }
diff --git a/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/ButtonConfigHelperInspector.cs b/Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/ButtonConfigHelperInspector.cs
@@ -159,7 +159,7 @@ public override void OnInspectorGUI()
                             if (seeItSayItLabel.activeSelf != seeItSayItLabelActive)
                             {
                                 seeItSayItLabel.SetActive(seeItSayItLabelActive);
-                                EditorUtility.SetDirty(seeItSayItLabel.gameObject);
+                                EditorUtility.SetDirty(seeItSayItLabel);
                             }
 
                             if (seeItSayItLabel.activeSelf)
diff --git a/Assets/MRTK/SDK/Experimental/Features/Utilities/StabilizationPlaneModifier.cs b/Assets/MRTK/SDK/Experimental/Features/Utilities/StabilizationPlaneModifier.cs
@@ -176,7 +176,7 @@ private void Awake()
 #if UNITY_EDITOR
             debugMesh = GameObject.CreatePrimitive(PrimitiveType.Quad);
             debugMesh.hideFlags |= HideFlags.HideInHierarchy;
-            debugMesh.gameObject.SetActive(false);
+            debugMesh.SetActive(false);
             debugMeshFilter = debugMesh.GetComponent<MeshFilter>();
 #endif
 
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/ProgressIndicators/ProgressIndicatorOrbsRotator.cs b/Assets/MRTK/SDK/Features/UX/Scripts/ProgressIndicators/ProgressIndicatorOrbsRotator.cs
@@ -181,7 +181,7 @@ private void Update()
                 for (int index = 0; index < deployedCount; ++index)
                 {
                     float acceleratedDegrees = (rotationSpeedRawDegrees * (acceleration + -Mathf.Cos(Mathf.Deg2Rad * angles[index]))) * timeSlice;
-                    orbs[index].gameObject.transform.Rotate(0, 0, acceleratedDegrees);
+                    orbs[index].transform.Rotate(0, 0, acceleratedDegrees);
                     angles[index] += Mathf.Abs(acceleratedDegrees);
 
                     Color orbColor = propertyBlocks[index].GetColor("_Color");
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Utilities/PrefabSpawner.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Utilities/PrefabSpawner.cs
@@ -98,7 +98,7 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime
                 {
                     spawnable.transform.localRotation = Quaternion.identity;
                 }
-                spawnable.gameObject.SetActive(false);
+                spawnable.SetActive(false);
             }
             if (appearType == AppearType.AppearOnFocusEnter)
             {
@@ -112,11 +112,11 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime
                 }
             }
 
-            spawnable.gameObject.SetActive(true);
+            spawnable.SetActive(true);
 
             SpawnableActivated(spawnable);
 
-            while (spawnable.gameObject.activeSelf)
+            while (spawnable.activeSelf)
             {
                 if (remainType == RemainType.Timeout)
                 {
@@ -125,15 +125,15 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime
                         case AppearType.AppearOnTap:
                             if (Time.unscaledTime - tappedTime >= lifetime)
                             {
-                                spawnable.gameObject.SetActive(false);
+                                spawnable.SetActive(false);
                                 return;
                             }
 
                             break;
                         case AppearType.AppearOnFocusEnter:
                             if (Time.unscaledTime - focusEnterTime >= lifetime)
                             {
-                                spawnable.gameObject.SetActive(false);
+                                spawnable.SetActive(false);
                                 return;
                             }
 
@@ -147,15 +147,15 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime
                     case VanishType.VanishOnFocusExit:
                         if (!HasFocus)
                         {
-                            spawnable.gameObject.SetActive(false);
+                            spawnable.SetActive(false);
                         }
 
                         break;
 
                     case VanishType.VanishOnTap:
                         if (!tappedTime.Equals(tappedTimeOnStart))
                         {
-                            spawnable.gameObject.SetActive(false);
+                            spawnable.SetActive(false);
                         }
 
                         break;
@@ -164,7 +164,7 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime
                     default:
                         if (!HasFocus && HasVanishDelayElapsed())
                         {
-                            spawnable.gameObject.SetActive(false);
+                            spawnable.SetActive(false);
                         }
                         break;
                 }
@@ -216,7 +216,7 @@ protected virtual void HandleTap()
         {
             tappedTime = Time.unscaledTime;
 
-            if (spawnable == null || !spawnable.gameObject.activeSelf)
+            if (spawnable == null || !spawnable.activeSelf)
             {
                 switch (appearType)
                 {
@@ -230,7 +230,7 @@ protected virtual void HandleTap()
                 switch (vanishType)
                 {
                     case VanishType.VanishOnTap:
-                        spawnable.gameObject.SetActive(false);
+                        spawnable.SetActive(false);
                         break;
                 }
             }
@@ -240,7 +240,7 @@ private void HandleFocusEnter()
         {
             focusEnterTime = Time.unscaledTime;
 
-            if (spawnable == null || !spawnable.gameObject.activeSelf)
+            if (spawnable == null || !spawnable.activeSelf)
             {
                 switch (appearType)
                 {
diff --git a/Assets/MRTK/Tests/PlayModeTests/BaseCursorTests.cs b/Assets/MRTK/Tests/PlayModeTests/BaseCursorTests.cs
@@ -402,7 +402,7 @@ public IEnumerator CursorScaling()
             // FIRST DISTANCE
             float firstAngularScale = 2 * Mathf.Atan2(baseCursor.LocalScale.y * 0.5f, Vector3.Distance(cam.transform.position, baseCursor.transform.position));
 
-            cube.gameObject.SetActive(false);
+            cube.SetActive(false);
 
             yield return new WaitForFixedUpdate();
             yield return null;
diff --git a/Assets/MRTK/Tests/PlayModeTests/BoundsControlTests.cs b/Assets/MRTK/Tests/PlayModeTests/BoundsControlTests.cs
@@ -902,7 +902,7 @@ public IEnumerator ScaleChildTargetMinMax()
             const int numHandSteps = 1;
 
             Vector3 initialHandPosition = new Vector3(0, 0, 0.5f);
-            var frontRightCornerPos = boundsControl.Target.gameObject.transform.Find("rigRoot/corner_3").position; // front right corner is corner 3
+            var frontRightCornerPos = boundsControl.Target.transform.Find("rigRoot/corner_3").position; // front right corner is corner 3
             TestHand hand = new TestHand(Handedness.Right);
 
             // Hands grab object at initial position

Original file line number	Diff line number	Diff line change
`@@ -507,8 +507,8 @@ private static async Task ConstructMeshAsync(GltfObject gltfObject, GameObject p`
`507`	`507`	`{`
`508`	`508`	`GltfMesh gltfMesh = gltfObject.meshes[meshId];`
`509`	`509`
`510`		`- var renderer = parent.gameObject.AddComponent<MeshRenderer>();`
`511`		`- var filter = parent.gameObject.AddComponent<MeshFilter>();`
	`510`	`+ var renderer = parent.AddComponent<MeshRenderer>();`
	`511`	`+ var filter = parent.AddComponent<MeshFilter>();`
`512`	`512`
`513`	`513`	`if (gltfMesh.primitives.Length == 1)`
`514`	`514`	`{`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private void ResetVis(ref GameObject[] array)`
`148`	`148`	`{`
`149`	`149`	`for (int i = array.Length - 1; i >= 0; i--)`
`150`	`150`	`{`
`151`		`- Destroy(array[i].gameObject);`
	`151`	`+ Destroy(array[i]);`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public override void OnInspectorGUI()`
`159`	`159`	`if (seeItSayItLabel.activeSelf != seeItSayItLabelActive)`
`160`	`160`	`{`
`161`	`161`	`seeItSayItLabel.SetActive(seeItSayItLabelActive);`
`162`		`- EditorUtility.SetDirty(seeItSayItLabel.gameObject);`
	`162`	`+ EditorUtility.SetDirty(seeItSayItLabel);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if (seeItSayItLabel.activeSelf)`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private void Update()`
`181`	`181`	`for (int index = 0; index < deployedCount; ++index)`
`182`	`182`	`{`
`183`	`183`	`float acceleratedDegrees = (rotationSpeedRawDegrees * (acceleration + -Mathf.Cos(Mathf.Deg2Rad * angles[index]))) * timeSlice;`
`184`		`- orbs[index].gameObject.transform.Rotate(0, 0, acceleratedDegrees);`
	`184`	`+ orbs[index].transform.Rotate(0, 0, acceleratedDegrees);`
`185`	`185`	`angles[index] += Mathf.Abs(acceleratedDegrees);`
`186`	`186`
`187`	`187`	`Color orbColor = propertyBlocks[index].GetColor("_Color");`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime`
`98`	`98`	`{`
`99`	`99`	`spawnable.transform.localRotation = Quaternion.identity;`
`100`	`100`	`}`
`101`		`- spawnable.gameObject.SetActive(false);`
	`101`	`+ spawnable.SetActive(false);`
`102`	`102`	`}`
`103`	`103`	`if (appearType == AppearType.AppearOnFocusEnter)`
`104`	`104`	`{`
`@@ -112,11 +112,11 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- spawnable.gameObject.SetActive(true);`
	`115`	`+ spawnable.SetActive(true);`
`116`	`116`
`117`	`117`	`SpawnableActivated(spawnable);`
`118`	`118`
`119`		`- while (spawnable.gameObject.activeSelf)`
	`119`	`+ while (spawnable.activeSelf)`
`120`	`120`	`{`
`121`	`121`	`if (remainType == RemainType.Timeout)`
`122`	`122`	`{`
`@@ -125,15 +125,15 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime`
`125`	`125`	`case AppearType.AppearOnTap:`
`126`	`126`	`if (Time.unscaledTime - tappedTime >= lifetime)`
`127`	`127`	`{`
`128`		`- spawnable.gameObject.SetActive(false);`
	`128`	`+ spawnable.SetActive(false);`
`129`	`129`	`return;`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`break;`
`133`	`133`	`case AppearType.AppearOnFocusEnter:`
`134`	`134`	`if (Time.unscaledTime - focusEnterTime >= lifetime)`
`135`	`135`	`{`
`136`		`- spawnable.gameObject.SetActive(false);`
	`136`	`+ spawnable.SetActive(false);`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`@@ -147,15 +147,15 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime`
`147`	`147`	`case VanishType.VanishOnFocusExit:`
`148`	`148`	`if (!HasFocus)`
`149`	`149`	`{`
`150`		`- spawnable.gameObject.SetActive(false);`
	`150`	`+ spawnable.SetActive(false);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`break;`
`154`	`154`
`155`	`155`	`case VanishType.VanishOnTap:`
`156`	`156`	`if (!tappedTime.Equals(tappedTimeOnStart))`
`157`	`157`	`{`
`158`		`- spawnable.gameObject.SetActive(false);`
	`158`	`+ spawnable.SetActive(false);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`break;`
`@@ -164,7 +164,7 @@ private async Task UpdateSpawnable(float focusEnterTimeOnStart, float tappedTime`
`164`	`164`	`default:`
`165`	`165`	`if (!HasFocus && HasVanishDelayElapsed())`
`166`	`166`	`{`
`167`		`- spawnable.gameObject.SetActive(false);`
	`167`	`+ spawnable.SetActive(false);`
`168`	`168`	`}`
`169`	`169`	`break;`
`170`	`170`	`}`
`@@ -216,7 +216,7 @@ protected virtual void HandleTap()`
`216`	`216`	`{`
`217`	`217`	`tappedTime = Time.unscaledTime;`
`218`	`218`
`219`		`- if (spawnable == null \|\| !spawnable.gameObject.activeSelf)`
	`219`	`+ if (spawnable == null \|\| !spawnable.activeSelf)`
`220`	`220`	`{`
`221`	`221`	`switch (appearType)`
`222`	`222`	`{`
`@@ -230,7 +230,7 @@ protected virtual void HandleTap()`
`230`	`230`	`switch (vanishType)`
`231`	`231`	`{`
`232`	`232`	`case VanishType.VanishOnTap:`
`233`		`- spawnable.gameObject.SetActive(false);`
	`233`	`+ spawnable.SetActive(false);`
`234`	`234`	`break;`
`235`	`235`	`}`
`236`	`236`	`}`
`@@ -240,7 +240,7 @@ private void HandleFocusEnter()`
`240`	`240`	`{`
`241`	`241`	`focusEnterTime = Time.unscaledTime;`
`242`	`242`
`243`		`- if (spawnable == null \|\| !spawnable.gameObject.activeSelf)`
	`243`	`+ if (spawnable == null \|\| !spawnable.activeSelf)`
`244`	`244`	`{`
`245`	`245`	`switch (appearType)`
`246`	`246`	`{`