Enumerator changes

BulletSharp/Collision/DbvtArray.cs

@@ -5,7 +5,7 @@
 
 namespace BulletSharp
 {
-	public class DbvtArrayEnumerator : IEnumerator<Dbvt>
+	public struct DbvtArrayEnumerator : IEnumerator<Dbvt>
 	{
 		private int _i;
 		private int _count;
@@ -30,7 +30,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 
 		public Dbvt Current => _array[_i];
@@ -92,7 +92,12 @@ public void CopyTo(Dbvt[] array, int arrayIndex)
 			}
 		}
 
-		public IEnumerator<Dbvt> GetEnumerator()
+		public DbvtArrayEnumerator GetEnumerator()
+		{
+			return new DbvtArrayEnumerator(this);
+		}
+
+		IEnumerator<Dbvt> IEnumerable<Dbvt>.GetEnumerator()
 		{
 			return new DbvtArrayEnumerator(this);
 		}

BulletSharp/Collision/DbvtNodePtrArray.cs

@@ -5,7 +5,7 @@
 
 namespace BulletSharp
 {
-	public class DbvtNodePtrArrayEnumerator : IEnumerator<DbvtNode>
+	public struct DbvtNodePtrArrayEnumerator : IEnumerator<DbvtNode>
 	{
 		private int _i;
 		private int _count;
@@ -30,7 +30,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 
 		public DbvtNode Current => _array[_i];
@@ -92,7 +92,12 @@ public void CopyTo(DbvtNode[] array, int arrayIndex)
 			}
 		}
 
-		public IEnumerator<DbvtNode> GetEnumerator()
+		public DbvtNodePtrArrayEnumerator GetEnumerator()
+		{
+			return new DbvtNodePtrArrayEnumerator(this);
+		}
+
+		IEnumerator<DbvtNode> IEnumerable<DbvtNode>.GetEnumerator()
 		{
 			return new DbvtNodePtrArrayEnumerator(this);
 		}

BulletSharp/Common/GenericListEnumerator.cs

@@ -3,7 +3,7 @@
 
 namespace BulletSharp
 {
-	public sealed class GenericListEnumerator<T> : IEnumerator<T>
+	public struct GenericListEnumerator<T> : IEnumerator<T>
 	{
 		private int _i;
 		private readonly int _count;
@@ -28,7 +28,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 
 		public void Dispose()

BulletSharp/LinearMath/AlignedBroadphasePairArray.cs

@@ -29,16 +29,17 @@ public BroadphasePair[] Items
 		}
 	}
 
-	public class AlignedBroadphasePairArrayEnumerator : IEnumerator<BroadphasePair>
+	public struct AlignedBroadphasePairArrayEnumerator : IEnumerator<BroadphasePair>
 	{
-		private int _i = -1;
+		private int _i;
 		private readonly int _count;
 		private readonly AlignedBroadphasePairArray _array;
 
 		public AlignedBroadphasePairArrayEnumerator(AlignedBroadphasePairArray array)
 		{
 			_array = array;
 			_count = array.Count;
+			_i = -1;
 		}
 
 		public BroadphasePair Current => _array[_i];
@@ -57,7 +58,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -144,7 +145,12 @@ public bool Remove(BroadphasePair item)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<BroadphasePair> GetEnumerator()
+		public AlignedBroadphasePairArrayEnumerator GetEnumerator()
+		{
+			return new AlignedBroadphasePairArrayEnumerator(this);
+		}
+
+		IEnumerator<BroadphasePair> IEnumerable<BroadphasePair>.GetEnumerator()
 		{
 			return new AlignedBroadphasePairArrayEnumerator(this);
 		}

BulletSharp/LinearMath/AlignedCollisionObjectArray.cs

@@ -29,16 +29,17 @@ public CollisionObject[] Items
 		}
 	}
 
-	public class AlignedCollisionObjectArrayEnumerator : IEnumerator<CollisionObject>
+	public struct AlignedCollisionObjectArrayEnumerator : IEnumerator<CollisionObject>
 	{
-		private int _i = -1;
+		private int _i;
 		private readonly int _count;
 		private readonly IList<CollisionObject> _array;
 
 		public AlignedCollisionObjectArrayEnumerator(IList<CollisionObject> array)
 		{
 			_array = array;
 			_count = array.Count;
+			_i = -1;
 		}
 
 		public CollisionObject Current => _array[_i];
@@ -57,7 +58,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -256,7 +257,12 @@ private void SetBodyBroadphaseHandle(CollisionObject item, BroadphaseInterface b
 			}
 		}
 
-		public IEnumerator<CollisionObject> GetEnumerator()
+		public AlignedCollisionObjectArrayEnumerator GetEnumerator()
+		{
+			return new AlignedCollisionObjectArrayEnumerator(_backingList ?? this as IList<CollisionObject>);
+		}
+
+		IEnumerator<CollisionObject> IEnumerable<CollisionObject>.GetEnumerator()
 		{
 			if (_backingList != null)
 			{

BulletSharp/LinearMath/AlignedIndexedMeshArray.cs

@@ -29,7 +29,7 @@ public IndexedMesh[] Items
 		}
 	}
 
-	public class AlignedIndexedMeshArrayEnumerator : IEnumerator<IndexedMesh>
+	public struct AlignedIndexedMeshArrayEnumerator : IEnumerator<IndexedMesh>
 	{
 		private int _i;
 		private readonly int _count;
@@ -58,7 +58,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -154,7 +154,12 @@ public bool Remove(IndexedMesh item)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<IndexedMesh> GetEnumerator()
+		public AlignedIndexedMeshArrayEnumerator GetEnumerator()
+		{
+			return new AlignedIndexedMeshArrayEnumerator(this);
+		}
+
+		IEnumerator<IndexedMesh> IEnumerable<IndexedMesh>.GetEnumerator()
 		{
 			return _backingList.GetEnumerator();
 		}

BulletSharp/LinearMath/AlignedManifoldArray.cs

@@ -29,7 +29,7 @@ public PersistentManifold[] Items
 		}
 	}
 
