poster-tube-lid: Makefile: get set-fa argument right

[reprap-play.git] / distort-stl

diff --git a/distort-stl b/distort-stl
index 39e5a150512c339c38a7a635194194a95b886bce..0eb71fd6179121f346c1d60e4c52e89ba82d1528 100755 (executable)
--- a/distort-stl
+++ b/distort-stl
@@ -72,20 +72,25 @@ sub append_triangle ($) {
     push @$output, $t;
 }
 
+#---------- set-fa ----------
+
+sub op__set_fa () {
+    $fa = shift_arg;
+}
+
 #---------- project-cylinder ----------
 
 our $project_cylinder_radius;
 our $project_cylinder_max_d_theta;
 
-sub project_cylinder_need_subdivide () {
-    foreach my $t (@$triangles) {
-       my @thetas = map { $_->[0] / $project_cylinder_radius } @$t;
+sub project_cylinder_triangle_need_subdivide ($) {
+    my ($t) = @_;
+    my @thetas = map { $_->[0] / $project_cylinder_radius } @$t;
 
-       foreach my $ix (0..2) {
-           if (abs($thetas[$ix] - $thetas[($ix+1)%3])
-               > $project_cylinder_max_d_theta) {
-               return 1;
-           }
+    foreach my $ix (0..2) {
+       if (abs($thetas[$ix] - $thetas[($ix+1)%3])
+           > $project_cylinder_max_d_theta) {
+           return 1;
        }
     }
     return 0;
@@ -114,14 +119,18 @@ sub op__project_cylinder () {
     $project_cylinder_radius = shift_arg;
     $project_cylinder_max_d_theta = $fa * TAU/360;
 
-    while (project_cylinder_need_subdivide()) {
-       $output = [];
-       foreach my $t (@$triangles) {
+    my @small_enough = ();
+    while (my $t = shift @$triangles) {
+       if (!project_cylinder_triangle_need_subdivide $t) {
+           push @small_enough, $t;
+       } else {
+           local $output = $triangles;
            subdivide_triangle $t, \&append_triangle;
        }
-       $triangles = $output;
     }
 
+    $triangles = \@small_enough;
+
     $output = [];
     foreach my $t (@$triangles) {
        project_cylinder_tri $t;