Cleanup 5

Source/Editor/Content/AssetItemConverter.cs

@@ -26,8 +26,7 @@ namespace FlaxEditor.Content
         {
             if (reader.TokenType == JsonToken.String)
             {
-                Guid id;
+                FlaxEngine.Json.JsonSerializer.ParseID((string)reader.Value, out Guid id);
-                FlaxEngine.Json.JsonSerializer.ParseID((string)reader.Value, out id);
                 return Editor.Instance.ContentDatabase.Find(id);
             }
 

Source/Editor/Content/Import/ImportFileEntry.cs

@@ -113,8 +113,7 @@ namespace FlaxEditor.Content.Import
             extension = extension.ToLower();
 
             // Check if use overriden type
-            ImportFileEntryHandler createDelegate;
+            if (FileTypes.TryGetValue(extension, out ImportFileEntryHandler createDelegate))
-            if (FileTypes.TryGetValue(extension, out createDelegate))
                 return createDelegate(ref request);
 
             // Use default type

Source/Editor/CustomEditors/Editors/GuidEditor.cs

@@ -26,8 +26,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
         private void OnEditEnd()
         {
-            Guid value;
+            if (Guid.TryParse(_element.Text, out Guid value))
-            if (Guid.TryParse(_element.Text, out value))
             {
                 SetValue(value);
             }

Source/Editor/CustomEditors/Editors/QuaternionEditor.cs

@@ -63,8 +63,7 @@ namespace FlaxEditor.CustomEditors.Editors
             float z = ZElement.FloatValue.Value;
             var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding;
             var token = isSliding ? this : null;
-            Quaternion value;
+            Quaternion.Euler(x, y, z, out Quaternion value);
-            Quaternion.Euler(x, y, z, out value);
             SetValue(value, token);
         }
 

Source/Editor/GUI/Dialogs/ColorPickerDialog.cs

@@ -251,8 +251,7 @@ namespace FlaxEditor.GUI.Dialogs
             if (_disableEvents)
                 return;
 
-            Color color;
+            if (Color.TryParseHex(_cHex.Text, out Color color))
-            if (Color.TryParseHex(_cHex.Text, out color))
                 SelectedColor = color;
         }
 

Source/Editor/GUI/Docking/DockPanelProxy.cs