-	public class AlignedManifoldArrayEnumerator : IEnumerator<PersistentManifold>
+	public struct AlignedManifoldArrayEnumerator : IEnumerator<PersistentManifold>
 	{
 		private int _i;
 		private readonly int _count;
@@ -58,7 +58,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -144,7 +144,12 @@ public bool Remove(PersistentManifold item)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<PersistentManifold> GetEnumerator()
+		public AlignedManifoldArrayEnumerator GetEnumerator()
+		{
+			return new AlignedManifoldArrayEnumerator(this);
+		}
+
+		IEnumerator<PersistentManifold> IEnumerable<PersistentManifold>.GetEnumerator()
 		{
 			return new AlignedManifoldArrayEnumerator(this);
 		}

BulletSharp/LinearMath/Collections.cs

@@ -29,7 +29,7 @@ public System.Collections.ArrayList Items
 		}
 	};
 
-	public class CompoundShapeChildArrayEnumerator : IEnumerator<CompoundShapeChild>
+	public struct CompoundShapeChildArrayEnumerator : IEnumerator<CompoundShapeChild>
 	{
 		private int _i;
 		private int _count;
@@ -54,15 +54,15 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 
 		public CompoundShapeChild Current => _array[_i];
 
 		object System.Collections.IEnumerator.Current => _array[_i];
 	}
 
-	public class UIntArrayEnumerator : IEnumerator<uint>
+	public struct UIntArrayEnumerator : IEnumerator<uint>
 	{
 		private int _i;
 		private int _count;
@@ -87,7 +87,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 
 		public uint Current => _array[_i];
@@ -147,7 +147,12 @@ public void CopyTo(CompoundShapeChild[] array, int arrayIndex)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<CompoundShapeChild> GetEnumerator()
+		public CompoundShapeChildArrayEnumerator GetEnumerator()
+		{
+			return new CompoundShapeChildArrayEnumerator(this);
+		}
+
+		IEnumerator<CompoundShapeChild> IEnumerable<CompoundShapeChild>.GetEnumerator()
 		{
 			return new CompoundShapeChildArrayEnumerator(this);
 		}
@@ -228,7 +233,12 @@ public void CopyTo(uint[] array, int arrayIndex)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<uint> GetEnumerator()
+		public UIntArrayEnumerator GetEnumerator()
+		{
+			return new UIntArrayEnumerator(this);
+		}
+
+		IEnumerator<uint> IEnumerable<uint>.GetEnumerator()
 		{
 			return new UIntArrayEnumerator(this);
 		}

BulletSharp/Math/Vector3Array.cs

@@ -26,7 +26,7 @@ public Vector3[] Items
         }
     };
 
-    public class Vector3ArrayEnumerator : IEnumerator<Vector3>
+    public struct Vector3ArrayEnumerator : IEnumerator<Vector3>
     {
         private int _i;
         private readonly int _count;
@@ -51,7 +51,7 @@ public bool MoveNext()
 
         public void Reset()
         {
-            _i = 0;
+            _i = -1;
         }
 
         public Vector3 Current => _array[_i];
@@ -127,7 +127,12 @@ public void CopyTo(Vector3[] array, int arrayIndex)
             }
         }
 
-        public IEnumerator<Vector3> GetEnumerator()
+        public Vector3ArrayEnumerator GetEnumerator()
+        {
+            return new Vector3ArrayEnumerator(this);
+        }
+
+        IEnumerator<Vector3> IEnumerable<Vector3>.GetEnumerator()
         {
             return new Vector3ArrayEnumerator(this);
         }

BulletSharp/SoftBody/AlignedAnchorArray.cs

@@ -30,7 +30,7 @@ public Anchor[] Items
 		}
 	}
 
-	public class AlignedAnchorArrayEnumerator : IEnumerator<Anchor>
+	public struct AlignedAnchorArrayEnumerator : IEnumerator<Anchor>
 	{
 		private int _i;
 		private int _count;
@@ -59,7 +59,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -131,7 +131,12 @@ public bool Remove(Anchor item)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<Anchor> GetEnumerator()
+		public AlignedAnchorArrayEnumerator GetEnumerator()
+		{
+			return new AlignedAnchorArrayEnumerator(this);
+		}
+
+		IEnumerator<Anchor> IEnumerable<Anchor>.GetEnumerator()
 		{
 			return new AlignedAnchorArrayEnumerator(this);
 		}

BulletSharp/SoftBody/AlignedClusterArray.cs

@@ -30,7 +30,7 @@ public Cluster[] Items
 		}
 	}
 
-	public class AlignedClusterArrayEnumerator : IEnumerator<Cluster>
+	public struct AlignedClusterArrayEnumerator : IEnumerator<Cluster>
 	{
 		private int _i;
 		private int _count;
@@ -59,7 +59,7 @@ public bool MoveNext()
 
 		public void Reset()
 		{
-			_i = 0;
+			_i = -1;
 		}
 	}
 
@@ -131,7 +131,12 @@ public bool Remove(Cluster item)
 			throw new NotImplementedException();
 		}
 
-		public IEnumerator<Cluster> GetEnumerator()
+		public AlignedClusterArrayEnumerator GetEnumerator()
+		{
+			return new AlignedClusterArrayEnumerator(this);
+		}
+
+		IEnumerator<Cluster> IEnumerable<Cluster>.GetEnumerator()
 		{
 			return new AlignedClusterArrayEnumerator(this);
 		}