Dispose unmarked shapes' buffers

Author: Sharpe49

Source/RunActivity/Viewer3D/Shapes.cs

@@ -101,7 +101,10 @@ public void Mark(SharedShape shape)
         public void Sweep()
         {
             foreach (var path in ShapeMarks.Where(kvp => !kvp.Value).Select(kvp => kvp.Key))
+            {
+                Shapes[path].Dispose();
                 Shapes.Remove(path);
+            }
         }
 
         [CallOnThread("Updater")]
@@ -1343,7 +1346,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
         }
     }
 
-    public class ShapePrimitive : RenderPrimitive
+    public class ShapePrimitive : RenderPrimitive, IDisposable
     {
         public Material Material { get; protected set; }
         public int[] Hierarchy { get; protected set; } // the hierarchy from the sub_object
@@ -1394,6 +1397,13 @@ public virtual void Mark()
         {
             Material.Mark();
         }
+
+        public void Dispose()
+        {
+            VertexBuffer.Dispose();
+            IndexBuffer.Dispose();
+            PrimitiveCount = 0;
+        }
     }
 
     /// <summary>
@@ -1535,7 +1545,7 @@ public virtual void Mark()
     }
 #endif
 
-    public class SharedShape
+    public class SharedShape : IDisposable
     {
         static List<string> ShapeWarnings = new List<string>();
 
@@ -1668,7 +1678,7 @@ void LoadContent()
             }
         }
 
-        public class LodControl
+        public class LodControl : IDisposable
         {
             public DistanceLevel[] DistanceLevels;
 
@@ -1687,11 +1697,21 @@ public LodControl(lod_control MSTSlod_control, Helpers.TextureFlags textureFlags
             internal void Mark()
             {
                 foreach (var dl in DistanceLevels)
+                {
                     dl.Mark();
+                }
+            }
+
+            public void Dispose()
+            {
+                foreach (var dl in DistanceLevels)
+                {
+                    dl.Dispose();
+                }
             }
         }
 
-        public class DistanceLevel
+        public class DistanceLevel : IDisposable
         {
             public float ViewingDistance;
             public float ViewSphereRadius;
@@ -1726,11 +1746,21 @@ public DistanceLevel(distance_level MSTSdistance_level, Helpers.TextureFlags tex
             internal void Mark()
             {
                 foreach (var so in SubObjects)
+                {
                     so.Mark();
+                }
+            }
+
+            public void Dispose()
+            {
+                foreach (var so in SubObjects)
+                {
+                    so.Dispose();
+                }
             }
         }
 
-        public class SubObject
+        public class SubObject : IDisposable
         {
             static readonly SceneryMaterialOptions[] UVTextureAddressModeMap = new[] {
                 SceneryMaterialOptions.TextureAddressModeWrap,
@@ -1951,7 +1981,17 @@ public SubObject(sub_object sub_object, ref int totalPrimitiveIndex, int[] hiera
             internal void Mark()
             {
                 foreach (var prim in ShapePrimitives)
+                {
                     prim.Mark();
+                }
+            }
+
+            public void Dispose()
+            {
+                foreach (var prim in ShapePrimitives)
+                {
+                    prim.Dispose();
+                }
             }
         }
 
@@ -2180,7 +2220,17 @@ internal void Mark()
         {
             Viewer.ShapeManager.Mark(this);
             foreach (var lod in LodControls)
+            {
                 lod.Mark();
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var lod in LodControls)
+            {
+                lod.Dispose();
+            }
         }
     }