Fix HACD index passing #89

Author: AndresTraks

BulletSharp/Extras/Hacd.cs

@@ -49,7 +49,7 @@ public void DenormalizeData()
 			HACD_HACD_DenormalizeData(Native);
 		}
 
-		public bool GetCH(int numCH, double[] points, long[] triangles)
+		public bool GetCH(int numCH, double[] points, int[] triangles)
 		{
 			if (points.Length < GetNPointsCH(numCH))
 			{
@@ -92,15 +92,15 @@ public double[] GetPoints()
 			return pointsArray;
 		}
 
-		public long[] GetTriangles()
+		public int[] GetTriangles()
 		{
 			IntPtr trianglesPtr = HACD_HACD_GetTriangles(Native);
 			int trianglesLen = NTriangles * 3;
 			if (trianglesLen == 0 || trianglesPtr == IntPtr.Zero)
 			{
-				return new long[0];
+				return new int[0];
 			}
-			long[] trianglesArray = new long[trianglesLen];
+			int[] trianglesArray = new int[trianglesLen];
 			Marshal.Copy(trianglesPtr, trianglesArray, 0, trianglesLen);
 			return trianglesArray;
 		}
@@ -162,15 +162,15 @@ public void SetPoints(ICollection<Vector3> points)
 			SetPoints(pointsArray);
 		}
 
-		public void SetTriangles(ICollection<long> triangles)
+		public void SetTriangles(ICollection<int> triangles)
 		{
-			long[] trianglesLong;
+			int[] trianglesArray;
 			int arrayLen = triangles.Count;
-			trianglesLong = triangles as long[];
-			if (trianglesLong == null)
+			trianglesArray = triangles as int[];
+			if (trianglesArray == null)
 			{
-				trianglesLong = new long[arrayLen];
-				triangles.CopyTo(trianglesLong, 0);
+				trianglesArray = new int[arrayLen];
+				triangles.CopyTo(trianglesArray, 0);
 			}
 
 			IntPtr trianglesPtr = HACD_HACD_GetTriangles(Native);
@@ -179,24 +179,12 @@ public void SetTriangles(ICollection<long> triangles)
 				Marshal.FreeHGlobal(trianglesPtr);
 			}
 
-			trianglesPtr = Marshal.AllocHGlobal(sizeof(long) * arrayLen);
-			Marshal.Copy(trianglesLong, 0, trianglesPtr, arrayLen);
+			trianglesPtr = Marshal.AllocHGlobal(sizeof(int) * arrayLen);
+			Marshal.Copy(trianglesArray, 0, trianglesPtr, arrayLen);
 			HACD_HACD_SetTriangles(Native, trianglesPtr);
 			NTriangles = arrayLen / 3;
 		}
 
-		public void SetTriangles(ICollection<int> triangles)
-		{
-			int n = triangles.Count;
-			long[] trianglesLong = new long[n];
-			int i = 0;
-			foreach (int t in triangles)
-			{
-				trianglesLong[i++] = t;
-			}
-			SetTriangles(trianglesLong);
-		}
-
 		public bool AddExtraDistPoints
 		{
 			get => HACD_HACD_GetAddExtraDistPoints(Native);

BulletSharp/demos/ConvexDecompositionDemo/ConvexDecomposition.cs

@@ -19,7 +19,7 @@ public ConvexDecomposition(WavefrontWriter wavefrontWriter = null)
 
         public Vector3 LocalScaling { get; set; } = new Vector3(1, 1, 1);
 
-        public void Result(Vector3[] hullVertices, long[] hullIndices)
+        public void Result(Vector3[] hullVertices, int[] hullIndices)
         {
             _wavefrontWriter.OutputObject(hullVertices, hullIndices);
 

BulletSharp/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cs

@@ -230,7 +230,7 @@ private CompoundShape CreateCompoundShape(Hacd hacd, Vector3 localScaling)
                 {
                     continue;
                 }
-                var triangles = new long[trianglesLen];
+                var triangles = new int[trianglesLen];
 
                 int nVertices = hacd.GetNPointsCH(c);
                 var points = new double[nVertices * 3];

BulletSharp/demos/ConvexDecompositionDemo/WavefrontWriter.cs

@@ -11,7 +11,7 @@ internal sealed class WavefrontWriter : IDisposable
         private StreamWriter _outputStream;
         private CultureInfo _floatFormat = new CultureInfo("en-US");
 
-        private long _baseIndex = 0;
+        private int _baseIndex = 0;
         private int _objectCount = 0;
 
         public WavefrontWriter(string filename)
@@ -20,7 +20,7 @@ public WavefrontWriter(string filename)
             _outputStream = new StreamWriter(_outputFile);
         }
 
-        public void OutputObject(Vector3[] hullVertices, long[] hullIndices)
+        public void OutputObject(Vector3[] hullVertices, int[] hullIndices)
         {
             _outputStream.WriteLine("## Object {0} with {1} vertices and {2} triangles.", _objectCount, hullVertices.Length, hullIndices.Length / 3);
 
@@ -34,9 +34,9 @@ public void OutputObject(Vector3[] hullVertices, long[] hullIndices)
 
             for (int i = 0; i < hullIndices.Length; i += 3)
             {
-                long index0 = _baseIndex + hullIndices[i];
-                long index1 = _baseIndex + hullIndices[i + 1];
-                long index2 = _baseIndex + hullIndices[i + 2];
+                int index0 = _baseIndex + hullIndices[i];
+                int index1 = _baseIndex + hullIndices[i + 1];
+                int index2 = _baseIndex + hullIndices[i + 2];
 
                 _outputStream.WriteLine("f {0} {1} {2}", index0 + 1, index1 + 1, index2 + 1);
             }