Bounding box of SkinnedMeshRenderer support added (#10611)

lvonasek · microsoft-github-policy-service[bot] · keveleigh · web-flow · commit c2098fd2748d · 2022-06-03T12:38:33.000-07:00
* Microsoft mandatory file (#10599) Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> * Bounding box of SkinnedMeshRenderer support added * Bounding box of SkinnedMeshRenderer support added Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> Co-authored-by: Kurtis <kurtie@microsoft.com> Co-authored-by: RogPodge <39840334+RogPodge@users.noreply.github.com>
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs
@@ -1581,6 +1581,19 @@ private Bounds GetMaxBounds(GameObject g)
                     b.Encapsulate(currentMesh.bounds);
                 }
             }
+            foreach (SkinnedMeshRenderer r in g.GetComponentsInChildren<SkinnedMeshRenderer>())
+            {
+                if ((currentMesh = r.sharedMesh) == null) { continue; }
+
+                if (b.size == Vector3.zero)
+                {
+                    b = currentMesh.bounds;
+                }
+                else
+                {
+                    b.Encapsulate(currentMesh.bounds);
+                }
+            }
             return b;
         }
 
@@ -1888,10 +1901,15 @@ private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMet
             if (boundsCalculationMethod != BoundsCalculationMethod.ColliderOnly)
             {
                 MeshFilter meshFilter = childTransform.GetComponent<MeshFilter>();
+                SkinnedMeshRenderer skinnedMeshRenderer = childTransform.GetComponent<SkinnedMeshRenderer>();
                 if (meshFilter != null && meshFilter.sharedMesh != null)
                 {
                     rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, meshFilter.sharedMesh.bounds);
                 }
+                else if (skinnedMeshRenderer != null && skinnedMeshRenderer.sharedMesh != null)
+                {
+                    rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, skinnedMeshRenderer.sharedMesh.bounds);
+                }
                 else
                 {
                     rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>();
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs
@@ -950,10 +950,15 @@ private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMet
             if (boundsCalculationMethod != BoundsCalculationMethod.ColliderOnly)
             {
                 MeshFilter meshFilter = childTransform.GetComponent<MeshFilter>();
+                SkinnedMeshRenderer skinnedMeshRenderer = childTransform.GetComponent<SkinnedMeshRenderer>();
                 if (meshFilter != null && meshFilter.sharedMesh != null)
                 {
                     rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, meshFilter.sharedMesh.bounds);
                 }
+                else if (skinnedMeshRenderer != null && skinnedMeshRenderer.sharedMesh != null)
+                {
+                    rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, skinnedMeshRenderer.sharedMesh.bounds);
+                }
                 else
                 {
                     rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>();
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/Visuals/VisualUtils.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/Visuals/VisualUtils.cs
@@ -51,6 +51,19 @@ internal static Bounds GetMaxBounds(GameObject g)
                     b.Encapsulate(currentMesh.bounds);
                 }
             }
+            foreach (SkinnedMeshRenderer r in g.GetComponentsInChildren<SkinnedMeshRenderer>())
+            {
+                if ((currentMesh = r.sharedMesh) == null) { continue; }
+
+                if (b.size == Vector3.zero)
+                {
+                    b = currentMesh.bounds;
+                }
+                else
+                {
+                    b.Encapsulate(currentMesh.bounds);
+                }
+            }
             return b;
         }
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

Original file line number	Diff line number	Diff line change
`@@ -1581,6 +1581,19 @@ private Bounds GetMaxBounds(GameObject g)`
`1581`	`1581`	`b.Encapsulate(currentMesh.bounds);`
`1582`	`1582`	`}`
`1583`	`1583`	`}`
	`1584`	`+ foreach (SkinnedMeshRenderer r in g.GetComponentsInChildren<SkinnedMeshRenderer>())`
	`1585`	`+ {`
	`1586`	`+ if ((currentMesh = r.sharedMesh) == null) { continue; }`
	`1587`	`+`
	`1588`	`+ if (b.size == Vector3.zero)`
	`1589`	`+ {`
	`1590`	`+ b = currentMesh.bounds;`
	`1591`	`+ }`
	`1592`	`+ else`
	`1593`	`+ {`
	`1594`	`+ b.Encapsulate(currentMesh.bounds);`
	`1595`	`+ }`
	`1596`	`+ }`
`1584`	`1597`	`return b;`
`1585`	`1598`	`}`
`1586`	`1599`
`@@ -1888,10 +1901,15 @@ private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMet`
`1888`	`1901`	`if (boundsCalculationMethod != BoundsCalculationMethod.ColliderOnly)`
`1889`	`1902`	`{`
`1890`	`1903`	`MeshFilter meshFilter = childTransform.GetComponent<MeshFilter>();`
	`1904`	`+ SkinnedMeshRenderer skinnedMeshRenderer = childTransform.GetComponent<SkinnedMeshRenderer>();`
`1891`	`1905`	`if (meshFilter != null && meshFilter.sharedMesh != null)`
`1892`	`1906`	`{`
`1893`	`1907`	`rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, meshFilter.sharedMesh.bounds);`
`1894`	`1908`	`}`
	`1909`	`+ else if (skinnedMeshRenderer != null && skinnedMeshRenderer.sharedMesh != null)`
	`1910`	`+ {`
	`1911`	`+ rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, skinnedMeshRenderer.sharedMesh.bounds);`
	`1912`	`+ }`
`1895`	`1913`	`else`
`1896`	`1914`	`{`
`1897`	`1915`	`rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>();`
Original file line number	Diff line number	Diff line change
`@@ -950,10 +950,15 @@ private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMet`
`950`	`950`	`if (boundsCalculationMethod != BoundsCalculationMethod.ColliderOnly)`
`951`	`951`	`{`
`952`	`952`	`MeshFilter meshFilter = childTransform.GetComponent<MeshFilter>();`
	`953`	`+ SkinnedMeshRenderer skinnedMeshRenderer = childTransform.GetComponent<SkinnedMeshRenderer>();`
`953`	`954`	`if (meshFilter != null && meshFilter.sharedMesh != null)`
`954`	`955`	`{`
`955`	`956`	`rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, meshFilter.sharedMesh.bounds);`
`956`	`957`	`}`
	`958`	`+ else if (skinnedMeshRenderer != null && skinnedMeshRenderer.sharedMesh != null)`
	`959`	`+ {`
	`960`	`+ rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>(childTransform, skinnedMeshRenderer.sharedMesh.bounds);`
	`961`	`+ }`
`957`	`962`	`else`
`958`	`963`	`{`
`959`	`964`	`rendererBoundsByTransform = new KeyValuePair<Transform, Bounds>();`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,19 @@ internal static Bounds GetMaxBounds(GameObject g)`
`51`	`51`	`b.Encapsulate(currentMesh.bounds);`
`52`	`52`	`}`
`53`	`53`	`}`
	`54`	`+ foreach (SkinnedMeshRenderer r in g.GetComponentsInChildren<SkinnedMeshRenderer>())`
	`55`	`+ {`
	`56`	`+ if ((currentMesh = r.sharedMesh) == null) { continue; }`
	`57`	`+`
	`58`	`+ if (b.size == Vector3.zero)`
	`59`	`+ {`
	`60`	`+ b = currentMesh.bounds;`
	`61`	`+ }`
	`62`	`+ else`
	`63`	`+ {`
	`64`	`+ b.Encapsulate(currentMesh.bounds);`
	`65`	`+ }`
	`66`	`+ }`
`54`	`67`	`return b;`
`55`	`68`	`}`
`56`	`69`