DYN-9099 Voronoi Delaunay nodes fix

.github/scripts/check_file_version.ps1

@@ -45,7 +45,7 @@ $excludedFiles = @(
     "libSkiaSharp.dll",     # https://jira.autodesk.com/browse/DYN-6598
     "LiveChartsCore*.dll",
     "Lucene.Net*.dll",
-    "MIConvexHull.NET Standard.dll",
+    "MIConvexHull.dll",
     "Microsoft.*",
     "MimeMapping.dll",
     "Moq.dll",

src/Dynamo.All.sln

@@ -117,6 +117,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoUtilitiesTests", "..\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeometryColorTests", "..\test\Libraries\GeometryColorTests\GeometryColorTests.csproj", "{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TessellationTests", "..\test\Libraries\TessellationTests\TessellationTests.csproj", "{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageManagerTests", "..\test\Libraries\PackageManagerTests\PackageManagerTests.csproj", "{2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoMSOfficeTests", "..\test\Libraries\DynamoMSOfficeTests\DynamoMSOfficeTests.csproj", "{269039F1-126A-46CF-8BEA-257587EDCA6B}"
@@ -522,6 +524,10 @@ Global
 		{C4964946-B367-44EE-9ED2-451FF2A83D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4964946-B367-44EE-9ED2-451FF2A83D32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{773988FE-EDF6-45CB-A63F-482955EB3553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{773988FE-EDF6-45CB-A63F-482955EB3553}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{773988FE-EDF6-45CB-A63F-482955EB3553}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -581,6 +587,7 @@ Global
 		{4A707244-154B-428F-B589-D65361F24401} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{AB735028-22B0-4083-9CC5-805C582818EA} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
+		{B5C64B59-6D12-4B8A-9A7B-1C0C5E7A1A2F} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{2A70F3B5-7AEA-42FE-8DD5-8427C28D0025} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{269039F1-126A-46CF-8BEA-257587EDCA6B} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{2C6A6573-28B0-4239-BD33-6AECCD25106C} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}

src/Libraries/Tesellation/ConvexHull.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
 using MIConvexHull;
@@ -18,11 +18,10 @@
         public static IEnumerable<Curve> ByPoints(IEnumerable<Point> points)
         {
             var verts = points.Select(Vertex3.FromPoint).ToList();
-            const double DefaultPlaneDistanceTolerance = 1e-6;
-            var triResult = ConvexHull<Vertex3, TriangleFace>.Create(verts, DefaultPlaneDistanceTolerance);
+            var triResult = MIConvexHull.ConvexHull.Create<Vertex3, TriangleFace>(verts);
 
             // make edges
-            foreach (var face in triResult.Faces)
+            foreach (var face in triResult.Result.Faces)
             {
                 // form lines for use in dynamo or revit
                 var start1 = face.Vertices[0].AsPoint();

src/Libraries/Tesellation/Delaunay.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
 using MIConvexHull;
@@ -19,8 +19,18 @@ public static class Delaunay
         /// <search>uvs</search>
         public static IEnumerable<Curve> ByParametersOnSurface(IEnumerable<UV> uvs, Surface face)
         {
-            var verts = uvs.Select(Vertex2.FromUV).ToList();
-            var triangulation = DelaunayTriangulation<Vertex2, Cell2>.Create(verts);
+            var uvList = uvs?.ToList();
+            if (uvList == null || uvList.Count == 0 || face == null)
+                yield break;
+
+            // Get normalized UV scaling factors to handle anisotropic parameter spaces
+            var (normU, normV) = UvScalingUtilities.GetNormalizedUvScales(face);
+
+            // Build Delaunay in anisotropically scaled (u*normU, v*normV) space.
+            var verts = uvList.Select(uv => new Vertex2(uv.U * normU, uv.V * normV)).ToList();
+
+            const double PlaneDistanceTolerance = 1e-6;
+            var triangulation = DelaunayTriangulation<Vertex2, Cell2>.Create(verts, PlaneDistanceTolerance);
 
             // there are three vertices per cell in 2D
             foreach (var cell in triangulation.Cells)
@@ -29,9 +39,9 @@ public static IEnumerable<Curve> ByParametersOnSurface(IEnumerable<UV> uvs, Surf
                 var v2 = cell.Vertices[1].AsVector();
                 var v3 = cell.Vertices[2].AsVector();
 
-                var xyz1 = face.PointAtParameter(v1.X, v1.Y);
-                var xyz2 = face.PointAtParameter(v2.X, v2.Y);
-                var xyz3 = face.PointAtParameter(v3.X, v3.Y);
+                var xyz1 = face.PointAtParameter(v1.X / normU, v1.Y / normV);
+                var xyz2 = face.PointAtParameter(v2.X / normU, v2.Y / normV);
+                var xyz3 = face.PointAtParameter(v3.X / normU, v3.Y / normV);
 
                 if (xyz1.DistanceTo(xyz2) > 0.1)
                 {
@@ -41,14 +51,14 @@ public static IEnumerable<Curve> ByParametersOnSurface(IEnumerable<UV> uvs, Surf
 
                 if (xyz2.DistanceTo(xyz3) > 0.1)
                 {
-                    var l1 = Line.ByStartPointEndPoint(xyz3, xyz2);
-                    yield return l1;
+                    var l2 = Line.ByStartPointEndPoint(xyz3, xyz2);
+                    yield return l2;
                 }
 
                 if (xyz3.DistanceTo(xyz1) > 0.1)
                 {
-                    var l1 = Line.ByStartPointEndPoint(xyz1, xyz3);
-                    yield return l1;
+                    var l3 = Line.ByStartPointEndPoint(xyz1, xyz3);
+                    yield return l3;
                 }
             }
         }
@@ -60,7 +70,8 @@ public static IEnumerable<Curve> ByParametersOnSurface(IEnumerable<UV> uvs, Surf
         public static IEnumerable<Curve> ByPoints(IEnumerable<Point> points)
         {
             var verts = points.Select(Vertex3.FromPoint).ToList();
-            var triResult = DelaunayTriangulation<Vertex3, Tetrahedron>.Create(verts);
+            const double PlaneDistanceTolerance = 1e-6;
+            var triResult = DelaunayTriangulation<Vertex3, Tetrahedron>.Create(verts, PlaneDistanceTolerance);
 
             // make edges
             foreach (var cell in triResult.Cells)
@@ -88,4 +99,4 @@ public static IEnumerable<Curve> ByPoints(IEnumerable<Point> points)
             }
         }
     }
-}
+}

src/Libraries/Tesellation/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -9,3 +10,6 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("89ae6d07-95ef-49e7-b607-22dc7a7013cf")]
+
+// Make internal types visible to test assembly
+[assembly: InternalsVisibleTo("TessellationTests")]

src/Libraries/Tesellation/Tessellation.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -14,10 +14,9 @@
     <NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="MIConvexHull" version="1.1.19.1019" CopyPDB="true" />
+	<PackageReference Include="StarMath" version="2.0.17.1019" CopyPDB="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_232_0_0" Version="4.0.0.4313"/>
-
-    <PackageReference Include="MIConvexHull" version="1.1.17.411" CopyPDB="true" />
-	  <PackageReference Include="StarMath" version="2.0.17.1019" CopyPDB="true" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>

src/Libraries/Tesellation/UvScalingUtilities.cs

@@ -0,0 +1,43 @@
+using Autodesk.DesignScript.Geometry;
+
+namespace Tessellation
+{
+    /// <summary>
+    ///     Utility functions for UV scaling on surfaces.
+    /// </summary>
+    internal static class UvScalingUtilities
+    {
+        /// <summary>
+        ///     Computes normalized UV scaling factors for a surface to handle anisotropic parameter spaces.
+        ///     The scaling preserves the aspect ratio while keeping values in a reasonable numerical range.
+        /// </summary>
+        /// <param name="face">Surface to compute scaling factors for.</param>
+        /// <returns>Tuple containing normalized U and V scale factors.</returns>
+        internal static (double normU, double normV) GetNormalizedUvScales(Surface face)
+        {
+            // Physical scale per unit U/V based on iso-curve lengths along surface edges.
+            double scaleU;
+            double scaleV;
+            using (var uCurveV0 = face.GetIsoline(0, 0))
+            using (var uCurveV1 = face.GetIsoline(0, 1))
+            using (var vCurveU0 = face.GetIsoline(1, 0))
+            using (var vCurveU1 = face.GetIsoline(1, 1))
+            {
+                scaleU = (uCurveV0.Length + uCurveV1.Length) / 2.0;
+                scaleV = (vCurveU0.Length + vCurveU1.Length) / 2.0;
+            }
+
+            // Normalize scales to keep values in a reasonable range, preserve aspect ratio
+            var max = System.Math.Max(scaleU, scaleV);
+            if (max <= 1e-9) max = 1.0;
+
+            var normU = scaleU / max;
+            var normV = scaleV / max;
+
+            if (normU <= 1e-9) normU = 1.0;
+            if (normV <= 1e-9) normV = 1.0;
+
+            return (normU, normV);
+        }
+    }
+}

src/Libraries/Tesellation/Voronoi.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
 using MIConvexHull;
@@ -19,16 +19,34 @@ public static class Voronoi
         /// <search>uvs</search>
         public static IEnumerable<Curve> ByParametersOnSurface(IEnumerable<UV> uvs, Surface face)
         {
-            var verts = uvs.Select(Vertex2.FromUV).ToList();
+            var uvList = uvs?.ToList();
+            if (uvList == null || uvList.Count == 0 || face == null)
+                yield break;
+
+            // Get normalized UV scaling factors to handle anisotropic parameter spaces
+            var (normU, normV) = UvScalingUtilities.GetNormalizedUvScales(face);
+
+            // Anisotropic scaling only by aspect ratio
+            var verts = uvList.Select(uv => new Vertex2(uv.U * normU, uv.V * normV)).ToList();
             var voronoiMesh = VoronoiMesh.Create<Vertex2, Cell2>(verts);
 
-            return from edge in voronoiMesh.Edges
-                   let _from = edge.Source.Circumcenter
-                   let to = edge.Target.Circumcenter
-                   let start = face.PointAtParameter(_from.X, _from.Y)
-                   let end = face.PointAtParameter(to.X, to.Y)
-                   where start.DistanceTo(end) > 0.1
-                   select Line.ByStartPointEndPoint(start, end);
+            foreach (var edge in voronoiMesh.Edges)
+            {
+                // Map circumcenters back to UV
+                var cFrom = edge.Source.Circumcenter;
+                var cTo = edge.Target.Circumcenter;
+
+                var u1 = cFrom.X / normU;
+                var v1 = cFrom.Y / normV;
+                var u2 = cTo.X / normU;
+                var v2 = cTo.Y / normV;
+
+                var start = face.PointAtParameter(u1, v1);
+                var end = face.PointAtParameter(u2, v2);
+
+                if (start.DistanceTo(end) > 0.1)
+                    yield return Line.ByStartPointEndPoint(start, end);
+            }
         }
     }
-}
+}