trenchfoot 0.4.5__py3-none-any.whl → 0.4.6__py3-none-any.whl

trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj

@@ -39,11 +39,11 @@ v 0 -0.5 0
 v 5 -0.5 0
 v 5 0.5 0
 v 0 0.5 0
-f 21 22 25
-f 22 26 25
-f 22 23 26
-f 23 27 26
-f 23 24 27
-f 24 28 27
+f 21 25 28
+f 26 25 21
 f 24 21 28
-f 21 25 28
+f 26 21 22
+f 23 24 28
+f 27 26 22
+f 23 28 27
+f 27 22 23

trenchfoot/scenarios/S02_straight_slope_pipe/trench_scene.obj

@@ -39,14 +39,14 @@ v 0 -0.6 0
 v 6 -0.6 0
 v 6 0.6 0
 v 0 0.6 0
-f 21 22 25
-f 22 26 25
-f 22 23 26
-f 23 27 26
-f 23 24 27
-f 24 28 27
-f 24 21 28
 f 21 25 28
+f 26 25 21
+f 24 21 28
+f 26 21 22
+f 23 24 28
+f 27 26 22
+f 23 28 27
+f 27 22 23
 g pipe0_pipe_side
 v 0.000625 0.15 -0.45
 v 0.000625 0.149678838 -0.440189531

trenchfoot/scenarios/S03_L_slope_two_pipes_box/metrics.json

@@ -3,7 +3,7 @@
     "trench_bottom": 8.700070386125077,
     "trench_cap_for_volume": 11.999999999999995,
     "trench_walls": 24.52316671923435,
-    "ground_surface": 59.160000000000004,
+    "ground_surface": 51.0,
     "pipe0_pipe_side": 5.935372500201484,
     "pipe0_pipe_cap_neg": 0.07063537956855451,
     "pipe0_pipe_cap_pos": 0.071425607283709,

trenchfoot/scenarios/S03_L_slope_two_pipes_box/trench_scene.obj

@@ -57,16 +57,16 @@ v 6.6 4 0
 v 5.4 4 0
 v 5.4 0.6 0
 v 0 0.6 0
-f 31 36 35
-f 31 32 36
-f 32 37 36
-f 32 33 37
+f 31 35 40
+f 40 39 38
+f 36 35 31
+f 34 31 40
+f 36 31 32
+f 34 40 38
+f 37 36 32
+f 33 34 38
+f 37 32 33
 f 33 38 37
-f 38 39 33
-f 33 34 39
-f 34 40 39
-f 34 35 40
-f 34 31 35
 g pipe0_pipe_side
 v 0.000625 0.15 -0.6
 v 0.000625 0.149678838 -0.590189531

trenchfoot/scenarios/S04_U_slope_multi_noise/metrics.json

@@ -3,7 +3,7 @@
     "trench_bottom": 12.801270744247573,
     "trench_cap_for_volume": 22.400000000000006,
     "trench_walls": 42.22261815604488,
-    "ground_surface": 132.16000000000003,
+    "ground_surface": 59.07999999999999,
     "pipe0_pipe_side": 7.151839814107351,
     "pipe0_pipe_cap_neg": 0.10171494657871849,
     "pipe0_pipe_cap_pos": 0.10484536711202849,

trenchfoot/scenarios/S04_U_slope_multi_noise/trench_scene.obj

@@ -75,18 +75,18 @@ v 0 3.3 0
 v 5.3 3.3 0
 v 5.3 0.7 0
 v 0 0.7 0
-f 41 46 45
-f 41 42 46
-f 42 47 46
-f 47 48 42
-f 42 43 48
-f 48 49 43
-f 49 50 43
-f 43 44 50
-f 44 51 50
-f 44 52 51
-f 44 41 52
 f 41 45 52
+f 52 51 50
+f 46 45 41
+f 44 41 52
+f 52 50 49
+f 46 41 42
+f 44 52 49
+f 47 46 42
+f 44 49 48
+f 47 42 43
+f 43 44 48
+f 48 47 43
 g pipe0_pipe_side
 v 0.000625 0.182470407 -0.599919127
 v 0.000625 0.182996762 -0.587968667

trenchfoot/scenarios/S05_wide_slope_pair/metrics.json

@@ -3,7 +3,7 @@
     "trench_bottom": 27.46494373197848,
     "trench_cap_for_volume": 28.808998594189276,
     "trench_walls": 20.140580271019434,
-    "ground_surface": 73.282890173969,
+    "ground_surface": 66.26069676663535,
     "pipe0_pipe_side": 4.331483060278016,
     "pipe0_pipe_cap_neg": 0.12557400812187478,
     "pipe0_pipe_cap_pos": 0.12557400812187475,

trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj

@@ -57,16 +57,16 @@ v 10.2 3 0.159
 v 7.8 3 0.111
 v 7.8 1.2 0.138
 v 0 1.2 -0.018
-f 31 36 35
-f 31 32 36
-f 32 37 36
-f 32 33 37
+f 31 35 40
+f 40 39 38
+f 36 35 31
+f 34 31 40
+f 36 31 32
+f 33 34 40
+f 37 36 32
+f 33 40 38
+f 37 32 33
 f 33 38 37
-f 38 39 33
-f 33 34 39
-f 34 40 39
-f 34 35 40
-f 34 31 35
 g pipe0_pipe_side
 v -0.0345830287 0.0738026477 -0.352
 v -0.0345086698 0.0733809379 -0.338919374

trenchfoot/scenarios/S06_bumpy_wide_loop/metrics.json

