test: random next barycoords3

andywiecko · Oct 18, 2024 · 7093402 · 7093402
1 parent ecd4829
commit 7093402
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/Tests/TestUtils.cs b/Tests/TestUtils.cs
@@ -184,7 +184,18 @@ public static void Run<T>(this Triangulator<T> triangulator) where T : unmanaged
             Extensions.Run((dynamic)triangulator);
         public static JobHandle Schedule<T>(this Triangulator<T> triangulator, JobHandle dependencies = default) where T : unmanaged =>
             Extensions.Schedule((dynamic)triangulator, dependencies);
-
+        public static float3 NextBarcoords3(ref this Unity.Mathematics.Random random)
+        {
+            var bx = random.NextFloat();
+            var by = random.NextFloat();
+            if (bx + by > 1)
+            {
+                bx = 1 - bx;
+                by = 1 - by;
+            }
+            var bz = 1 - bx - by;
+            return new(bx, by, bz);
+        }
         public static float2[] CastToFloat2<T>(this IEnumerable<T> data) where T : unmanaged => data.Select(i => default(T) switch
         {
 #if UNITY_MATHEMATICS_FIXEDPOINT

diff --git a/Tests/UnsafeTriangulatorEditorTests.cs b/Tests/UnsafeTriangulatorEditorTests.cs
@@ -550,12 +550,8 @@ public void DynamicInsertTest()
             using var halfedges = new NativeList<int>(Allocator.Persistent);
             using var constrainedHalfedges = new NativeList<bool>(Allocator.Persistent);
             using var constraints = new NativeArray<int>(managedConstraints, Allocator.Persistent);
-
-            t.Triangulate(
-                input: new() { Positions = positions, ConstraintEdges = constraints },
-                output: new() { Positions = outputPositions, Triangles = triangles, Halfedges = halfedges, ConstrainedHalfedges = constrainedHalfedges },
-                args: Args.Default(autoHolesAndBoundary: true), Allocator.Persistent
-            );
+            var input = new LowLevel.Unsafe.InputData<T> { Positions = positions, ConstraintEdges = constraints };
+            var output = new LowLevel.Unsafe.OutputData<T> { Positions = outputPositions, Triangles = triangles, Halfedges = halfedges, ConstrainedHalfedges = constrainedHalfedges };
 
             int FindTriangle(ReadOnlySpan<int> initialTriangles, int j)
             {
@@ -571,6 +567,7 @@ int FindTriangle(ReadOnlySpan<int> initialTriangles, int j)
                 return -1;
             }
 
+            t.Triangulate(input, output, args: Args.Default(autoHolesAndBoundary: true), Allocator.Persistent);
             TestUtils.Draw(outputPositions.AsReadOnly().CastToFloat2(), triangles.AsReadOnly(), Color.red, duration: 5f);
 
             var random = new Unity.Mathematics.Random(seed: 42);
@@ -582,12 +579,7 @@ int FindTriangle(ReadOnlySpan<int> initialTriangles, int j)
                     var i = FindTriangle(initialTriangles, j);
                     if (i != -1)
                     {
-                        var bar = math.abs(random.NextFloat3Direction());
-                        bar /= bar.x + bar.y + bar.z;
-                        bar.z = 1 - bar.x - bar.y;
-
-                        var output = new LowLevel.Unsafe.OutputData<T> { Positions = outputPositions, Triangles = triangles, Halfedges = halfedges, ConstrainedHalfedges = constrainedHalfedges };
-                        t.DynamicInsertPoint(output, i, bar, Allocator.Persistent);
+                        t.DynamicInsertPoint(output, tId: i, bar: random.NextBarcoords3(), allocator: Allocator.Persistent);
                     }
                 }