Remove IDebugDraw, because btIDebugDraw is not an interface

Author: AndresTraks

BulletSharp/Collision/CollisionWorld.cs

@@ -611,7 +611,7 @@ public class CollisionWorld : IDisposable
 	{
 		internal IntPtr Native;
 
-		internal IDebugDraw _debugDrawer;
+		private DebugDraw _debugDrawer;
 		private BroadphaseInterface _broadphase;
 		private Dispatcher _dispatcher;
 		private DispatcherInfo _dispatchInfo;
@@ -846,36 +846,15 @@ public BroadphaseInterface Broadphase
 
 		public AlignedCollisionObjectArray CollisionObjectArray { get; protected set; }
 
-		public IDebugDraw DebugDrawer
+		public DebugDraw DebugDrawer
 		{
 			get => _debugDrawer;
 			set
 			{
-				if (_debugDrawer != null)
+				if (_debugDrawer != value)
 				{
-					if (_debugDrawer == value) {
-						return;
-					}
-
-					// Clear IDebugDraw wrapper
-					if (!(_debugDrawer is DebugDraw)) {
-						//btIDebugDrawer_delete(btCollisionWorld_getDebugDrawer(Native));
-					}
-				}
-
-				_debugDrawer = value;
-				if (value == null) {
-					btCollisionWorld_setDebugDrawer(Native, IntPtr.Zero);
-					return;
-				}
-
-				DebugDraw cast = value as DebugDraw;
-				if (cast != null) {
-					btCollisionWorld_setDebugDrawer(Native, cast._native);
-				} else {
-					// Create IDebugDraw wrapper, remember to delete it
-					IntPtr wrapper = DebugDraw.CreateWrapper(value, false);
-					btCollisionWorld_setDebugDrawer(Native, wrapper);
+					_debugDrawer = value;
+					btCollisionWorld_setDebugDrawer(Native, value != null ? value._native : IntPtr.Zero);
 				}
 			}
 		}

BulletSharp/Collision/ConvexCast.cs

@@ -10,6 +10,8 @@ public class CastResult : IDisposable
 		{
 			internal IntPtr Native;
 
+			private DebugDraw _debugDrawer;
+
 			internal CastResult(IntPtr native)
 			{
 				Native = native;
@@ -41,10 +43,14 @@ public float AllowedPenetration
 				set => btConvexCast_CastResult_setAllowedPenetration(Native, value);
 			}
 
-			public IDebugDraw DebugDrawer
+			public DebugDraw DebugDrawer
 			{
-				get => BulletSharp.DebugDraw.GetManaged(btConvexCast_CastResult_getDebugDrawer(Native));
-				set => btConvexCast_CastResult_setDebugDrawer(Native, BulletSharp.DebugDraw.GetUnmanaged(value));
+				get => _debugDrawer;
+				set
+				{
+					_debugDrawer = value;
+					btConvexCast_CastResult_setDebugDrawer(Native, value != null ? value._native : IntPtr.Zero);
+				}
 			}
 
 			public float Fraction

BulletSharp/Collision/ConvexPenetrationDepthSolver.cs

@@ -15,11 +15,11 @@ internal ConvexPenetrationDepthSolver(IntPtr native)
 
 		public bool CalcPenDepth(VoronoiSimplexSolver simplexSolver, ConvexShape convexA,
 			ConvexShape convexB, Matrix transA, Matrix transB, out Vector3 v, out Vector3 pa,
-			out Vector3 pb, IDebugDraw debugDraw)
+			out Vector3 pb, DebugDraw debugDraw)
 		{
 			return btConvexPenetrationDepthSolver_calcPenDepth(Native, simplexSolver.Native,
 				convexA.Native, convexB.Native, ref transA, ref transB, out v, out pa,
-				out pb, DebugDraw.GetUnmanaged(debugDraw));
+				out pb, debugDraw != null ? debugDraw._native : IntPtr.Zero);
 		}
 
 		public void Dispose()

BulletSharp/Collision/DiscreteCollisionDetectorInterface.cs

@@ -120,11 +120,11 @@ internal DiscreteCollisionDetectorInterface(IntPtr native)
 			Native = native;
 		}
 