@@ -1,10 +1,10 @@
 {
   "surface_area_by_group": {
-    "trench_bottom": 61.67228672101475,
+    "trench_bottom": 61.67408796224451,
     "trench_cap_for_volume": 66.92240390116315,
     "trench_walls": 44.05215564684328,
     "inner_column_lid": 16.194111766683047,
-    "ground_surface": 75.06246105242614,
+    "ground_surface": 75.06246105242616,
     "ground_island": 16.194111766683047,
     "pipe0_pipe_side": 2.919515320927018,
     "pipe0_pipe_cap_neg": 0.17855884505565078,
@@ -22,11 +22,11 @@
     ]
   },
   "volumes": {
-    "trench_from_surface": -64.57410868962761,
-    "trench_flux_integral_div1": -64.57410868962761
+    "trench_from_surface": -64.58714145117246,
+    "trench_flux_integral_div1": -64.58714145117246
   },
   "footprint_area_top": 66.92240390116315,
-  "footprint_area_bottom": 61.67228672101475,
+  "footprint_area_bottom": 61.67408796224451,
   "width_top": 2.6,
   "width_bottom": 2.396,
   "noise": {

trenchfoot/scenarios/S06_bumpy_wide_loop/sdf_metadata.json

@@ -7,28 +7,28 @@
       "type": "polygon",
       "vertices_xy": [
         [
-          -0.8953594528137068,
-          -1.116169465122313
+          2.5384776310850237,
+          3.7
         ],
         [
-          4.0,
-          -2.3400093283257397
+          0.5817886672782502,
+          1.7433110361932265
         ],
         [
-          9.3,
-          -1.0150093283257395
+          0.8953594528137068,
+          1.116169465122313
         ],
         [
-          9.3,
-          6.3
+          4.0,
+          0.34000932832573977
         ],
         [
-          1.4615223689149763,
-          6.3
+          6.7,
+          1.0150093283257398
         ],
         [
-          -2.58178866727825,
-          2.2566889638067735
+          6.7,
+          3.7
         ]
       ],
       "z_level": 0.2

trenchfoot/scenarios/S06_bumpy_wide_loop/trench_scene.obj

@@ -11,18 +11,18 @@ v 6.80187671 0.935123555 -0.511689565
 v 6.80181521 3.80163041 -0.421590352
 v 2.49609161 3.80172752 -0.489413999
 v 0.457856931 1.76380692 -0.602087047
-f 1 2 7
-f 2 8 7
-f 2 3 8
-f 3 9 8
-f 3 4 9
-f 4 10 9
-f 4 5 10
-f 5 11 10
-f 5 6 11
 f 6 12 11
-f 6 1 12
-f 1 7 12
+f 7 12 6
+f 6 1 2
+f 4 5 6
+f 7 6 2
+f 4 6 11
+f 8 7 2
+f 4 11 10
+f 9 8 2
+f 3 4 10
+f 9 2 3
+f 3 10 9
 g trench_walls
 v -0.892560896 -1.10493339 0.154479527
 v 3.99645065 -2.3542598 0.188030469
@@ -109,18 +109,18 @@ v 9.3 -1.01500933 0.30904972
 v 9.3 6.3 0.5285
 v 1.46152237 6.3 0.410922836
 v -2.58178867 2.25668896 0.228973839
-f 61 62 67
-f 62 68 67
-f 62 63 68
-f 63 69 68
-f 63 64 69
-f 64 70 69
-f 64 65 70
-f 65 71 70
-f 65 66 71
 f 66 72 71
-f 66 61 72
-f 61 67 72
+f 67 72 66
+f 61 62 63
+f 65 66 71
+f 67 66 61
+f 64 65 71
+f 68 67 61
+f 64 71 70
+f 68 61 63
+f 63 64 70
+f 69 68 63
+f 63 70 69
 g ground_island
 v 0.895359453 1.11616947 0.246915476
 v 4 0.340009328 0.27020028

trenchfoot/scenarios/S07_circular_well/metrics.json

@@ -1,7 +1,7 @@
 {
   "surface_area_by_group": {
-    "trench_bottom": 16.473997911050567,
-    "trench_cap_for_volume": 18.819290943275632,
+    "trench_bottom": 16.489935524033296,
+    "trench_cap_for_volume": 18.819290943275636,
     "trench_walls": 47.125552855988765,
     "inner_column_lid": 0.7653310283720559,
     "ground_surface": 44.03309020270969,
@@ -27,11 +27,11 @@
     ]
   },
   "volumes": {
-    "trench_from_surface": -46.96345389726256,
-    "trench_flux_integral_div1": -46.96345389726256
+    "trench_from_surface": -46.97200091743949,
+    "trench_flux_integral_div1": -46.97200091743947
   },
-  "footprint_area_top": 18.819290943275632,
-  "footprint_area_bottom": 16.473997911050567,
+  "footprint_area_top": 18.819290943275636,
+  "footprint_area_bottom": 16.489935524033296,
   "width_top": 2.0,
   "width_bottom": 1.75,
   "noise": {

trenchfoot/scenarios/S07_circular_well/sdf_metadata.json

@@ -7,132 +7,132 @@
       "type": "polygon",
       "vertices_xy": [
         [
-          2.5048385723763116,
-          -2.7755575615628914e-15
+          -0.48564703963676337,
+          0.09660120236507147
         ],
         [
-          2.456708801572928,
-          0.4886697636833139
+          -0.49516142762368864,
+          1.8041124150158794e-16
         ],
         [
-          2.3141690892632654,
-          0.9585602223974381
+          -0.4856470396367634,
+          -0.0966012023650708
         ],
         [
-          2.082697156654193,
-          1.3916137493315945
+          -0.4574695082705947,
+          -0.1894900746978313
         ],
         [
-          1.7711883403049211,
-          1.77118834030492
+          -0.41171168025344335,
+          -0.2750969497272114
         ],
         [
-          1.3916137493315943,
-          2.082697156654193
+          -0.3501320032547224,
+          -0.3501320032547217
         ],
         [
-          0.9585602223974379,
-          2.3141690892632654
+          -0.2750969497272115,
+          -0.41171168025344307
         ],
         [
-          0.488669763683314,
-          2.456708801572928
+          -0.18949007469783125,
+          -0.4574695082705947
         ],
         [
-          9.71445146547012e-17,
-          2.504838572376311
+          -0.09660120236507153,
+          -0.48564703963676314
         ],
         [
-          -0.48866976368331355,
-          2.456708801572928
+          4.85722573273506e-16,
+          -0.4951614276236886
         ],
         [
-          -0.9585602223974382,
-          2.314169089263265
+          0.09660120236507096,
+          -0.48564703963676337
         ],
         [
-          -1.3916137493315945,
-          2.082697156654193
+          0.18949007469783127,
+          -0.4574695082705947
         ],
         [
-          -1.7711883403049202,
-          1.7711883403049207
+          0.2750969497272105,
+          -0.4117116802534438
         ],
         [
-          -2.0826971566541927,
-          1.3916137493315948
+          0.35013200325472255,
+          -0.3501320032547214
         ],
         [
-          -2.314169089263265,
-          0.9585602223974394
+          0.4117116802534429,
+          -0.2750969497272119
         ],
         [
-          -2.456708801572928,
-          0.48866976368331483
+          0.4574695082705946,
+          -0.18949007469783127
         ],
         [
-          -2.504838572376311,
-          1.8041124150158794e-16
+          0.485647039636763,
+          -0.09660120236507203
         ],
         [
-          -2.4567088015729275,
-          -0.48866976368331533
+          0.49516142762368853,
+          1.0824674490095276e-15
         ],
         [
-          -2.3141690892632654,
-          -0.958560222397438
+          0.4856470396367634,
+          0.09660120236507036
         ],
         [
-          -2.0826971566541936,
-          -1.3916137493315939
+          0.4574695082705946,
+          0.18949007469783102
         ],
         [
-          -1.7711883403049204,
-          -1.7711883403049207
+          0.41171168025344307,
+          0.2750969497272114
         ],
         [
-          -1.3916137493315952,
-          -2.0826971566541927
+          0.3501320032547215,
+          0.35013200325472255
         ],
         [
-          -0.9585602223974392,
-          -2.314169089263265
+          0.27509694972721166,
+          0.4117116802534431
         ],
         [
-          -0.48866976368331394,
-          -2.456708801572928
+          0.18949007469783158,
+          0.4574695082705945
         ],
         [
-          -1.0408340855860843e-15,
-          -2.504838572376311
+          0.09660120236507048,
+          0.4856470396367634
         ],
         [
-          0.4886697636833134,
-          -2.456708801572928
+          9.71445146547012e-17,
+          0.49516142762368864
         ],
         [
-          0.9585602223974385,
-          -2.314169089263265
+          -0.09660120236507047,
+          0.4856470396367634
         ],
         [
-          1.3916137493315957,
-          -2.0826971566541923
+          -0.1894900746978314,
+          0.4574695082705945
         ],
         [
-          1.7711883403049202,
-          -1.7711883403049207
+          -0.2750969497272116,
+          0.4117116802534432
         ],
         [
-          2.0826971566541927,
-          -1.391613749331595
+          -0.35013200325472243,
+          0.35013200325472177
         ],
         [
-          2.314169089263265,
-          -0.9585602223974392
+          -0.41171168025344296,
+          0.2750969497272121
         ],
         [
-          2.456708801572928,
-          -0.4886697636833141
+          -0.45746950827059496,
+          0.18949007469783075
         ]
       ],
       "z_level": 0.0

trenchfoot/scenarios/S07_circular_well/trench_scene.obj

@@ -63,70 +63,70 @@ v 0.438948024 -0.438948024 -2.50942057
 v 0.516148273 -0.34487925 -2.50493529
 v 0.573513232 -0.237556959 -2.50192714
 v 0.6088384 -0.121105487 -2.5080827
-f 1 2 33
-f 2 34 33
-f 2 3 34
-f 3 35 34
-f 3 4 35
-f 4 36 35
-f 4 5 36
-f 5 37 36
-f 5 6 37
-f 6 38 37
-f 6 7 38
-f 7 39 38
-f 7 8 39
-f 8 40 39
-f 8 9 40
-f 9 41 40
-f 9 10 41
-f 10 42 41
-f 10 11 42
-f 11 43 42
-f 11 12 43
-f 12 44 43
-f 12 13 44
-f 13 45 44
-f 13 14 45
-f 14 46 45
-f 14 15 46
-f 15 47 46
-f 15 16 47
-f 16 48 47
-f 16 17 48
 f 17 49 48
-f 17 18 49
-f 18 50 49
-f 18 19 50
-f 19 51 50
-f 19 20 51
-f 20 52 51
-f 20 21 52
-f 21 53 52
-f 21 22 53
-f 22 54 53
-f 22 23 54
-f 23 55 54
-f 23 24 55
-f 24 56 55
-f 24 25 56
-f 25 57 56
-f 25 26 57
-f 26 58 57
-f 26 27 58
-f 27 59 58
-f 27 28 59
-f 28 60 59
-f 28 29 60
-f 29 61 60
-f 29 30 61
-f 30 62 61
-f 30 31 62
-f 31 63 62
-f 31 32 63
-f 32 64 63
-f 32 1 64
-f 1 33 64
+f 50 49 17
+f 17 18 19
+f 19 20 21
+f 21 22 23
+f 23 24 25
+f 25 26 27
+f 27 28 29
+f 29 30 31
+f 31 32 1
+f 1 2 3
+f 3 4 5
+f 5 6 7
+f 7 8 9
+f 9 10 11
+f 11 12 13
+f 13 14 15
+f 15 16 17
+f 17 48 47
+f 51 50 17
+f 17 19 21
+f 21 23 25
+f 25 27 29
+f 29 31 1
+f 1 3 5
+f 5 7 9
+f 9 11 13
+f 13 15 17
+f 17 47 46
+f 52 51 17
+f 17 21 25
+f 25 29 1
+f 1 5 9
+f 9 13 17
+f 17 46 45
+f 53 52 17
+f 9 17 45
+f 54 53 17
+f 9 45 44
+f 55 54 17
+f 9 44 43
+f 56 55 17
+f 9 43 42
+f 56 17 25
+f 9 42 41
+f 57 56 25
+f 9 41 40
+f 58 57 25
+f 1 9 40
+f 59 58 25
+f 1 40 39
+f 60 59 25
+f 1 39 38
+f 61 60 25
+f 1 38 37
+f 62 61 25
+f 1 37 36
+f 63 62 25
+f 1 36 35
+f 64 63 25
+f 1 35 34
+f 64 25 1
+f 1 34 33
+f 33 64 1
 g trench_walls
 v 2.5009812 -0.000379918043 0.00019380184
 v 2.45373158 0.488376533 0.000149581142
@@ -577,70 +577,70 @@ v 1.77118834 -1.77118834 0
 v 2.08269716 -1.39161375 0
 v 2.31416909 -0.958560222 0
 v 2.4567088 -0.488669764 0
-f 321 322 353
-f 322 354 353
-f 322 323 354
-f 323 355 354
-f 323 324 355
-f 324 356 355
-f 324 325 356
-f 325 357 356
-f 325 326 357
-f 326 358 357
-f 326 327 358
-f 327 359 358
-f 327 328 359
-f 328 360 359
-f 328 329 360
-f 329 361 360
-f 329 330 361
-f 330 362 361
-f 330 331 362
-f 331 363 362
-f 331 332 363
-f 332 364 363
-f 332 333 364
-f 333 365 364
-f 333 334 365
-f 334 366 365
-f 334 335 366
-f 335 367 366
-f 335 336 367
-f 336 368 367
-f 336 337 368
 f 337 369 368
-f 337 338 369
-f 338 370 369
-f 338 339 370
-f 339 371 370
-f 339 340 371
-f 340 372 371
-f 340 341 372
-f 341 373 372
-f 341 342 373
-f 342 374 373
-f 342 343 374
-f 343 375 374
-f 343 344 375
-f 344 376 375
-f 344 345 376
-f 345 377 376
-f 345 346 377
-f 346 378 377
-f 346 347 378
-f 347 379 378
-f 347 348 379
-f 348 380 379
-f 348 349 380
-f 349 381 380
-f 349 350 381
-f 350 382 381
-f 350 351 382
-f 351 383 382
-f 351 352 383
-f 352 384 383
-f 352 321 384
-f 321 353 384
+f 370 369 337
+f 337 338 339
+f 339 340 341
+f 341 342 343
+f 343 344 345
+f 345 346 347
+f 347 348 349
+f 349 350 351
+f 351 352 321
+f 321 322 323
+f 323 324 325
+f 325 326 327
+f 327 328 329
+f 329 330 331
+f 331 332 333
+f 333 334 335
+f 335 336 337
+f 337 368 367
+f 371 370 337
+f 337 339 341
+f 341 343 345
+f 345 347 349
+f 349 351 321
+f 321 323 325
+f 325 327 329
+f 329 331 333
+f 333 335 337
+f 337 367 366
+f 372 371 337
+f 337 341 345
+f 345 349 321
+f 321 325 329
+f 329 333 337
+f 337 366 365
+f 373 372 337
+f 329 337 365
+f 374 373 337
+f 329 365 364
+f 374 337 345
+f 329 364 363
+f 375 374 345
+f 329 363 362
+f 376 375 345
+f 329 362 361
+f 377 376 345
+f 329 361 360
+f 378 377 345
+f 329 360 359
+f 379 378 345
+f 329 359 358
+f 380 379 345
+f 321 329 358
+f 381 380 345
+f 321 358 357
+f 382 381 345
+f 321 357 356
+f 382 345 321
+f 321 356 355
+f 383 382 321
+f 321 355 354
+f 384 383 321
+f 321 354 353
+f 353 384 321
 g pipe0_pipe_side
 v 1.79294962 -0.933907938 -0.5
 v 1.79337577 -0.933865966 -0.486919374

trenchfoot/scenarios/SUMMARY.json

@@ -124,8 +124,8 @@
         "spheres": 1
       },
       "footprint_top": 66.92240390116315,
-      "footprint_bottom": 61.67228672101475,
-      "trench_from_surface": -64.57410868962761,
+      "footprint_bottom": 61.67408796224451,
+      "trench_from_surface": -64.58714145117246,
       "volumetric_path": null,
       "volumetric_lc": null,
       "volumetric_error": null,
@@ -144,9 +144,9 @@
         "boxes": 0,
         "spheres": 1
       },