@@ -402,8 +402,7 @@ namespace FlaxEditor.GUI.Docking
                 else if (MouseDownWindow != null && _panel.TabsCount > 1)
                 {
                     // Check if mouse left current tab rect
-                    Rectangle currWinRect;
+                    GetTabRect(MouseDownWindow, out Rectangle currWinRect);
-                    GetTabRect(MouseDownWindow, out currWinRect);
                     if (!currWinRect.Contains(location))
                     {
                         int index = _panel.GetTabIndex(MouseDownWindow);

Source/Editor/GUI/Drag/DragActors.cs

@@ -112,8 +112,7 @@ namespace FlaxEditor.GUI.Drag
                     for (int i = 0; i < ids.Length; i++)
                     {
                         // Find element
-                        Guid id;
+                        if (Guid.TryParse(ids[i], out Guid id))
-                        if (Guid.TryParse(ids[i], out id))
                         {
                             var obj = Editor.Instance.Scene.GetActorNode(id);
 

Source/Editor/GUI/Drag/DragScripts.cs

@@ -98,8 +98,7 @@ namespace FlaxEditor.GUI.Drag
                     for (int i = 0; i < ids.Length; i++)
                     {
                         // Find element
-                        Guid id;
+                        if (Guid.TryParse(ids[i], out Guid id))
-                        if (Guid.TryParse(ids[i], out id))
                         {
                             var obj = FlaxEngine.Object.Find<Script>(ref id);
 
@@ -129,8 +128,7 @@ namespace FlaxEditor.GUI.Drag
                 for (int i = 0; i < ids.Length; i++)
                 {
                     // Find element
-                    Guid id;
+                    if (Guid.TryParse(ids[i], out Guid id))
-                    if (Guid.TryParse(ids[i], out id))
                     {
                         var obj = FlaxEngine.Object.Find<Script>(ref id);
 

Source/Editor/GUI/Input/LongValueBox.cs

@@ -117,8 +117,7 @@ namespace FlaxEditor.GUI.Input
         protected override void TryGetValue()
         {
             // Try to parse long
-            long value;
+            if (long.TryParse(Text, out long value))
-            if (long.TryParse(Text, out value))
             {
                 // Set value
                 Value = value;

Source/Editor/Gizmo/TransformGizmoBase.Selection.cs

@@ -46,8 +46,7 @@ namespace FlaxEditor.Gizmo
 
             // Transform ray into local space of the gizmo
             Ray localRay;
-            Matrix invGizmoWorld;
+            Matrix.Invert(ref _gizmoWorld, out Matrix invGizmoWorld);
-            Matrix.Invert(ref _gizmoWorld, out invGizmoWorld);
             Vector3.TransformNormal(ref ray.Direction, ref invGizmoWorld, out localRay.Direction);
             Vector3.Transform(ref ray.Position, ref invGizmoWorld, out localRay.Position);
 

Source/Editor/Gizmo/TransformGizmoBase.cs

@@ -157,9 +157,8 @@ namespace FlaxEditor.Gizmo
             _screenScale = vLength.Length / GizmoScaleFactor * gizmoSize;
             Matrix.Scaling(_screenScale, out _screenScaleMatrix);
 
-            Matrix rotation;
             Quaternion orientation = GetSelectedObject(0).Orientation;
-            Matrix.RotationQuaternion(ref orientation, out rotation);
+            Matrix.RotationQuaternion(ref orientation, out Matrix rotation);
             _localForward = rotation.Forward;
             _localUp = rotation.Up;
 

Source/Editor/Modules/ContentImportingModule.cs

@@ -124,8 +124,7 @@ namespace FlaxEditor.Modules
         /// <param name="skipSettingsDialog">True if skip any popup dialogs showing for import options adjusting. Can be used when importing files from code.</param>
         public void Reimport(BinaryAssetItem item, object settings = null, bool skipSettingsDialog = false)
         {
-            string importPath;
+            if (item != null && !item.GetImportPath(out string importPath))
-            if (item != null && !item.GetImportPath(out importPath))
             {
                 // Check if input file is missing
                 if (!System.IO.File.Exists(importPath))

Source/Editor/Modules/WindowsModule.cs

@@ -415,8 +415,7 @@ namespace FlaxEditor.Modules
 
                 writer.WriteStartElement("Panel");
 
-                float splitterValue;
+                DockState state = p.TryGetDockState(out float splitterValue);
-                DockState state = p.TryGetDockState(out splitterValue);
 
                 writer.WriteAttributeString("DockState", ((int)state).ToString());
                 writer.WriteAttributeString("SplitterValue", splitterValue.ToString(CultureInfo.InvariantCulture));
@@ -684,8 +683,7 @@ namespace FlaxEditor.Modules
             }
 
             // Check if it's an asset ID
-            Guid id;
+            if (Guid.TryParse(typename, out Guid id))
-            if (Guid.TryParse(typename, out id))
             {
                 var el = Editor.ContentDatabase.Find(id);
                 if (el != null)

Source/Editor/SceneGraph/GUI/ActorTreeNode.cs

@@ -125,9 +125,8 @@ namespace FlaxEditor.SceneGraph.GUI
             }
             else
             {
-                QueryFilterHelper.Range[] ranges;
                 var text = Text;
-                if (QueryFilterHelper.Match(filterText, text, out ranges))
+                if (QueryFilterHelper.Match(filterText, text, out QueryFilterHelper.Range[] ranges))
                 {
                     // Update highlights
                     if (_highlights == null)

Source/Editor/SceneGraph/SceneGraphFactory.cs

@@ -76,8 +76,7 @@ namespace FlaxEditor.SceneGraph
             if (id == Guid.Empty)
                 return null;
 
-            SceneGraphNode result;
+            Nodes.TryGetValue(id, out SceneGraphNode result);
-            Nodes.TryGetValue(id, out result);
             return result;
         }
 
@@ -88,8 +87,7 @@ namespace FlaxEditor.SceneGraph
         /// <returns>The result node.</returns>
         public static SceneGraphNode GetNode(Guid id)
         {
-            SceneGraphNode result;
+            Nodes.TryGetValue(id, out SceneGraphNode result);
-            Nodes.TryGetValue(id, out result);
             if (result == null)
             {
                 var actor = Object.TryFind<Actor>(ref id);

Source/Editor/Surface/SurfaceRootControl.cs

@@ -37,8 +37,7 @@ namespace FlaxEditor.Surface
             // Push clipping mask
             if (ClipChildren)
             {
-                Rectangle clientArea;
+                GetDesireClientArea(out Rectangle clientArea);
-                GetDesireClientArea(out clientArea);
                 Render2D.PushClip(ref clientArea);
             }
 

Source/Editor/Surface/VisjectSurface.Context.cs

@@ -54,8 +54,7 @@ namespace FlaxEditor.Surface
                 return;
 
             // Get or create context
-            VisjectSurfaceContext surfaceContext;
+            if (!_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext))
-            if (!_contextCache.TryGetValue(context, out surfaceContext))
             {
                 surfaceContext = CreateContext(_context, context);
                 _context?.Children.Add(surfaceContext);
@@ -119,8 +118,7 @@ namespace FlaxEditor.Surface
             }
 
             // Check if has context in cache
-            VisjectSurfaceContext surfaceContext;
+            if (_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext))
-            if (_contextCache.TryGetValue(context, out surfaceContext))
             {
                 // Remove from navigation path
                 while (ContextStack.Contains(surfaceContext))
@@ -149,8 +147,7 @@ namespace FlaxEditor.Surface
                 return;
 
             // Check if already in a path
-            VisjectSurfaceContext surfaceContext;
+            if (_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext) && ContextStack.Contains(surfaceContext))
-            if (_contextCache.TryGetValue(context, out surfaceContext) && ContextStack.Contains(surfaceContext))
             {
                 // Change stack
                 do

Source/Editor/Surface/VisjectSurfaceWindow.cs

@@ -980,10 +980,10 @@ namespace FlaxEditor.Surface
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
 
-            if (float.TryParse(node.GetAttribute("Split1"), out value1))
+            if (float.TryParse(node.GetAttribute("Split1"), out float value1))
                 _split1.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Split2"), out value1))
                 _split2.SplitterValue = value1;
         }

Source/Editor/Tools/Foliage/PaintTab.cs

@@ -282,8 +282,7 @@ namespace FlaxEditor.Tools.Foliage
                     };
 
                     // Try restore painting with the given model ID
-                    bool itemChecked;
+                    if (!Tab.FoliageTypeModelIdsToPaint.TryGetValue(model.ID, out bool itemChecked))
-                    if (!Tab.FoliageTypeModelIdsToPaint.TryGetValue(model.ID, out itemChecked))
                     {
                         // Enable by default
                         itemChecked = true;

Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs

@@ -310,10 +310,9 @@ namespace FlaxEditor.Tools.Terrain
                 throw new InvalidOperationException("Cannot set cursor then no terrain is selected.");
             var brushBounds = CursorBrushBounds;
             var patchesCount = terrain.PatchesCount;
-            BoundingBox tmp;
             for (int patchIndex = 0; patchIndex < patchesCount; patchIndex++)
             {
-                terrain.GetPatchBounds(patchIndex, out tmp);
+                terrain.GetPatchBounds(patchIndex, out BoundingBox tmp);
                 if (!tmp.Intersects(ref brushBounds))
                     continue;
 

Source/Editor/Tools/Terrain/SculptTerrainGizmoMode.cs

@@ -329,10 +329,9 @@ namespace FlaxEditor.Tools.Terrain
                 throw new InvalidOperationException("Cannot set cursor then no terrain is selected.");
             var brushBounds = CursorBrushBounds;
             var patchesCount = terrain.PatchesCount;
-            BoundingBox tmp;
             for (int patchIndex = 0; patchIndex < patchesCount; patchIndex++)
             {
-                terrain.GetPatchBounds(patchIndex, out tmp);
+                terrain.GetPatchBounds(patchIndex, out BoundingBox tmp);
                 if (!tmp.Intersects(ref brushBounds))
                     continue;
 

Source/Editor/Utilities/Utils.cs

@@ -1691,8 +1691,7 @@ namespace FlaxEditor.Utilities
                 orientation = Quaternion.LookRotation(dir, Vector3.Cross(Vector3.Cross(dir, Vector3.Up), dir));
             Vector3 up = Vector3.Up * orientation;
             box.Transformation = Matrix.CreateWorld(min + vec * 0.5f, dir, up);
-            Matrix inv;
+            Matrix.Invert(ref box.Transformation, out Matrix inv);
-            Matrix.Invert(ref box.Transformation, out inv);
             Vector3 vecLocal = Vector3.TransformNormal(vec * 0.5f, inv);
             box.Extents.X = margin;
             box.Extents.Y = margin;

Source/Editor/Viewport/Cameras/ArcBallCamera.cs

@@ -99,8 +99,7 @@ namespace FlaxEditor.Viewport.Cameras
         {
             centerMouse = true;
 
-            EditorViewport.Input input;
+            Viewport.GetInput(out EditorViewport.Input input);
-            Viewport.GetInput(out input);
 
             // Rotate
             Viewport.YawPitch += mouseDelta;

Source/Editor/Viewport/Cameras/FPSCamera.cs

@@ -85,8 +85,7 @@ namespace FlaxEditor.Viewport.Cameras
         /// <param name="actor">The actor to preview.</param>
         public void ShowActor(Actor actor)
         {
-            BoundingSphere sphere;
+            Editor.GetActorEditorSphere(actor, out BoundingSphere sphere);
-            Editor.GetActorEditorSphere(actor, out sphere);
             ShowSphere(ref sphere);
         }
 
@@ -104,8 +103,7 @@ namespace FlaxEditor.Viewport.Cameras
             {
                 if (actors[i] is ActorNode actor)
                 {
-                    BoundingSphere sphere;
+                    Editor.GetActorEditorSphere(actor.Actor, out BoundingSphere sphere);
-                    Editor.GetActorEditorSphere(actor.Actor, out sphere);
                     BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
                 }
             }

Source/Engine/Core/Math/HalfUtils.cs

@@ -52,8 +52,10 @@ namespace FlaxEngine
         /// <returns>The float value</returns>
         public static float Unpack(ushort h)
         {
-            var conv = new FloatToUint();
+            var conv = new FloatToUint
-            conv.uintValue = HalfToFloatMantissaTable[HalfToFloatOffsetTable[h >> 10] + (((uint)h) & 0x3ff)] + HalfToFloatExponentTable[h >> 10];
+            {
+                uintValue = HalfToFloatMantissaTable[HalfToFloatOffsetTable[h >> 10] + (((uint)h) & 0x3ff)] + HalfToFloatExponentTable[h >> 10]
+            };
             return conv.floatValue;
         }
 
@@ -64,8 +66,10 @@ namespace FlaxEngine
         /// <returns>The half value</returns>
         public static ushort Pack(float f)
         {
-            FloatToUint conv = new FloatToUint();
+            FloatToUint conv = new FloatToUint
-            conv.floatValue = f;
+            {
+                floatValue = f
+            };
             return (ushort)(FloatToHalfBaseTable[(conv.uintValue >> 23) & 0x1ff] + ((conv.uintValue & 0x007fffff) >> FloatToHalfShiftTable[(conv.uintValue >> 23) & 0x1ff]));
         }
 

Source/Engine/Core/Math/Matrix.cs

@@ -695,20 +695,22 @@ namespace FlaxEngine
             Orthonormalize(ref temp, out Q);
             Q.Transpose();
 
-            R = new Matrix();
+            R = new Matrix
-            R.M11 = Vector4.Dot(Q.Column1, Column1);
+            {
-            R.M12 = Vector4.Dot(Q.Column1, Column2);
+                M11 = Vector4.Dot(Q.Column1, Column1),
-            R.M13 = Vector4.Dot(Q.Column1, Column3);
+                M12 = Vector4.Dot(Q.Column1, Column2),
-            R.M14 = Vector4.Dot(Q.Column1, Column4);
+                M13 = Vector4.Dot(Q.Column1, Column3),
+                M14 = Vector4.Dot(Q.Column1, Column4),
 
-            R.M22 = Vector4.Dot(Q.Column2, Column2);
+                M22 = Vector4.Dot(Q.Column2, Column2),
-            R.M23 = Vector4.Dot(Q.Column2, Column3);
+                M23 = Vector4.Dot(Q.Column2, Column3),
-            R.M24 = Vector4.Dot(Q.Column2, Column4);
+                M24 = Vector4.Dot(Q.Column2, Column4),
 
-            R.M33 = Vector4.Dot(Q.Column3, Column3);
+                M33 = Vector4.Dot(Q.Column3, Column3),
-            R.M34 = Vector4.Dot(Q.Column3, Column4);
+                M34 = Vector4.Dot(Q.Column3, Column4),
 
-            R.M44 = Vector4.Dot(Q.Column4, Column4);
+                M44 = Vector4.Dot(Q.Column4, Column4)
+            };
         }
 
         /// <summary>
@@ -720,20 +722,22 @@ namespace FlaxEngine
         {
             Orthonormalize(ref this, out Q);
 
-            L = new Matrix();
+            L = new Matrix
-            L.M11 = Vector4.Dot(Q.Row1, Row1);
+            {
+                M11 = Vector4.Dot(Q.Row1, Row1),
 
-            L.M21 = Vector4.Dot(Q.Row1, Row2);
+                M21 = Vector4.Dot(Q.Row1, Row2),
-            L.M22 = Vector4.Dot(Q.Row2, Row2);
+                M22 = Vector4.Dot(Q.Row2, Row2),
 
-            L.M31 = Vector4.Dot(Q.Row1, Row3);
+                M31 = Vector4.Dot(Q.Row1, Row3),
-            L.M32 = Vector4.Dot(Q.Row2, Row3);
+                M32 = Vector4.Dot(Q.Row2, Row3),
-            L.M33 = Vector4.Dot(Q.Row3, Row3);
+                M33 = Vector4.Dot(Q.Row3, Row3),
 
-            L.M41 = Vector4.Dot(Q.Row1, Row4);
+                M41 = Vector4.Dot(Q.Row1, Row4),
-            L.M42 = Vector4.Dot(Q.Row2, Row4);
+                M42 = Vector4.Dot(Q.Row2, Row4),
-            L.M43 = Vector4.Dot(Q.Row3, Row4);
+                M43 = Vector4.Dot(Q.Row3, Row4),
-            L.M44 = Vector4.Dot(Q.Row4, Row4);
+                M44 = Vector4.Dot(Q.Row4, Row4)
+            };
         }
 
         /// <summary>

Source/Engine/UI/GUI/CanvasContainer.cs

@@ -32,8 +32,11 @@ namespace FlaxEngine.GUI
         private bool IntersectsChildContent(CanvasRootControl child, ref Ray ray, out Vector2 childSpaceLocation)
         {
             // Inline bounds calculations (it will reuse world matrix)
-            OrientedBoundingBox bounds = new OrientedBoundingBox();
+            OrientedBoundingBox bounds = new OrientedBoundingBox
-            bounds.Extents = new Vector3(child.Size * 0.5f, Mathf.Epsilon);
+            {
+                Extents = new Vector3(child.Size * 0.5f, Mathf.Epsilon)
+            };
+
             child.Canvas.GetWorldMatrix(out var world);
             Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out var offset);
             Matrix.Multiply(ref offset, ref world, out bounds.Transformation);

Source/Engine/UI/GUI/Panels/Panel.cs

@@ -64,8 +64,10 @@ namespace FlaxEngine.GUI
                         VScrollBar = GetChild<VScrollBar>();
                     if (VScrollBar == null)
                     {
-                        VScrollBar = new VScrollBar(this, Width - ScrollBar.DefaultSize, Height);
+                        VScrollBar = new VScrollBar(this, Width - ScrollBar.DefaultSize, Height)
-                        VScrollBar.AnchorPreset = AnchorPresets.TopLeft;
+                        {
+                            AnchorPreset = AnchorPresets.TopLeft
+                        };
                         //VScrollBar.X += VScrollBar.Width;
                         VScrollBar.ValueChanged += () => SetViewOffset(Orientation.Vertical, VScrollBar.Value);
                     }
@@ -82,8 +84,10 @@ namespace FlaxEngine.GUI
                         HScrollBar = GetChild<HScrollBar>();
                     if (HScrollBar == null)
                     {
-                        HScrollBar = new HScrollBar(this, Height - ScrollBar.DefaultSize, Width);
+                        HScrollBar = new HScrollBar(this, Height - ScrollBar.DefaultSize, Width)
-                        HScrollBar.AnchorPreset = AnchorPresets.TopLeft;
+                        {
+                            AnchorPreset = AnchorPresets.TopLeft
+                        };
                         //HScrollBar.Y += HScrollBar.Height;
                         //HScrollBar.Offsets += new Margin(0, 0, HScrollBar.Height * 0.5f, 0);
                         HScrollBar.ValueChanged += () => SetViewOffset(Orientation.Horizontal, HScrollBar.Value);

Source/Engine/UI/UICanvas.cs

@@ -234,8 +234,10 @@ namespace FlaxEngine
         /// </summary>
         public UICanvas()
         {
-            _guiRoot = new CanvasRootControl(this);
+            _guiRoot = new CanvasRootControl(this)
-            _guiRoot.IsLayoutLocked = false;
+            {
+                IsLayoutLocked = false
+            };
         }
 
         /// <summary>
@@ -245,12 +247,12 @@ namespace FlaxEngine
         {
             get
             {
-                OrientedBoundingBox bounds = new OrientedBoundingBox();
+                OrientedBoundingBox bounds = new OrientedBoundingBox
-                bounds.Extents = new Vector3(_guiRoot.Size * 0.5f, Mathf.Epsilon);
+                {
-                Matrix world;
+                    Extents = new Vector3(_guiRoot.Size * 0.5f, Mathf.Epsilon)
-                GetWorldMatrix(out world);
+                };
-                Matrix offset;
+                GetWorldMatrix(out Matrix world);
-                Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out offset);
+                Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out Matrix offset);
                 Matrix.Multiply(ref offset, ref world, out bounds.Transformation);
                 return bounds;
             }

Source/Engine/UI/UIControl.cs

@@ -161,9 +161,11 @@ namespace FlaxEngine
             if (!(_control is ContainerControl))
                 throw new InvalidOperationException("To add child to the control it has to be ContainerControl.");
 
-            var child = new UIControl();
+            var child = new UIControl
-            child.Parent = this;
+            {
-            child.Control = (Control)Activator.CreateInstance(typeof(T));
+                Parent = this,
+                Control = (Control)Activator.CreateInstance(typeof(T))
+            };
             return child;
         }