-		public void GetClosestPoints(ClosestPointInput input, Result output, IDebugDraw debugDraw,
+		public void GetClosestPoints(ClosestPointInput input, Result output, DebugDraw debugDraw,
 			bool swapResults = false)
 		{
 			btDiscreteCollisionDetectorInterface_getClosestPoints(Native, input.Native,
-				output.Native, DebugDraw.GetUnmanaged(debugDraw), swapResults);
+				output.Native, debugDraw != null ? debugDraw._native : IntPtr.Zero, swapResults);
 		}
 
 		public void Dispose()

BulletSharp/Collision/Dispatcher.cs

@@ -37,10 +37,10 @@ public float ConvexConservativeDistanceThreshold
 			set => btDispatcherInfo_setConvexConservativeDistanceThreshold(Native, value);
 		}
 
-		public IDebugDraw DebugDraw
+		public DebugDraw DebugDraw
 		{
-			get => BulletSharp.DebugDraw.GetManaged(btDispatcherInfo_getDebugDraw(Native));
-			set => btDispatcherInfo_setDebugDraw(Native, BulletSharp.DebugDraw.GetUnmanaged(value));
+			get => DebugDraw.GetManaged(btDispatcherInfo_getDebugDraw(Native));
+			set => btDispatcherInfo_setDebugDraw(Native, value != null ? value._native : IntPtr.Zero);
 		}
 
 		public bool DeterministicOverlappingPairs

BulletSharp/Collision/GjkPairDetector.cs

@@ -27,10 +27,10 @@ public GjkPairDetector(ConvexShape objectA, ConvexShape objectB, int shapeTypeA,
 		}
 
 		public void GetClosestPointsNonVirtual(ClosestPointInput input, Result output,
-			IDebugDraw debugDraw)
+			DebugDraw debugDraw)
 		{
 			btGjkPairDetector_getClosestPointsNonVirtual(Native, input.Native,
-				output.Native, DebugDraw.GetUnmanaged(debugDraw));
+				output.Native, debugDraw != null ? debugDraw._native : IntPtr.Zero);
 		}
 
 		public void SetIgnoreMargin(bool ignoreMargin)

BulletSharp/Dynamics/ConstraintSolver.cs

@@ -21,9 +21,9 @@ internal ConstraintSolver(IntPtr native, bool preventDelete)
 			_preventDelete = preventDelete;
 		}
 
-		public void AllSolved(ContactSolverInfo __unnamed0, IDebugDraw __unnamed1)
+		public void AllSolved(ContactSolverInfo __unnamed0, DebugDraw __unnamed1)
 		{
-			btConstraintSolver_allSolved(Native, __unnamed0.Native, DebugDraw.GetUnmanaged(__unnamed1));
+			btConstraintSolver_allSolved(Native, __unnamed0.Native, __unnamed1 != null ? __unnamed1._native : IntPtr.Zero);
 		}
 
 		public void PrepareSolve(int __unnamed0, int __unnamed1)

BulletSharp/Dynamics/Featherstone/MultiBodyConstraint.cs

@@ -26,9 +26,9 @@ public void CreateConstraintRows(MultiBodyConstraintArray constraintRows,
 				data.Native, infoGlobal.Native);
 		}
 		*/
-		public void DebugDraw(IDebugDraw drawer)
+		public void DebugDraw(DebugDraw drawer)
 		{
-			btMultiBodyConstraint_debugDraw(Native, BulletSharp.DebugDraw.GetUnmanaged(drawer));
+			btMultiBodyConstraint_debugDraw(Native, drawer._native);
 		}
 
 		public void FinalizeMultiDof()

BulletSharp/Dynamics/IAction.cs

@@ -7,7 +7,7 @@ namespace BulletSharp
 {
 	public interface IAction
 	{
-		void DebugDraw(IDebugDraw debugDrawer);
+		void DebugDraw(DebugDraw debugDrawer);
 		void UpdateAction(CollisionWorld collisionWorld, float deltaTimeStep);
 	}
 

BulletSharp/Dynamics/KinematicCharacterController.cs

@@ -445,7 +445,7 @@ public virtual void UpdateAction(CollisionWorld collisionWorld, float deltaTime)
         }
 
         ///btActionInterface interface
-        public void DebugDraw(IDebugDraw debugDrawer)
+        public void DebugDraw(DebugDraw debugDrawer)
         {
         }