From cbb7f41cf482ca0b98626f3449e5f763ca435646 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 28 Feb 2019 20:23:36 +0000 Subject: [PATCH] pass $rr and $why from for_each_pos --- generate-board | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generate-board b/generate-board index c467b44..7047e64 100755 --- a/generate-board +++ b/generate-board @@ -146,14 +146,14 @@ sub calculate_centres () { sub for_each_pos ($) { my ($f) = @_; my $call = sub { - my ($pr) = @_; + my ($pr,$rr,$why) = @_; return unless defined $$pr; - $f->($pr); + $f->($pr,$rr,$why); }; foreach my $rr (values %region) { - $call->( \ $rr->{Centre} ); + $call->( \ $rr->{Centre}, $rr, $rr->{Name}." C" ); foreach my $vertex (@{ $rr->{Polygon} }) { - $call->( \ $vertex->{Pos} ); + $call->( \ $vertex->{Pos}, $rr, $rr->{Name}." | ".$vertex->{Adjoins} ); } } } @@ -185,7 +185,7 @@ sub transform_coordinates () { # xxx rotation is not happening print STDERR "lims ",prvec($lims[0])," .. ",prvec($lims[1]),"\n"; for_each_pos(sub { - my ($pr) = @_; + my ($pr, $rr, $why) = @_; my $y = Math::GSL::Vector->new(2); gsl_blas_dgemv($CblasNoTrans, 1.0, $transform->raw, @@ -221,7 +221,7 @@ sub write_face_edges() { o("5 setlinewidth\n"); foreach my $rr (values %region) { next if $rr->{Special}; - o("% $rr->{Name}\n"); + o("% $rr->{Name} ",prvec($rr->{Centre}),"\n"); # xxx setmiter? o(" newpath\n"); my $xto = 'moveto'; -- 2.30.2