Add some helpers to fix a mem leak :(

mcmonkey4eva · Dec 21, 2016 · 4199964 · 4199964
1 parent 42f734b
commit 4199964
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/BEPUphysics/BroadPhaseEntries/Collidable.cs b/BEPUphysics/BroadPhaseEntries/Collidable.cs
@@ -42,13 +42,23 @@ protected set
                     shape.ShapeChanged -= shapeChangedDelegate;
                 shape = value;
                 if (shape != null)
+                {
                     shape.ShapeChanged += shapeChangedDelegate;
+                }
                 OnShapeChanged(shape);
 
                 //TODO: Watch out for unwanted references in the delegate lists.
             }
         }
 
+        ~Collidable()
+        {
+            if (shape != null)
+            {
+                shape.ShapeChanged -= shapeChangedDelegate;
+            }
+        }
+
         protected internal abstract IContactEventTriggerer EventTriggerer { get; }
 
 

diff --git a/BEPUphysics/CollisionShapes/CollisionShape.cs b/BEPUphysics/CollisionShapes/CollisionShape.cs
@@ -14,10 +14,14 @@ public abstract class CollisionShape
         ///</summary>
         public event Action<CollisionShape> ShapeChanged;
 
+        public void ClearShapeChanged()
+        {
+            ShapeChanged = null;
+        }
+
         protected virtual void OnShapeChanged()
         {
-            if (ShapeChanged != null)
-                ShapeChanged(this);
+                ShapeChanged?.Invoke(this);
         }
 
         public CollisionShape Duplicate()

diff --git a/BEPUphysics/Entities/EntityBase.cs b/BEPUphysics/Entities/EntityBase.cs
@@ -445,13 +445,30 @@ protected set
                     collisionInformation.Shape.ShapeChanged -= shapeChangedDelegate;
                 collisionInformation = value;
                 if (collisionInformation != null)
+                {
                     collisionInformation.Shape.ShapeChanged += shapeChangedDelegate;
+                }
                 //Entity constructors do their own initialization when the collision information changes.
                 //Might be able to condense it up here, but don't really need it right now.
                 //ShapeChangedHandler(collisionInformation.shape);
             }
         }
 
+        ~Entity()
+        {
+            if (collisionInformation != null)
+            {
+                if (collisionInformation.shape != null)
+                {
+                    collisionInformation.shape.ShapeChanged -= shapeChangedDelegate;
+                }
+            }
+            if (material != null)
+            {
+                material.MaterialChanged -= materialChangedDelegate;
+            }
+        }
+
         //protected internal object locker = new object();
         /////<summary>
         ///// Gets the synchronization object used by systems that need