poster-tube-lid: sloping bottom of catch tip

[reprap-play.git] / distort-stl

diff --git a/distort-stl b/distort-stl
index a470ae39c68a34965ea9fd5f5a3c0e66ddcf6a71..68290c410a6ae4738d680d6409abd8f3464c008e 100755 (executable)
--- a/distort-stl
+++ b/distort-stl
@@ -32,6 +32,8 @@ use Data::Dumper;
 
 sub TAU () { M_PI * 2; }
 
+our $debug = $ENV{DISTORT_DEBUG} // 0 ;
+
 my $ps = $ENV{DISTORT_PS};
 if ($ps) {
     open PS, "> $ps" or die $!;
@@ -53,6 +55,8 @@ sub shift_arg () {
 sub sprintf_triangle ($) {
     my ($t) = @_;
 
+    return '' unless $debug;
+
     if ($ps && $t->[3] =~ m/$ENV{DISTORT_PS_RE}/) {
        printf PS <<'END',
  %20.16g %20.16g %20.16g moveto
@@ -80,42 +84,59 @@ END
 sub maybe_subdivide_triangle ($$$$) {
     my ($t, $ok, $changed, $edge_need_subdivide_fn) = @_;
 
-    print STDERR sprintf_triangle $t;
-    
-    foreach my $ix (0..2) {
-       my $jx = ($ix+1) % 3;
-       my $kx = ($ix+2) % 3;
-       if ($edge_need_subdivide_fn->($t->[$ix], $t->[$jx])) {
-           printf STDERR
-               " S i=%d j=%d k=%d ",
-               $ix, $jx, $kx;
-           my @midp;
-           foreach my $ci (0..2) {
-               push @midp, 0.5 * ($t->[$ix][$ci] + $t->[$jx][$ci]);
-           }
-
-           printf STDERR
-               " midp %11.6f,%11.6f,%11.6f\n",
-               @midp;
-
-           # triangle i-j-k, splitting edge i-m
-           # gives    i-m-k, k-m-j
-           my $n = [ @$t ]; $n->[$ix] = \@midp;  $n->[3] = "$t->[3]a$ix$jx";
-           unshift @$changed, $n;
+    print STDERR sprintf_triangle $t if $debug;
 
-           printf STDERR "%s\n", sprintf_triangle $n;
+    my (@longest) = qw(-1);
 
-           my $n = [ @$t ]; $n->[$jx] = \@midp;  $n->[3] = "$t->[3]b$ix$jx";
-           unshift @$changed, $n;
-
-           printf STDERR "%s\n", sprintf_triangle $n;
-
-           return;
+    foreach my $ix (0..2) {
+       my $jx = ($ix+1) % 3;
+       next unless $edge_need_subdivide_fn->($t->[$ix], $t->[$jx]);
+       my $l2 = 0;
+       foreach my $ci (0..2) {
+           my $d = $t->[$ix][$ci] - $t->[$jx][$ci];
+           $l2 += $d*$d;
        }
+       next unless $l2 > $longest[0];
+       @longest = ($l2, $ix, $jx);
     }
-    push @$ok, $t;
-    printf STDERR "OK nok=%d nchanged=%d\n",
-       (scalar @$ok), (scalar @$changed);
+    if ($longest[0] < 0) {
+       push @$ok, $t;
+       printf STDERR "OK nok=%d nchanged=%d\n",
+           (scalar @$ok), (scalar @$changed)
+           if $debug;
+       print STDERR Dumper(\@$ok) if $debug>=2;
+       return;
+    }
+    my ($dummy,$ix,$jx) = @longest;
+    my $kx = ($ix+2) % 3;
+
+    printf STDERR
+       " S i=%d j=%d k=%d ",
+       $ix, $jx, $kx
+       if $debug;
+    my @midp;
+    foreach my $ci (0..2) {
+       push @midp, 0.5 * ($t->[$ix][$ci] + $t->[$jx][$ci]);
+    }
+
+    printf STDERR
+       " midp %11.6f,%11.6f,%11.6f\n",
+       @midp
+       if $debug;
+
+    # triangle i-j-k, splitting edge i-m
+    # gives    i-m-k, k-m-j
+    my $gensplit = sub {
+       my ($ixjx, $xwhat) = @_;
+       my $n = [ @$t ];
+       $n->[$ixjx] = \@midp;
+       $n->[3] = "$t->[3]$xwhat";
+       printf STDERR "%s\n", sprintf_triangle $n if $debug;
+       unshift @$changed, $n;
+    };
+    $gensplit->($ix, "a$ix$jx");
+    $gensplit->($jx, "b$ix$jx");
+    return;
 }
 
 sub maybe_subdivide ($) {
@@ -159,7 +180,7 @@ sub project_cylinder_tri {
     my $radius = $project_cylinder_radius;
 
     my @ot;
-    foreach my $p (@$t) {
+    foreach my $p (@$t[0..2]) {
        my ($x,$y,$z) = @$p;
        my $r = $radius - $y;
        my $theta = $x / $radius;
@@ -167,6 +188,7 @@ sub project_cylinder_tri {
                    -$r * cos($theta),
                    $z ];
     }
+    push @ot, $t->[3].'P';
     append_triangle \@ot;
 }
 
@@ -254,8 +276,8 @@ print "solid distort-stl\n";
 foreach my $t (@$triangles) {
     print "  facet normal 0 0 0\n";
     print "    outer loop\n";
-    die unless @$t==3;
-    foreach my $p (@$t) {
+    die unless @$t==4;
+    foreach my $p (@$t[0..2]) {
        die unless @$p==3;
        print "      vertex";
        printf " %.18g", $_ foreach @$p;