Implemented thread safe GenerateConvexMeshes function.

LICENSE.md.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1cd39da8a5283a746bbb0c7f6eb50757
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/MeshSafe.cs

@@ -0,0 +1,19 @@
+using UnityEngine;
+
+namespace MeshProcess
+{
+    public struct MeshSafe
+    {
+        public Vector3[] Vertices;
+        public int[] Triangles;
+
+        public Mesh ToMesh()
+        {
+            return new Mesh
+            {
+                vertices = Vertices,
+                triangles = Triangles
+            };
+        }
+    }
+}

Runtime/MeshSafe.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 182d52cf7acb8c2409432384bf11f643

Runtime/VHACD.cs

@@ -1,11 +1,14 @@
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using UnityEngine;
+using Utils;
 
 namespace MeshProcess
 {
+#if UTILS
+    [HideScriptField]
+#endif
     public class VHACD : MonoBehaviour
     {
         [System.Serializable]
@@ -31,42 +34,42 @@ namespace MeshProcess
                 m_projectHullVertices = true; // This will project the output convex hull vertices onto the original source mesh to increase the floating point accuracy of the results
             }
 
-            [Tooltip("maximum concavity")]
+            [Tooltip("Maximum concavity")]
             [Range(0, 1)]
             public double m_concavity;
 
-            [Tooltip("controls the bias toward clipping along symmetry planes")]
+            [Tooltip("Controls the bias toward clipping along symmetry planes.")]
             [Range(0, 1)]
             public double m_alpha;
 
-            [Tooltip("controls the bias toward clipping along revolution axes")]
+            [Tooltip("Controls the bias toward clipping along revolution axes.")]
             [Range(0, 1)]
             public double m_beta;
 
-            [Tooltip("controls the adaptive sampling of the generated convex-hulls")]
+            [Tooltip("Controls the adaptive sampling of the generated convex-hulls.")]
             [Range(0, 0.01f)]
             public double m_minVolumePerCH;
 
             public void* m_callback;
             public void* m_logger;
 
-            [Tooltip("maximum number of voxels generated during the voxelization stage")]
+            [Tooltip("Maximum number of voxels generated during the voxelization stage.")]
             [Range(10000, 64000000)]
             public uint m_resolution;
 
-            [Tooltip("controls the maximum number of triangles per convex-hull")]
+            [Tooltip("Controls the maximum number of triangles per convex-hull.")]
             [Range(4, 1024)]
             public uint m_maxNumVerticesPerCH;
 
-            [Tooltip("controls the granularity of the search for the \"best\" clipping plane")]
+            [Tooltip("Controls the granularity of the search for the \"best\" clipping plane")]
             [Range(1, 16)]
             public uint m_planeDownsampling;
 
-            [Tooltip("controls the precision of the convex-hull generation process during the clipping plane selection stage")]
+            [Tooltip("Controls the precision of the convex-hull generation process during the clipping plane selection stage.")]
             [Range(1, 16)]
             public uint m_convexhullDownsampling;
 
-            [Tooltip("enable/disable normalizing the mesh before applying the convex decomposition")]
+            [Tooltip("Enable/disable normalizing the mesh before applying the convex decomposition.")]
             [Range(0, 1)]
             public uint m_pca;
 
@@ -82,7 +85,7 @@ namespace MeshProcess
 
             public uint m_maxConvexHulls;
 
-            [Tooltip("This will project the output convex hull vertices onto the original source mesh to increase the floating point accuracy of the results")]
+            [Tooltip("This will project the output convex hull vertices onto the original source mesh to increase the floating point accuracy of the results.")]
             public bool m_projectHullVertices;
         };
 
@@ -130,7 +133,6 @@ namespace MeshProcess
 
         public VHACD() { m_parameters.Init(); }
 
-        [ContextMenu("Generate Convex Meshes")]
         public unsafe List<Mesh> GenerateConvexMeshes(Mesh mesh = null)
         {
             if (mesh == null)
@@ -184,6 +186,58 @@ namespace MeshProcess
                 hullMesh.SetTriangles(indices, 0);
 
 
+                convexMesh.Add(hullMesh);
+            }
+            return convexMesh;
+        }
+        
+        public unsafe List<MeshSafe> GenerateConvexMeshes(Vector3[] verts, int[] tris)
+        {
+            var vhacd = CreateVHACD();
+            var parameters = m_parameters;
+
+            fixed (Vector3* pVerts = verts)
+            fixed (int* pTris = tris)
+            {
+                ComputeFloat(
+                    vhacd,
+                    (float*)pVerts, (uint)verts.Length,
+                    (uint*)pTris, (uint)tris.Length / 3,
+                    &parameters);
+            }
+
+            var numHulls = GetNConvexHulls(vhacd);
+            List<MeshSafe> convexMesh = new List<MeshSafe>((int)numHulls);
+            foreach (var index in Enumerable.Range(0, (int)numHulls))
+            {
+                ConvexHull hull;
+                GetConvexHull(vhacd, (uint)index, &hull);
+
+                var hullMesh = new MeshSafe();
+                var hullVerts = new Vector3[hull.m_nPoints];
+                fixed (Vector3* pHullVerts = hullVerts)
+                {
+                    var pComponents = hull.m_points;
+                    var pVerts = pHullVerts;
+
+                    for (var pointCount = hull.m_nPoints; pointCount != 0; --pointCount)
+                    {
+                        pVerts->x = (float)pComponents[0];
+                        pVerts->y = (float)pComponents[1];
+                        pVerts->z = (float)pComponents[2];
+
+                        pVerts += 1;
+                        pComponents += 3;
+                    }
+                }
+
+                hullMesh.Vertices = hullVerts;
+
+                var indices = new int[hull.m_nTriangles * 3];
+                Marshal.Copy((System.IntPtr)hull.m_triangles, indices, 0, indices.Length);
+                hullMesh.Triangles = indices;
+
+
                 convexMesh.Add(hullMesh);
             }
             return convexMesh;

Runtime/vhacd.asmdef

@@ -1,15 +1,22 @@
 {
     "name": "vhacd",
-    "rootNamespace": "VHACD",
+    "rootNamespace": "MeshProcess",
-    "references": [],
+    "references": [
-    "includePlatforms": [
+        "GUID:80ed647da8ce73c45b66c239eba0365a"
     ],
+    "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "ru.shazbot.utils",
+            "expression": "",
+            "define": "UTILS"
+        }
+    ],
     "noEngineReferences": false
 }

package.json

@@ -1,9 +1,18 @@
 {
-  "name": "com.unity.robotics.vhacd",
+  "name": "ru.shazbot.vhacd",
-  "version": "0.0.1-preview",
+  "version": "1.0.0",
   "displayName": "VHACD",
-  "description": "",
+  "description": "Based on https://github.com/Unity-Technologies/VHACD",
+  "licensesUrl": "https://git.well-placed.de/InnoLab/VHACD/src/LICENSE.md",
   "unity": "2020.3",
   "unityRelease": "19f1",
-  "_fingerprint": "d52fd80370d9257cb417999c6f5eab56604b3da9"
+  "keywords": [
-}
+    "vhacd"
+  ],
+  "author": {
+    "name": "Alexander Filippov",
+    "email": "alexander@shazbot.ru",
+    "url": "https://shazbot.ru/"
+  },
+  "dependencies": { }
+}