prefer pattern matching

YoRyan · YoRyan · commit 5615bcb033b6 · 2021-04-20T09:27:52.000-07:00
diff --git a/Source/RunActivity/Viewer3D/Viewer.cs b/Source/RunActivity/Viewer3D/Viewer.cs
@@ -1355,8 +1355,7 @@ void HandleUserInput(ElapsedTime elapsedTime)
                 {
                     foreach (var controlRenderer in (PlayerLocomotiveViewer as MSTSLocomotiveViewer)._CabRenderer.ControlMap.Values)
                     {
-                        ICabViewMouseControlRenderer mouseRenderer = controlRenderer as ICabViewMouseControlRenderer;
-                        if (mouseRenderer != null && mouseRenderer.IsMouseWithin())
+                        if (controlRenderer is ICabViewMouseControlRenderer mouseRenderer && mouseRenderer.IsMouseWithin())
                         {
                             MouseChangingControl = mouseRenderer;
                             break;
@@ -1384,8 +1383,7 @@ void HandleUserInput(ElapsedTime elapsedTime)
                 {
                     foreach (var controlRenderer in (PlayerLocomotiveViewer as MSTSLocomotiveViewer)._CabRenderer.ControlMap.Values)
                     {
-                        ICabViewMouseControlRenderer mouseRenderer = controlRenderer as ICabViewMouseControlRenderer;
-                        if (mouseRenderer != null && mouseRenderer.IsMouseWithin())
+                        if (controlRenderer is ICabViewMouseControlRenderer mouseRenderer && mouseRenderer.IsMouseWithin())
                         {
                             MousePickedControl = mouseRenderer;
                             break;

Original file line number	Diff line number	Diff line change
`@@ -1355,8 +1355,7 @@ void HandleUserInput(ElapsedTime elapsedTime)`
`1355`	`1355`	`{`
`1356`	`1356`	`foreach (var controlRenderer in (PlayerLocomotiveViewer as MSTSLocomotiveViewer)._CabRenderer.ControlMap.Values)`
`1357`	`1357`	`{`
`1358`		`- ICabViewMouseControlRenderer mouseRenderer = controlRenderer as ICabViewMouseControlRenderer;`
`1359`		`- if (mouseRenderer != null && mouseRenderer.IsMouseWithin())`
	`1358`	`+ if (controlRenderer is ICabViewMouseControlRenderer mouseRenderer && mouseRenderer.IsMouseWithin())`
`1360`	`1359`	`{`
`1361`	`1360`	`MouseChangingControl = mouseRenderer;`
`1362`	`1361`	`break;`
`@@ -1384,8 +1383,7 @@ void HandleUserInput(ElapsedTime elapsedTime)`
`1384`	`1383`	`{`
`1385`	`1384`	`foreach (var controlRenderer in (PlayerLocomotiveViewer as MSTSLocomotiveViewer)._CabRenderer.ControlMap.Values)`
`1386`	`1385`	`{`
`1387`		`- ICabViewMouseControlRenderer mouseRenderer = controlRenderer as ICabViewMouseControlRenderer;`
`1388`		`- if (mouseRenderer != null && mouseRenderer.IsMouseWithin())`
	`1386`	`+ if (controlRenderer is ICabViewMouseControlRenderer mouseRenderer && mouseRenderer.IsMouseWithin())`
`1389`	`1387`	`{`
`1390`	`1388`	`MousePickedControl = mouseRenderer;`
`1391`	`1389`	`break;`