-      "footprint_top": 18.819290943275632,
-      "footprint_bottom": 16.473997911050567,
-      "trench_from_surface": -46.96345389726256,
+      "footprint_top": 18.819290943275636,
+      "footprint_bottom": 16.489935524033296,
+      "trench_from_surface": -46.97200091743949,
       "volumetric_path": null,
       "volumetric_lc": null,
       "volumetric_error": null,

trenchfoot/trench_scene_generator_v3.py

@@ -1101,71 +1101,42 @@ def _triangulate_annulus(outer: np.ndarray, inner: np.ndarray) -> Tuple[np.ndarr
     Creates triangles that fill ONLY the region between the two polygons,
     leaving the inner polygon area as an open hole.
 
+    Uses the earcut algorithm which correctly handles non-convex inner
+    polygons (L-shapes, U-shapes, etc.) without creating triangles that
+    cross over the hole.
+
     Both polygons should be CCW oriented. Returns (vertices, faces) where
     vertices is the concatenation of outer and inner, and faces index into it.
     """
+    import mapbox_earcut as earcut
+
     n_outer = len(outer)
     n_inner = len(inner)
 
-    # Vertices: outer first, then inner
-    verts = np.vstack([outer, inner])
+    # Earcut expects:
+    # - A flat array of coordinates [x0, y0, x1, y1, ...]
+    # - A list of hole start indices (index into the coordinate array by vertex count)
+    #
+    # The outer polygon comes first, then the inner polygon (as a hole).
+    # ring_end_indices specifies where each ring ends (cumulative indices).
 
-    # Create triangles by "zipping" around the two polygons
-    # This works well when both polygons have similar vertex counts
-    # For different counts, we need to handle the ratio
+    # Combine outer and inner polygons: outer first, then inner (as hole)
+    coords = np.vstack([outer, inner]).astype(np.float64)
 
-    tris = []
+    # ring_end_indices: cumulative end indices for each ring
+    # First ring (outer) ends at n_outer, second ring (hole) ends at n_outer + n_inner
+    ring_end_indices = np.array([n_outer, n_outer + n_inner], dtype=np.uint32)
 
-    # Use a marching approach: for each outer edge, connect to nearest inner vertices
-    # and vice versa. This creates a proper triangulated annulus.
-
-    # Simple approach: interpolate around both polygons simultaneously
-    # treating them as having a common parameter t in [0, 1]
-
-    i_outer = 0  # current outer vertex index
-    i_inner = 0  # current inner vertex index
-    t_outer = 0.0  # parameter position on outer polygon
-    t_inner = 0.0  # parameter position on inner polygon
-
-    outer_step = 1.0 / n_outer
-    inner_step = 1.0 / n_inner
-
-    # March around creating triangles
-    while i_outer < n_outer or i_inner < n_inner:
-        # Current vertices
-        o_curr = i_outer % n_outer
-        o_next = (i_outer + 1) % n_outer
-        i_curr = i_inner % n_inner
-        i_next = (i_inner + 1) % n_inner
-
-        # Indices in combined vertex array
-        vo_curr = o_curr
-        vo_next = o_next
-        vi_curr = n_outer + i_curr
-        vi_next = n_outer + i_next
-
-        if i_outer >= n_outer:
-            # Finished outer, just advance inner
-            tris.append([vo_curr, vi_next, vi_curr])
-            i_inner += 1
-            t_inner += inner_step
-        elif i_inner >= n_inner:
-            # Finished inner, just advance outer
-            tris.append([vo_curr, vo_next, vi_curr])
-            i_outer += 1
-            t_outer += outer_step
-        elif t_outer + outer_step <= t_inner + inner_step:
-            # Advance outer - create triangle: o_curr, o_next, i_curr
-            tris.append([vo_curr, vo_next, vi_curr])
-            i_outer += 1
-            t_outer += outer_step
-        else:
-            # Advance inner - create triangle: o_curr, i_next, i_curr
-            tris.append([vo_curr, vi_next, vi_curr])
-            i_inner += 1
-            t_inner += inner_step
+    # Run earcut triangulation
+    triangle_indices = earcut.triangulate_float64(coords, ring_end_indices)
 
-    return verts, np.array(tris, dtype=int)
+    # Convert flat triangle indices to (N, 3) array
+    tris = np.array(triangle_indices, dtype=int).reshape(-1, 3)
+
+    # Vertices: outer first, then inner
+    verts = np.vstack([outer, inner])
+
+    return verts, tris
 
 
 def make_ground_surface_plane(path_xy: List[Tuple[float,float]], width_top: float, ground) -> Dict[str,Tuple[np.ndarray,np.ndarray]]:

{trenchfoot-0.4.5.dist-info → trenchfoot-0.4.6.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: trenchfoot
-Version: 0.4.5
+Version: 0.4.6
 Summary: Synthetic trench scenario generator bundle (surfaces + volumetrics).
 Author: Liam Moore
 License-File: LICENSE
 Requires-Python: >=3.12
+Requires-Dist: mapbox-earcut>=1.0
 Requires-Dist: numpy>=1.26
 Provides-Extra: dev
 Requires-Dist: pytest>=8.3; extra == 'dev'

{trenchfoot-0.4.5.dist-info → trenchfoot-0.4.6.dist-info}/RECORD

@@ -6,8 +6,8 @@ trenchfoot/gmsh_sloped_trench_mesher.py,sha256=D7EL6V0wkE6tvDARmm006yZE6KEzCl25O
 trenchfoot/plot_mesh.py,sha256=26dOlVfaM1WsUfr_sXVqA7axtY9qjY3WCNM7cUBTS7Q,3810
 trenchfoot/render_colors.py,sha256=CWMre6DYa2EyrCgZsEY0bv313WqEhQdr3CdPF1xI-40,1649
 trenchfoot/scene_spec_example.json,sha256=UcV25ku422UO0ZZPDrJwrT1zwmjoOIpnBdLuEdh-AZA,1028
-trenchfoot/trench_scene_generator_v3.py,sha256=Ct8DCQ1iur0Ia7RyYbmCKr525p3Od7zQhd2Of1KcwFM,77837
-trenchfoot/scenarios/SUMMARY.json,sha256=BWcI0HA4DWG-XOsr3bVJZGK5VmNtxSaOG86kxihfmh0,6831
+trenchfoot/trench_scene_generator_v3.py,sha256=kCh7e8rjXaJu9UXzWTU5Pu78FLmYapGPRk5h3GM-rPw,76918
+trenchfoot/scenarios/SUMMARY.json,sha256=XdFkhDjBUKjLkhZCCYgZRS5yBAQclwctr14H1JUnCcE,6831
 trenchfoot/scenarios/S01_straight_vwalls/ground_truth_isosurface.html,sha256=SLPROqEefBB8OgmZSW6DBmJxuSDxVQhWTn9eG3q6QRU,5880178
 trenchfoot/scenarios/S01_straight_vwalls/metrics.json,sha256=WZsyUfDIcJW1FFHfNq1wF8zn0r-XL3jCrkmowV4OFwA,691
 trenchfoot/scenarios/S01_straight_vwalls/preview.png,sha256=adsx3-6oMu9WaixggXRhuXi_KM-q5s2RNSBLR_stq80,199624
@@ -16,7 +16,7 @@ trenchfoot/scenarios/S01_straight_vwalls/preview_side.png,sha256=zBqMghMiEAYvceP
 trenchfoot/scenarios/S01_straight_vwalls/preview_top.png,sha256=L0qGIFib1cAwSwJJ16cRtYSlPMOo4uQhNGt6OvM58XQ,39495
 trenchfoot/scenarios/S01_straight_vwalls/scene.json,sha256=kbHRC9zMVDGHbuLh2wRsvchfVfcbdDEVvxsMwHHBoHw,343
 trenchfoot/scenarios/S01_straight_vwalls/sdf_metadata.json,sha256=lo4IULejtQ0vg2rH8JDfRvB2WCxvUxM_N4JJjtBbU4Y,854
-trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj,sha256=MexC92x_MwFzKjHnbt12TYrL-UAJCb2qpjap5O9UkWg,563
+trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj,sha256=LziV7R65U-cSktxZppsS7talf6quTfxeOmsPOahnpX0,563
 trenchfoot/scenarios/S01_straight_vwalls/meshes/trench_scene_culled.obj,sha256=6-usCEpAfhhZcdCxAy7NcXrkBwv-mEh40A6zN50k0Jo,519
 trenchfoot/scenarios/S01_straight_vwalls/point_clouds/culled/resolution0p050.pth,sha256=w4AKFbud2V0NhAtudGXXheLynAq-NLxUFSPxLczK3T0,1352093
 trenchfoot/scenarios/S01_straight_vwalls/point_clouds/full/resolution0p050.pth,sha256=w4AKFbud2V0NhAtudGXXheLynAq-NLxUFSPxLczK3T0,1352093
@@ -29,64 +29,64 @@ trenchfoot/scenarios/S02_straight_slope_pipe/preview_side.png,sha256=Zwft-WEogsj
 trenchfoot/scenarios/S02_straight_slope_pipe/preview_top.png,sha256=Su71iVHxgWIVPaYde4qnMiBR_gXix1n9bCSgmiYkO6M,57538
 trenchfoot/scenarios/S02_straight_slope_pipe/scene.json,sha256=W1ApzLHEnHQn-7AdWxh2xiEinj6Yb7830sQXNxmmmDw,486
 trenchfoot/scenarios/S02_straight_slope_pipe/sdf_metadata.json,sha256=5zWHXErct6UJro-6PzkCJqENG8PNAABVHBIIPg5sJfE,1211
-trenchfoot/scenarios/S02_straight_slope_pipe/trench_scene.obj,sha256=2FPl5hrUiE3WSW1vI2kkzhPpEshsyInEawOM2Ayk1pw,340328
+trenchfoot/scenarios/S02_straight_slope_pipe/trench_scene.obj,sha256=bJcc__416H4WJ4NMI5Bjo4OUoVLtomtggmwNr2rM7ZA,340328
 trenchfoot/scenarios/S02_straight_slope_pipe/meshes/trench_scene_culled.obj,sha256=OOiw80NuCBejzeN3MWAip9Haw8yQsLZEdlMQdDIgEMU,847
 trenchfoot/scenarios/S02_straight_slope_pipe/point_clouds/culled/resolution0p050.pth,sha256=Ug9hTIsm6iQKRs9cucXJyJpxpSvQ5f2GS1ytZmxi1mE,1623389
 trenchfoot/scenarios/S02_straight_slope_pipe/point_clouds/full/resolution0p050.pth,sha256=JgIRni8xWKtz2mm0gpSdmavGe-FF71mDervavM4Rqw8,1718877
 trenchfoot/scenarios/S02_straight_slope_pipe/volumetric/trench_volume.msh,sha256=kNFAqjr7dM-KX4JQV1u5GbHbWWFIfiEur1wV1fJCePA,47084
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/ground_truth_isosurface.html,sha256=0kRp_SHowhOHCljQV7CYaI0ur1KOzUjjjIJSwMdMoOI,6791920
-trenchfoot/scenarios/S03_L_slope_two_pipes_box/metrics.json,sha256=K1A8yiazMdnH4QBPIdrl88Uhaei8LdEz9P-RWKmYAi0,1124
+trenchfoot/scenarios/S03_L_slope_two_pipes_box/metrics.json,sha256=u1CtIyJsVc9Imx-_wVwqBHOVMQHYZ1fl_ILadssyqDo,1110
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview.png,sha256=q0V_2HSLUl2ovWLc4INKV87aLVh3vzqabMyKr8XEWEg,224248
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_oblique.png,sha256=Nvp0hvmG9HvZgbiEgbbI3uJtCLNFgLdamh8p2dw3ucY,154869
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_side.png,sha256=57DnWIuV4p-7eguJVSshd0SZ0COy7Y2cedUMp_DrrjY,51284
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_top.png,sha256=rs-CMZwaNUl5xef85WEckQqm_UqNrGcfE39nofvsp0E,48235
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/scene.json,sha256=72g4wMT8tWcLRDYyMoJXOK50PbpfC1DDt6VUYGZgFzM,941
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/sdf_metadata.json,sha256=6ESVHVGuw_PJzIUD65bMoTLazbU8_a29zEUjmwaQYGo,1774
-trenchfoot/scenarios/S03_L_slope_two_pipes_box/trench_scene.obj,sha256=YZvY0bhO5vjCb5seQb7-SG9SbgqdyMCCM6Og95heFaE,676874
+trenchfoot/scenarios/S03_L_slope_two_pipes_box/trench_scene.obj,sha256=bktda0KKM51xCJePgeMhZ_0dHnyoBrbm9ZnLtWhjE08,676874
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/meshes/trench_scene_culled.obj,sha256=At4lipowr_3MY1rxmcKa479F_mQ-jJDVQJe0yHTrFSc,1835
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/point_clouds/culled/resolution0p050.pth,sha256=KqbuoZ1tUPDhlnDgmhd-7WBb92TABsEmOzEsB__KtlA,2456029
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/point_clouds/full/resolution0p050.pth,sha256=4fXvfu0TMO9FJaoqYrW21SCGe3eKuSLkSUl9CdE14rw,2622685
 trenchfoot/scenarios/S03_L_slope_two_pipes_box/volumetric/trench_volume.msh,sha256=cPgHKHlzPPtWX8H1yaxAYsEgYba3fr2JjfPvgg2a000,87383
 trenchfoot/scenarios/S04_U_slope_multi_noise/ground_truth_isosurface.html,sha256=E7sa8dlDyICJBlnL9X2C8IEopEJzDMhHdLbW-WpoPFc,7184880
-trenchfoot/scenarios/S04_U_slope_multi_noise/metrics.json,sha256=2o8LwqD4KKGwQC1oHs60i6aOP5nK2vOzLAVvGvQZ94w,1294
+trenchfoot/scenarios/S04_U_slope_multi_noise/metrics.json,sha256=uFn_K4E0o317Go8XvpEzQwCkalkaXQBQ7VZj_Q_vHKM,1293
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview.png,sha256=ZbLgrL0nRtUX1y77i7b3LCxw4w_j5Ivmmh0i2YzrBDs,238958
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_oblique.png,sha256=HKUWhUuuql2YZzqq4B5oDpQSCWy9RhuwY_JxVZ-bEbg,162693
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_side.png,sha256=S7n1ivuo1PFcMp_WuEEnJnCx2JMP5yiCCCYOFDzJtfY,77730
 trenchfoot/scenarios/S04_U_slope_multi_noise/preview_top.png,sha256=auLgGMvU1bRua43WrU-O2WelPy0TbPZZD7ALFIvqlqk,65419
 trenchfoot/scenarios/S04_U_slope_multi_noise/scene.json,sha256=jkUNZ_rHSjVajoj54o8KoeWzY3pFH97L5pdWiH_C75w,1119
 trenchfoot/scenarios/S04_U_slope_multi_noise/sdf_metadata.json,sha256=78CdQZwn01CBBfMr-4jUc3eOGNw9jxmWEmjwd7KvM6o,2234
-trenchfoot/scenarios/S04_U_slope_multi_noise/trench_scene.obj,sha256=er_f18snk8TQcboKdmlH2kOMAffR6S0BpliETvQT5iQ,1212223
+trenchfoot/scenarios/S04_U_slope_multi_noise/trench_scene.obj,sha256=oa38vI62Wu7DrZgCz0vY9eTSAxPFAtHg19mdstBYdAE,1212223
 trenchfoot/scenarios/S04_U_slope_multi_noise/meshes/trench_scene_culled.obj,sha256=ykw_tzhXknXt3DbmSk3cBzbOL91Jm4zxjthp799YkWw,3206
 trenchfoot/scenarios/S04_U_slope_multi_noise/volumetric/trench_volume.msh,sha256=7KfGkJAlv19rzbaPhzbmy9UWo42Db_4VhAtisn6aMak,144623
 trenchfoot/scenarios/S05_wide_slope_pair/ground_truth_isosurface.html,sha256=MVKZHfrF2emDTNmpn7AhxqYUlcBXDUzY7_qSek2RpWg,6304070
-trenchfoot/scenarios/S05_wide_slope_pair/metrics.json,sha256=ejqAir1__oegf0jF_N6R3vyFfCjlzP-zF-qsulS4ln4,1109
+trenchfoot/scenarios/S05_wide_slope_pair/metrics.json,sha256=N57i1cTUa7jnLCHBlLQlSJp1uHcHSNMtm3mdauPkzeI,1111
 trenchfoot/scenarios/S05_wide_slope_pair/preview_oblique.png,sha256=S0MwfT2bC0T7AAUsqwDAIBxxRea6lHeYhQYrumwJfFU,139982
 trenchfoot/scenarios/S05_wide_slope_pair/preview_side.png,sha256=8hiJ5ZZZ6iqIdPakWsgWDPrJnEuU7Qqy-odjnR38ocM,67796
 trenchfoot/scenarios/S05_wide_slope_pair/preview_top.png,sha256=bDdjWwBN6QQfZ2kV71VbV_Q59nrPYAiUMh3ivRo4L9M,57737
 trenchfoot/scenarios/S05_wide_slope_pair/scene.json,sha256=jmNMzqR8m4DvR35325GH87FdYXRgVb5VuKu7ZwDovW0,1028
 trenchfoot/scenarios/S05_wide_slope_pair/sdf_metadata.json,sha256=PRaqys_akemKtlfTwhJBELx5erUHKarjHMgMvU5R4kc,1776
-trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj,sha256=udbLJuiOVA9VyNvZbWwmuTdgyXKmu2a_sLTGJDp61o0,693480
+trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj,sha256=LfE1pH7YiGEVqyR_jgp_xblcwqxOUfhl7TfiDFli0oQ,693480
 trenchfoot/scenarios/S05_wide_slope_pair/volumetric/trench_volume.msh,sha256=pHrj2dJgpSklpxiHHThiZINJQWpUdvkfhUnVBpKASEM,123235
 trenchfoot/scenarios/S06_bumpy_wide_loop/ground_truth_isosurface.html,sha256=_p4-B7sg_lfvKzVwJyfg6ub5Nk_x-ekzmLUE2NxQvkQ,6600554
-trenchfoot/scenarios/S06_bumpy_wide_loop/metrics.json,sha256=CH9ubdgvXhEBX6hi0Hme8B2jMX_HVHQGyqh5w8a-veE,1220
+trenchfoot/scenarios/S06_bumpy_wide_loop/metrics.json,sha256=MY7ABvVGGc3bWTKiiMOXHW9pvnrfec2wbEVoYa3BZ9g,1220
 trenchfoot/scenarios/S06_bumpy_wide_loop/preview_oblique.png,sha256=Kw8agcTy3VTZ9OM-dNR46hXJ2sKJZN9xwozX0fNicbU,180697
 trenchfoot/scenarios/S06_bumpy_wide_loop/preview_side.png,sha256=6e8YF0oPJ045jax9w2grPUvO6j1OAod3iD81XXDldb0,88884
 trenchfoot/scenarios/S06_bumpy_wide_loop/preview_top.png,sha256=nvbwTseVTuw6lNjsUB2JdbFacngFbzjYzDUaAk_ayLs,89085
 trenchfoot/scenarios/S06_bumpy_wide_loop/scene.json,sha256=znpu8CXFIKLDBnpqmi0gWIg9_10NpmZrVLaMKnCuhZ0,1162
-trenchfoot/scenarios/S06_bumpy_wide_loop/sdf_metadata.json,sha256=eScawGWg8aZYF9HawhYY6qOZgTpddQkLyx-A68DwtSA,1983
-trenchfoot/scenarios/S06_bumpy_wide_loop/trench_scene.obj,sha256=pfdKyBAW9EKUsWeCq_Bs_G2yiVTc4LQc84FTRgi-dlA,852850
+trenchfoot/scenarios/S06_bumpy_wide_loop/sdf_metadata.json,sha256=Tui7hhyXzXQXXsDBRZh-MhMK2mC_3PyS019wg6X3DBk,1981
+trenchfoot/scenarios/S06_bumpy_wide_loop/trench_scene.obj,sha256=8IZ1vqS95gQTQyEXKsDf0z4e7tNgc6HIxjY3ZAj0gNY,852849
 trenchfoot/scenarios/S06_bumpy_wide_loop/volumetric/trench_volume.msh,sha256=r8KJMR5TxykP1_oeYbPnsckStGZDZ2-7e8KCAHPBh5I,279971
 trenchfoot/scenarios/S07_circular_well/ground_truth_isosurface.html,sha256=PP3ueCK76LhrnoK95ZCOyToq1hMroqrZANUrGKoQGx4,8166265
-trenchfoot/scenarios/S07_circular_well/metrics.json,sha256=qsewQKQ2DpMNhpGsQadXN9ibyoxSIPD8NLS6is8GjZs,1433
+trenchfoot/scenarios/S07_circular_well/metrics.json,sha256=OYK_-QAlJdp2rvPW0h9oYmXdaTWs7kV-sl5VWjUSDS4,1433
 trenchfoot/scenarios/S07_circular_well/preview_oblique.png,sha256=ogcl8HnszT6otoZuRu_P5J_wbzuwA54FL1lOPAEBv3M,201455
 trenchfoot/scenarios/S07_circular_well/preview_side.png,sha256=wg6Blso1DHaswjwgQ8A2wakoAf7Iry-OCWUdFH46ALg,80971
 trenchfoot/scenarios/S07_circular_well/preview_top.png,sha256=X1P0g8kblJLsxOpYiZXKG1uIn4Bt52jvp2spLX-7554,123007
 trenchfoot/scenarios/S07_circular_well/scene.json,sha256=tLLEgEWNxARpvHXkgLNDRvmE-pLgd92_LQJGs0BMdIM,3144
-trenchfoot/scenarios/S07_circular_well/sdf_metadata.json,sha256=5_D_rA_CqWgg2uSgVlqWCO4zQg0Gg5NWUnXHtCERBUA,4776
-trenchfoot/scenarios/S07_circular_well/trench_scene.obj,sha256=PHsRceUTwRAc44sppI2HnCeWkqUPafS-LcTe_50rP84,1608845
+trenchfoot/scenarios/S07_circular_well/sdf_metadata.json,sha256=KyndFy135AJ5T42dRgcdvsFii_KgihCDreP3pyVOdrQ,4819
+trenchfoot/scenarios/S07_circular_well/trench_scene.obj,sha256=DpMQukhWFybZ6C6LUSrQsd5OZ6k2okabUnEoiVhy2v4,1608828
 trenchfoot/scenarios/S07_circular_well/volumetric/trench_volume.msh,sha256=dqhtd3SFKj5RLT_BcWIIvVGCbAqvOx7RX25-K7NKX10,615212
-trenchfoot-0.4.5.dist-info/METADATA,sha256=u8rwlE8sWWjnjx5bU84gZuN88ppNvzv4GZ9BKpqRJGE,5292
-trenchfoot-0.4.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-trenchfoot-0.4.5.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
-trenchfoot-0.4.5.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-trenchfoot-0.4.5.dist-info/RECORD,,
+trenchfoot-0.4.6.dist-info/METADATA,sha256=XbM-B0AQxxm5PZX98-ng0yY7pA6OPTqAnHwYvaWeSWE,5326
+trenchfoot-0.4.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+trenchfoot-0.4.6.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
+trenchfoot-0.4.6.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+trenchfoot-0.4.6.dist-info/RECORD,,