Merge pull request #3808 from wiwei/nullparentfix

David Kline · web-flow · commit 5d352c795cf7 · 2019-04-03T22:57:07.000-07:00
Add a null input parent check in DefaultPointerMediator
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/DefaultPointerMediator.cs
@@ -36,13 +36,16 @@ public void RegisterPointers(IMixedRealityPointer[] pointers)
                     farInteractPointers.Add(pointer);
                 }
 
-                HashSet<IMixedRealityPointer> children;
-                if (!pointerByInputSourceParent.TryGetValue(pointer.InputSourceParent, out children))
+                if (pointer.InputSourceParent != null)
                 {
-                    children = new HashSet<IMixedRealityPointer>();
-                    pointerByInputSourceParent.Add(pointer.InputSourceParent, children);
+                    HashSet<IMixedRealityPointer> children;
+                    if (!pointerByInputSourceParent.TryGetValue(pointer.InputSourceParent, out children))
+                    {
+                        children = new HashSet<IMixedRealityPointer>();
+                        pointerByInputSourceParent.Add(pointer.InputSourceParent, children);
+                    }
+                    children.Add(pointer);
                 }
-                children.Add(pointer);
             }
         }
 
@@ -99,15 +102,18 @@ public void UpdatePointers()
                     pointer.IsActive = true;
                     unassignedPointers.Remove(pointer);
 
-                    foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])
+                    if (pointer.InputSourceParent != null)
                     {
-                        if (!unassignedPointers.Contains(otherPointer))
+                        foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])
                         {
-                            continue;
-                        }
+                            if (!unassignedPointers.Contains(otherPointer))
+                            {
+                                continue;
+                            }
 
-                        otherPointer.IsActive = false;
-                        unassignedPointers.Remove(otherPointer);
+                            otherPointer.IsActive = false;
+                            unassignedPointers.Remove(otherPointer);
+                        }
                     }
                 }
             }
@@ -126,15 +132,18 @@ public void UpdatePointers()
                     pointer.IsActive = true;
                     unassignedPointers.Remove(pointer);
 
-                    foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])
+                    if (pointer.InputSourceParent != null)
                     {
-                        if (!unassignedPointers.Contains(otherPointer))
+                        foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])
                         {
-                            continue;
-                        }
+                            if (!unassignedPointers.Contains(otherPointer))
+                            {
+                                continue;
+                            }
 
-                        otherPointer.IsActive = false;
-                        unassignedPointers.Remove(otherPointer);
+                            otherPointer.IsActive = false;
+                            unassignedPointers.Remove(otherPointer);
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,16 @@ public void RegisterPointers(IMixedRealityPointer[] pointers)`
`36`	`36`	`farInteractPointers.Add(pointer);`
`37`	`37`	`}`
`38`	`38`
`39`		`- HashSet<IMixedRealityPointer> children;`
`40`		`- if (!pointerByInputSourceParent.TryGetValue(pointer.InputSourceParent, out children))`
	`39`	`+ if (pointer.InputSourceParent != null)`
`41`	`40`	`{`
`42`		`- children = new HashSet<IMixedRealityPointer>();`
`43`		`- pointerByInputSourceParent.Add(pointer.InputSourceParent, children);`
	`41`	`+ HashSet<IMixedRealityPointer> children;`
	`42`	`+ if (!pointerByInputSourceParent.TryGetValue(pointer.InputSourceParent, out children))`
	`43`	`+ {`
	`44`	`+ children = new HashSet<IMixedRealityPointer>();`
	`45`	`+ pointerByInputSourceParent.Add(pointer.InputSourceParent, children);`
	`46`	`+ }`
	`47`	`+ children.Add(pointer);`
`44`	`48`	`}`
`45`		`- children.Add(pointer);`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`
`@@ -99,15 +102,18 @@ public void UpdatePointers()`
`99`	`102`	`pointer.IsActive = true;`
`100`	`103`	`unassignedPointers.Remove(pointer);`
`101`	`104`
`102`		`- foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])`
	`105`	`+ if (pointer.InputSourceParent != null)`
`103`	`106`	`{`
`104`		`- if (!unassignedPointers.Contains(otherPointer))`
	`107`	`+ foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])`
`105`	`108`	`{`
`106`		`- continue;`
`107`		`- }`
	`109`	`+ if (!unassignedPointers.Contains(otherPointer))`
	`110`	`+ {`
	`111`	`+ continue;`
	`112`	`+ }`
`108`	`113`
`109`		`- otherPointer.IsActive = false;`
`110`		`- unassignedPointers.Remove(otherPointer);`
	`114`	`+ otherPointer.IsActive = false;`
	`115`	`+ unassignedPointers.Remove(otherPointer);`
	`116`	`+ }`
`111`	`117`	`}`
`112`	`118`	`}`
`113`	`119`	`}`
`@@ -126,15 +132,18 @@ public void UpdatePointers()`
`126`	`132`	`pointer.IsActive = true;`
`127`	`133`	`unassignedPointers.Remove(pointer);`
`128`	`134`
`129`		`- foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])`
	`135`	`+ if (pointer.InputSourceParent != null)`
`130`	`136`	`{`
`131`		`- if (!unassignedPointers.Contains(otherPointer))`
	`137`	`+ foreach (IMixedRealityPointer otherPointer in pointerByInputSourceParent[pointer.InputSourceParent])`
`132`	`138`	`{`
`133`		`- continue;`
`134`		`- }`
	`139`	`+ if (!unassignedPointers.Contains(otherPointer))`
	`140`	`+ {`
	`141`	`+ continue;`
	`142`	`+ }`
`135`	`143`
`136`		`- otherPointer.IsActive = false;`
`137`		`- unassignedPointers.Remove(otherPointer);`
	`144`	`+ otherPointer.IsActive = false;`
	`145`	`+ unassignedPointers.Remove(otherPointer);`
	`146`	`+ }`
`138`	`147`	`}`
`139`	`148`	`}`
`140`	`149`	`}`