refactor: streamline buffer disposal and clearing methods

Author: trgiangv

source/RevitDevTool/Visualization/Render/RenderingBufferStorage.cs

@@ -3,7 +3,7 @@
 namespace RevitDevTool.Visualization.Render;
 
 #nullable disable
-public sealed class RenderingBufferStorage
+public sealed class RenderingBufferStorage : IDisposable
 {
     public VertexFormatBits FormatBits { get; set; }
     public int PrimitiveCount { get; set; }

source/RevitDevTool/Visualization/Server/BoundingBoxVisualizationServer.cs

@@ -143,18 +143,8 @@ public override void RenderScene(Autodesk.Revit.DB.View view, DisplayStyle displ
 
     private void MapGeometryBuffer()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _edgeBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _edgeBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _edgeBuffers.Clear(true);
 
         if (VisualizeGeometries.Count == 0) return;
 
@@ -181,11 +171,7 @@ private void MapGeometryBuffer()
 
     private void MapAxisBuffers()
     {
-        foreach (var buffer in _axisBuffers)
-        {
-            buffer.Dispose();
-        }
-        _axisBuffers.Clear();
+        _axisBuffers.Clear(true);
 
         foreach (var box in VisualizeGeometries)
         {
@@ -235,23 +221,8 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _edgeBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _axisBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _edgeBuffers.Clear();
-        _axisBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _edgeBuffers.Clear(true);
+        _axisBuffers.Clear(true);
     }
 }

source/RevitDevTool/Visualization/Server/Extensions/EnumerableExtensions.cs

@@ -0,0 +1,48 @@
+// ReSharper disable once CheckNamespace
+namespace RevitDevTool.Visualization.Server;
+
+[PublicAPI]
+public static class EnumerableExtensions
+{
+    public static void Dispose<T>(this IEnumerable<T?>? items) where T : IDisposable
+    {
+        if (items is null) return;
+        foreach (var item in items)
+        {
+            item?.Dispose();
+        }
+    }
+    
+    public static void Dispose<T>(this T?[]? items) where T : IDisposable
+    {
+        if (items is null) return;
+        foreach (var item in items)
+        {
+            item?.Dispose();
+        }
+    }
+    
+    public static void Clear<T>(this ICollection<T>? items, bool dispose = false) where T : IDisposable
+    {
+        if (items is null) return;
+
+        if (dispose)
+        {
+            items.Dispose();
+        }
+
+        items.Clear();
+    }
+    
+    public static void Clear<T>(this ICollection<T[]> items, bool dispose = false) where T : IDisposable
+    {
+        if (dispose)
+        {
+            foreach (var item in items)
+            {
+                item.Dispose();
+            }
+        }
+        items.Clear();
+    }
+}

source/RevitDevTool/Visualization/Server/FaceVisualizationServer.cs

@@ -200,23 +200,8 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _meshGridBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _normalBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _meshGridBuffers.Clear();
-        _normalBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _meshGridBuffers.Clear(true);
+        _normalBuffers.Clear(true);
     }
 }

source/RevitDevTool/Visualization/Server/MeshVisualizationServer.cs

@@ -122,18 +122,8 @@ public override void RenderScene(Autodesk.Revit.DB.View view, DisplayStyle displ
 
     private void MapGeometryBuffer()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _meshGridBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _meshGridBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _meshGridBuffers.Clear(true);
 
         if (VisualizeGeometries.Count == 0) return;
 
@@ -160,27 +150,24 @@ private void MapGeometryBuffer()
 
     private void MapNormalsBuffer()
     {
-        foreach (var buffer in _normalBuffers.SelectMany(bufferArray => bufferArray))
-        {
-            buffer.Dispose();
-        }
-        _normalBuffers.Clear();
+        _normalBuffers.Clear(true);
 
         foreach (var mesh in VisualizeGeometries)
         {
             var area = RenderGeometryHelper.ComputeMeshSurfaceArea(mesh);
             var offset = RenderGeometryHelper.InterpolateOffsetByArea(area);
             var normalLength = RenderGeometryHelper.InterpolateAxisLengthByArea(area);
 
-            RenderingBufferStorage[] normals = [];
+            var normals = Enumerable.Range(0, mesh.Vertices.Count)
+                .Select(_ => new RenderingBufferStorage())
+                .ToArray();
+            
             for (var i = 0; i < mesh.Vertices.Count; i++)
             {
                 var vertex = mesh.Vertices[i];
-                var buffer = new RenderingBufferStorage();
+                var buffer = normals[i];
                 var normal = RenderGeometryHelper.GetMeshVertexNormal(mesh, i, mesh.DistributionOfNormals);
-
                 RenderHelper.MapNormalVectorBuffer(buffer, vertex + normal * (offset + _extrusion), normal, normalLength);
-                normals = normals.Append(buffer).ToArray();
             }
 
             _normalBuffers.Add(normals);
@@ -214,23 +201,8 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _meshGridBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _normalBuffers.SelectMany(bufferArray => bufferArray))
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _meshGridBuffers.Clear();
-        _normalBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _meshGridBuffers.Clear(true);
+        _normalBuffers.Clear(true);
     }
 }

source/RevitDevTool/Visualization/Server/PolylineVisualizationServer.cs

@@ -117,18 +117,8 @@ public override void RenderScene(Autodesk.Revit.DB.View view, DisplayStyle displ
 
     private void MapGeometryBuffer()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _curveBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _curveBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _curveBuffers.Clear(true);
 
         if (VisualizeGeometries.Count == 0) return;
 
@@ -163,12 +153,7 @@ private void MapGeometryBuffer()
 
     private void MapDirectionsBuffer()
     {
-        foreach (var buffer in _normalsBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _normalsBuffers.Clear();
+        _normalsBuffers.Clear(true);
 
         if (VisualizeGeometries.Count == 0) return;
 
@@ -245,23 +230,8 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var buffer in _surfaceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _curveBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _normalsBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _surfaceBuffers.Clear();
-        _curveBuffers.Clear();
-        _normalsBuffers.Clear();
+        _surfaceBuffers.Clear(true);
+        _curveBuffers.Clear(true);
+        _normalsBuffers.Clear(true);
     }
 }

source/RevitDevTool/Visualization/Server/SolidVisualizationServer.cs

@@ -170,17 +170,7 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var buffer in _faceBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        foreach (var buffer in _edgeBuffers)
-        {
-            buffer.Dispose();
-        }
-
-        _faceBuffers.Clear();
-        _edgeBuffers.Clear();
+        _faceBuffers.Clear(true);
+        _edgeBuffers.Clear(true);
     }
 }

source/RevitDevTool/Visualization/Server/XyzVisualizationServer.cs

@@ -230,23 +230,7 @@ private void UpdateEffects()
 
     protected override void DisposeBuffers()
     {
-        foreach (var bufferArray in _planeBufferArrays)
-        {
-            foreach (var buffer in bufferArray)
-            {
-                buffer.Dispose();
-            }
-        }
-        
-        foreach (var bufferArray in _axisBufferArrays)
-        {
-            foreach (var buffer in bufferArray)
-            {
-                buffer.Dispose();
-            }
-        }
-
-        _axisBufferArrays.Clear();
-        _planeBufferArrays.Clear();
+        _axisBufferArrays.Clear(true);
+        _planeBufferArrays.Clear(true);
     }
 }