X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=generate-board;h=9ce1dc23e4fd441521e71abc37fcd0e71f862f75;hb=80d5c2f420e30982360cd7398e63898e05111c9f;hp=b961779c4ae5cd474143b3dc32205b2ad66db6f1;hpb=67675a20c64ff3a3baf141792dc677940bc379e1;p=pandemic-rising-tide.git
diff --git a/generate-board b/generate-board
index b961779..9ce1dc2 100755
--- a/generate-board
+++ b/generate-board
@@ -1,4 +1,50 @@
#!/usr/bin/perl -w
+#
+# generate-board - program for generating playing board images
+# for games very like Pandemic Rising Tide
+#
+# Copyright (C) 2019 Ian Jackson
+#
+# This program is dual licensed, GPv3+ or CC-BY-SA 4.0+.
+# It copies bits of itself into its output; those parts are CC-BY 4.0+.
+# Only to the Pandemic Rising Tide folks, it is permissively licensed.
+#
+# This program is free software.
+#
+# You can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option)
+# any later version; or (at your option), under the terms of the
+# Creative Commons Attribution-ShareAlike International License,
+# version 4.0 of that License, or (at your option), any later
+# version.
+#
+# This program copies pieces itself into the output. Those pieces,
+# when copied into the output, are additionally (at your option)
+# available under a difference licence: they are made available
+# under the Creative Commons Attribution International License,
+# version 4.0 of that License, or (at your option), any later
+# version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License Creative Commons Attribution-ShareAlike
+# License or the for more details.
+#
+# You should have received a copy of these licenses along with this
+# program. If not, see and
+# .
+#
+# Pandemic and Pandemic Rising Tide are (I think) trademarks of Z-Man
+# games and I use them without permission.
+#
+# For the avoidance of doubt, I do not consider this program to be a
+# derivative work of the game Pandemic Rising Tide. However, it is
+# not very useful without a pair of game description files and the
+# only nontrivial game description files I know of are indeed such
+# derivatives.
+
use strict;
use Carp;
@@ -16,15 +62,30 @@ BEGIN { unshift @INC, qw(.); }
use Parse;
-our $xopts;
+our $xopts = '';
+our $bounding = 'Entire';
our $facesf;
our %vxname2pos; # $vxname2pos{VXNAME} = Math::GSL::Vector
+our %bb; # $r{Bounding...}[0..3] = points
+our $maxpaper = 'a3';
+my $a1sfactor = 1/sqrt(8);
sub TAU { M_PI * 2.0; }
sub MM2PT { 72.0 / 25.4; }
our $mid;
+our $a4_w = 595;
+our $a4_h = 842;
+our $a3_h = 1190;
+our $a1_w = 1684;
+our $a1_h = 2384;
+
+our $max_printeredge = 5.50 * MM2PT;
+our $a1m_pasteedge = 3.5 * MM2PT; # along each edge
+our $preamble_from_boundings = '';
+our %adjuncts_dy_from_boundings = (Top => 0, Bottom => 0);
+
# ----- region names from plag, incl. reverse mapping -----
our %prs2region;
@@ -41,7 +102,7 @@ our $sre = qr{(?:(\")|(?=\w))(.*)\1$}; # 2 captures, $2 is the name
sub prs2r ($) {
# bodgery for the sea and land
- return 'NZ' if m/ \| / && !grep { !m{^(?:NZ|L2?)$} } split / \| /, $_[0];
+ return $c{Sea} if m/ \| / && !grep { !m{^$c{OuterfaceRe}$} } split / \| /, $_[0];
$prs2region{$_[0]} // confess "@_ ?"
}
sub prs2rr ($) { $region{prs2r($_[0])} }
@@ -66,19 +127,19 @@ sub read_faces () {
my @edges;
my $process_rr = sub {
my $last_ai;
- if ($rr->{Name} eq 'NZ') {
- # We combined L and NZ; now we must split them again
- # in fact, we just throw away L and L2 entirely.
- # Here, when processing NZ, we keep only vertices that
- # are part of NZ.
+ if ($rr->{Name} eq $c{Sea}) {
+ # We combined land and sea; now we must split them again
+ # in fact, we just throw away all L entirely.
+ # Here, when processing sea, we keep only vertices that
+ # are part of the sea.
@edges = grep {
my $evxname = $_->{VxName};
my @eregions = split / \| ?/, $evxname;
- grep { $_ eq 'NZ' } @eregions
+ grep { $_ eq $c{Sea} } @eregions
} @edges;
}
$rr->{Polygon} = [ @edges ];
- if ($rr->{Name} ne 'NZ') {
+ if ($rr->{Name} ne $c{Sea}) {
for my $ei (0..$#edges) {
if (!defined $last_ai) {
my $ai;
@@ -126,7 +187,7 @@ sub read_faces () {
}
$process_rr->();
- $region{$_}{Special} = 1 foreach qw(NZ L L2);
+ $region{$_}{Special} = 1 foreach @{ $c{SpecialRegions} };
}
#----- geometry mangling -----
@@ -189,8 +250,8 @@ sub transform_coordinates () {
my $transform = Math::GSL::Matrix->new(2,2);
$transform->set_row(0, [ $c, -$s ]);
$transform->set_row(1, [ $s, $c ]);
- print STDERR "rotate was=",prvec($dir)," theta=$theta",
- " rotateby=$rotateby s=$s c=$c\n";
+ # print STDERR "rotate was=",prvec($dir)," theta=$theta",
+ # " rotateby=$rotateby s=$s c=$c\n";
my @lims;
foreach my $topend (qw(0 1)) {
my $v = $topend ? -$GSL_DBL_MAX : $GSL_DBL_MAX;
@@ -218,9 +279,9 @@ sub transform_coordinates () {
}
}
});
- print STDERR "lims ",prvec($lims[0])," .. ",prvec($lims[1]),"\n";
+ #print STDERR "lims ",prvec($lims[0])," .. ",prvec($lims[1]),"\n";
my $translate = -$lims[0];
- print STDERR "translate ",prvec($translate),"\n";
+ #print STDERR "translate ",prvec($translate),"\n";
my $scale = $c{GraphScale} * MM2PT;
for_each_pos(sub {
my ($pr) = @_;
@@ -230,45 +291,55 @@ sub transform_coordinates () {
$mid = ($lims[1] - $lims[0]) * 0.5;
}
-sub adjust_nz() {
- my $poly = $region{NZ}{Polygon};
+sub pos_plus_dy_adjunct ($) {
+ my ($cval) = @_;
+ my ($x,$y,$whadjunct) = @$cval;
+ my $adjunct = $adjuncts_dy_from_boundings{ $whadjunct//'' };
+ return "$x $y".( defined $adjunct and " $adjunct add translate" );
+}
+
+sub adjust_sea() {
+ # Adjusts the top and bottom edges of the sea
+ my $poly = $region{$c{Sea}}{Polygon};
my %occurs;
foreach my $v (@$poly) {
$occurs{$v->{VxName}}++
}
foreach my $v (@$poly) {
- $v->{NZ_Occurs} = $occurs{$v->{VxName}};
+ $v->{SeaOccurs} = $occurs{$v->{VxName}};
}
- print STDERR " nz ".(scalar @$poly)."\n";
+ #print STDERR " sea ".(scalar @$poly)."\n";
my $occurs_m = sub {
my ($ei) = @_;
- $poly->[($ei+@$poly) % @$poly]{NZ_Occurs} > 1
+ $poly->[($ei+@$poly) % @$poly]{SeaOccurs} > 1
};
for my $ei (0..$#$poly) {
next if $occurs_m->($ei);
next unless $occurs_m->($ei-1);
next unless $occurs_m->($ei+1);
- print STDERR " nz would adjust $poly->[$ei]{VxName}\n";
+ #print STDERR " sea would adjust $poly->[$ei]{VxName}\n";
# adjust coord outwards
}
for my $ei (0..$#$poly) {
next unless $occurs_m->($ei);
- print STDERR " nz occurs_m $ei $poly->[$ei]{VxName}\n";
+ #print STDERR " sea occurs_m $ei $poly->[$ei]{VxName}\n";
next unless $occurs_m->($ei-1);
- my $dleft = mkvec(-1000,0);
+ my $delta = &mkvec(@{ $c{PA}{OuterCoastDelta} });
foreach my $which (0,-1) {
my $ej = ($ei + $which + @$poly) % @$poly;
my $ek = ($ei + +1 + 3*$which + @$poly) % @$poly;
my $posj = \ $poly->[$ej]{Pos};
my $posk = \ $poly->[$ek]{Pos};
my $dout = $$posk - $$posj;
- print STDERR " nz adj j=$ej ",prvec($$posj)," $poly->[$ej]{VxName}\n";
- print STDERR " nz adj k=$ek ",prvec($$posk)," $poly->[$ek]{VxName}\n";
- if ($poly->[$ej]{VxName} =~ /Noorderzijlvest/) {
- print STDERR " nz adj extra\n";
- $$posk = $$posj + 10 * mkvec(100,-50);
+ #print STDERR " sea adj j=$ej ",prvec($$posj)," $poly->[$ej]{VxName}\n";
+ #print STDERR " sea adj k=$ek ",prvec($$posk)," $poly->[$ek]{VxName}\n";
+ foreach my $paocv (@{ $c{PA_Outercoast_Vertices} }) {
+ if ($poly->[$ej]{VxName} =~ m{$paocv->{Re}}) {
+ #print STDERR " sea adj extra\n";
+ $$posk = $$posj + 10 * &mkvec(@{ $paocv->{PA} });
+ }
}
- $$posj = $$posj + $dleft + $dout*10;
+ $$posj = $$posj + $delta + $dout*10;
$$posk = $$posk + $dout*10;
}
}
@@ -292,73 +363,262 @@ sub face_path ($) {
o(" closepath\n");
}
-sub pscolour ($;$) {
- my ($spec, $adj1) = @_;
- confess unless defined $spec;
- my @rgb = map { hex($_) / 15.0 } split //, $spec;
- $adj1 //= sub { };
- $adj1->(@rgb);
- my $r = join ' ',
- (map { sprintf "%.6f ", $_ } @rgb
- ),
- 'setrgbcolor';
- return $r;
+sub computeboundings() {
+ $bb{Entire} = [ 0,0, $a4_h, $a4_w + $a3_h ];
+ my $submargins = sub {
+ my ($margin, $pr) = @_;
+ my @p = @$pr;
+ [ $p[0] + $margin,
+ $p[1] + $margin,
+ $p[2] - $margin,
+ $p[3] - $margin ];
+ };
+ my $somepage = sub {
+ my $id = shift @_;
+ print STDERR "defining page Page$id\n";
+ $bb{"Page$id"} = [ @_ ];
+ $bb{"Printable$id"} = $submargins->($max_printeredge, $bb{"Page$id"});
+ };
+ my $pageb_a4 = sub {
+ $somepage->('B', 0,0, $a4_h, $a4_w );
+ };
+ if ($maxpaper eq 'a3') {
+ $pageb_a4->();
+ my $mt_offset = $bb{PrintableB}[3] - $max_printeredge;
+ $somepage->('MT', 0, $mt_offset, $a4_h, $mt_offset + $a3_h );
+ $bb{PrintableAll} = [
+ @{ $bb{PrintableB} }[0..1],
+ @{ $bb{PrintableMT} }[2..3],
+ ];
+ } elsif ($maxpaper eq 'a4') {
+ $pageb_a4->();
+ my $m_offset = $bb{PrintableB}[3] - $max_printeredge;
+ $somepage->('M', 0, $m_offset, $a4_h, $m_offset + $a4_w );
+ my $t_offset = $bb{PrintableM}[3] - $max_printeredge;
+ $somepage->('T', 0, $t_offset, $a4_h, $t_offset + $a4_w );
+ $bb{PrintableAll} = [
+ @{ $bb{PrintableB} }[0..1],
+ @{ $bb{PrintableT} }[2..3],
+ ];
+ } elsif ($maxpaper =~ m/^a1/) {
+ my $offx = ($a1_w - $bb{Entire}[2] * (1 + $a1sfactor)) / 3;
+ my $offy = 0.5*($a1_h - $bb{Entire}[3]);
+ $somepage->('P', -$offx,-$offy, $a1_w-$offx, $a1_h-$offy);
+ my $hairs = 30 * MM2PT;
+ my $hairsw = $bb{Entire}[2];
+ my $hairsh = $bb{Entire}[3];
+ my $surround = 5 * MM2PT;
+ my $surroundw = $bb{Entire}[2] + $surround*2;
+ my $surroundh = $bb{Entire}[3] + $surround*2;
+ my @hrect = @{ $bb{Entire} };
+ if ($maxpaper eq 'a1m') {
+ @hrect = @{ $submargins->($a1m_pasteedge, \@hrect) };
+ $bb{Cutout} = \@hrect;
+ }
+ my $w_stroke = $xopts =~ m/W/ ?
+ ' gsave 3 setlinewidth stroke grestore '
+ : '';
+ $preamble_from_boundings = <[0] neg $bb->[1] neg translate\n");
+ my $i = 0;
+ my $on = 2;
+ my $off = 9;
+ foreach my $bname (sort keys %bb) {
+ o(sprintf " 1 %d %d setrgbcolor\n",
+ !!($bname =~ m/^Page/),
+ !!($bname =~ m/B$/),
+ );
+ o(" % $bname\n");
+ o(" [ $on $off ] ".($i * ($on+$off))," setdash newpath\n");
+ my @p = @{ $bb{$bname} };
+ o(" $p[0] $p[1] moveto\n");
+ o(" $p[2] $p[1] lineto\n");
+ o(" $p[2] $p[3] lineto\n");
+ o(" $p[0] $p[3] lineto\n");
+ o(" closepath stroke\n");
+ $i++;
+ }
+ o(" grestore");
+}
+
+sub o_amble (@) {
+ # CPerl-mode does a really awful thing with %s in the preamble
+ # and postamble, causing constant useless flashing
+ # So we write & in the here docs and transform them back:
+ my ($t) = join '', @_;
+ $t =~ s/^\&+/ '%' x length $& /mge;
+ o($t);
}
sub preamble() {
- my $printeredge = 5 * MM2PT;
- my $xsz = 842;
- my $ysz = 3 * 595 - 4 * $printeredge;
- o(<[2] - $bb->[0], $bb->[3] - $bb->[1] ];
+ o_amble(<> setpagedevice
+/all {
+ gsave
+ $bb->[0] neg $bb->[1] neg translate
+ $preamble_from_boundings
+ board
+ grestore
+ showboundings
+} def
+/showboundings {
+END
+ showboundings();
+ o_amble(<{Name} =~ m/^L2?$/;
face_path($rr);
@@ -379,14 +639,15 @@ sub some_edge_faces (@) {
}
}
-sub afsluitdijk() {
- my ($adj) = grep { $_->{Name} eq 'NZ' } @{ $region{'ZZ'}{Adj} };
+sub dashedwithhs ($$$) {
+ my ($inner, $comment, $colour) = @_;
+ my ($adj) = grep { $_->{Name} eq $c{Sea} } @{ $region{$inner}{Adj} };
my $dash = 20;
my (@pos) = adj_ends($adj);
my $mid = 0.5 * ($pos[0] + $pos[1]);
my $r = 0.5 * ($pos[1] - $pos[0])->norm();
- o(sprintf <<'END', facepscolour('sea'), psvec($mid), $r);
- %% Afsluitdijk
+ o(sprintf <<'END', $comment, facepscolour('sea'), psvec($mid), $r);
+ %% %s
%s %s %s 0 360 arc closepath fill
END
some_edge_faces(()); # just sets the colour
@@ -396,14 +657,24 @@ END
stroke
[] 0 setdash
END
- one_hs('purple', $mid);
+ one_hs($colour, $mid);
+}
+
+sub dashedwithhses() {
+ dashedwithhs(
+ $_->{Inner},
+ $_->{Comment},
+ $_->{Colour}
+ ) foreach @{ $c{DashedHs} };
}
sub edge_faces() {
- some_edge_faces($region{'NZ'});
- afsluitdijk();
+ some_edge_faces($region{$c{Sea}});
+ dashedwithhses();
some_edge_faces(grep {
- $_->{Name} !~ m{^(?:L2?|NZ|ZZ)$}
+ my $n = $_->{Name};
+ $n !~ m{^$c{OuterfaceRe}$} &&
+ !grep { $n eq $_->{Inner} } @{ $c{DashedHs} }
} values %region);
}
@@ -429,7 +700,7 @@ sub one_hs ($$;$$) {
token_circle("HS - $colour",
$hspos,
darkerpscolour($colour, 0.75),
- '0 setgray',
+ miscpscolour('edge'),
$sz,$lw);
}
@@ -440,14 +711,16 @@ our $cube_lw = ($cube_sz * 0.1);
sub label_faces() {
my $sz = $text_sz;
my $shadow = $sz * 0.1;
+ my $textc = miscpscolour('text');
+ my $shadowc = miscpscolour('textshadow');
o(<{Name} =~ m/^L\d?$/;
my $words = $rr->{DisplayName};
my $pos;
- if ($rr->{Name} eq 'NZ') {
+ if ($rr->{Name} eq $c{Sea}) {
$pos = mkvec(90, 1280);
} else {
$pos = $rr->{Centre} + mkvec( 0, 0.5 * $sz * @$words );
}
if ($hs{$rr->{Name}}) {
- print STDERR "adjust hs $rr->{Name}\n";
- $pos -= mkvec(0, -$hs_sz*
- ( $rr->{Colour} eq 'green' ? 0.25 : 0.65 ));
+ #print STDERR "adjust hs $rr->{Name}\n";
+ my $posadj = $c{PA_HS_HS}{$rr->{Colour}};
+ $posadj //= [0,0];
+ $pos -= mkvec(0, -$hs_sz * 0.65);
+ $pos += &mkvec(@$posadj) * $hs_sz;
my $hspos = $pos - mkvec(0, $sz * @$words + $hs_sz/2 + $hs_lw
+ $hs_sz*0.15);
one_hs($rr->{Colour}, $hspos);
@@ -474,13 +749,13 @@ END
$pos += $sz * &mkvec(@$adjust);
}
my $w = $rr->{Water};
- $w = 2 if $rr->{Special} || $rr->{Name} eq 'ZZ';
+ $w = 2 if $rr->{Name} eq $c{Sea};
if ($w) {
- print STDERR " water $w in $rr->{Name}\n";
+ #print STDERR " water $w in $rr->{Name}\n";
my $down = water_cubes_sz(2) - water_cubes_sz(1) + $cube_gap;
$pos -= mkvec(0, -0.5 * $down);
my $cube_y = -($sz * @$words);
- if ($rr->{Name} eq 'Wieringermeer') {
+ if (grep { $_ eq $rr->{Name} } @{ $c{CubeAbove} }) {
$pos -= mkvec(0,+$sz);
$cube_y = 0;
$down = 0;
@@ -489,7 +764,7 @@ END
o(" ", psvec($pos), " translate\n");
o(" 0 ", $cube_y, " translate\n");
o(" ", -0.5 * water_cubes_sz($w)," ", -$down, " translate\n");
- water_cubes($w);
+ water_cubes($w, miscpscolour('edge'));
o(" grestore\n");
}
o(" /words {\n");
@@ -516,16 +791,16 @@ sub water_cubes_sz($){
($cube_sz + $cube_lw) * $n + ($cube_gap * ($n-1));
}
-sub water_cubes($){
- my ($n) = @_;
+sub water_cubes($$){
+ my ($n, $edgecolour) = @_;
my $s = $cube_sz;
for my $i (0..$n-1) {
o(" newpath ", $i * ($cube_sz + $cube_lw + $cube_gap)," 0 moveto\n");
o(" $s 0 rlineto\n");
o(" 0 $s rlineto\n");
o(" -$s 0 rlineto closepath\n");
- o(" gsave ", pscolour($c{Colours}{cube}), " fill grestore\n");
- o(" gsave ", '0 setgray ', $cube_lw,
+ o(" gsave ", miscpscolour('cube'), " fill grestore\n");
+ o(" gsave ", $edgecolour, " ", $cube_lw,
" setlinewidth stroke grestore \n");
}
}
@@ -548,24 +823,29 @@ sub decks(){
}
o(" closepath\n");
o(" } bind def");
+
o(" /deckpairpathx {\n"); # x because it leaves matrix changed
o(" newpath deck1path\n");
o(" 200 0 translate deck1path\n");
o(" } bind def");
- o(" $lw setlinewidth 1 setgray\n");
- o(" gsave 407 50 translate deckpairpathx stroke grestore");
- o(" $lw setlinewidth ",pscolour($c{Colours}{dykefail}),"\n");
- o(" gsave 225 1375 translate 90 rotate deckpairpathx stroke grestore");
+
+ foreach my $deck (@{ $c{Decks} }) {
+ o(" $lw setlinewidth ",miscpscolour($deck->{Colour}),"\n");
+ o(" gsave ".pos_plus_dy_adjunct($deck->{PosAdy})." ");
+ my $rotate = $deck->{Rotate};
+ if ($rotate) { o(" $rotate rotate "); }
+ o("deckpairpathx stroke grestore");
+ }
}
sub sea_track(){
o("% sea level track\n");
- o(" gsave 0 660 translate\n");
+ o(" gsave ",pos_plus_dy_adjunct($c{PA}{SeaTrack})," translate\n");
my $track = $c{SeaTrack};
my $token_sz = $hs_sz;
my $dy = $token_sz * 1.25;
my $dx = $token_sz * 1.25;
- my $linecolour = darkerpscolour('cube', 0.25);
+ my $linecolour = seatrackedgepscolour();
my @pos;
for my $i (0..$#$track) {
$pos[$i] = mkvec(0, ($i - 0.5 * @$track) * $dy);
@@ -575,45 +855,48 @@ sub sea_track(){
o(" ",psvec($pos[0])," moveto ",psvec($pos[-1])," lineto stroke\n");
for my $pos (@pos) {
token_circle("SL", $pos,
- pscolour($c{Colours}{cube}),
+ miscpscolour('cube'),
$linecolour);
}
- for my $i (0..$#pos-1) {
- my $differs = $track->[$i] != $track->[$i+1];
+ my $last = 0;
+ my $cubeedgecolour = seatrackedgepscolour();
+ for my $i (0..$#pos) {
+ my $differs = $track->[$i] != $last;
+ $last = $track->[$i];
+ next unless $differs;
o(" $prepline\n");
o(" gsave ",
psvec($pos[$i] + mkvec(-0.0 * $token_sz, $dy/2))," translate\n");
- if ($i >= 1 &&
- $track->[$i] == $track->[$i-1] &&
- ($i == 1 ||
- $track->[$i] != $track->[$i-2])) {
- my $t_sz = 24;
- my $shrink = ($hs_sz * 0.75 / $deck_h);
- o(" gsave % T M $i\n");
- o(" ",0.6 * $dx, " ", -0.28 * $dy," translate\n");
- o(" gsave");
- o(" $shrink dup scale -90 rotate\n");
- o(" newpath ", ($hs_lw / $shrink)," setlinewidth\n");
- o(" deck1path stroke\n");
- o(" grestore");
- o(" /Helvetica-Bold findfont $t_sz scalefont setfont\n");
- o(" 12 -22 moveto ($track->[$i]) show");
- o(" grestore\n");
- }
- if ($differs || $track->[$i]==2 && $track->[$i+2]!=2) {
- if ($differs) {
- o(" 0 0 moveto",
- " ",psvec(mkvec( $dx + $cube_sz, 0 )),
- " rlineto stroke\n");
- }
- o(" ",($token_sz * 0.6 + $cube_gap)," ",($cube_gap + $hs_lw),
- " translate\n");
- water_cubes(2);
- my $new_n = $track->[$i+1] - 2;
- o(" ", 0.5 * (water_cubes_sz(2) - water_cubes_sz($new_n)),
- " ", (water_cubes_sz(2)-water_cubes_sz(1)), " translate\n");
- water_cubes($new_n);
+
+ my $t_sz = 24;
+ my $shrink = ($hs_sz * 0.75 / $deck_h);
+ o(" gsave % T M $i\n");
+ o(" -43.5 -6.5 translate\n");
+ o(" 0.8 .8 scale \n");
+ o(" ",0.6 * $dx, " ", -0.28 * $dy," translate\n");
+ o(" gsave");
+ o(" $shrink dup scale -90 rotate\n");
+ o(" newpath ", ($hs_lw / $shrink)," setlinewidth\n");
+ o(" deck1path stroke\n");
+ o(" grestore");
+ o(" /Helvetica-Bold findfont $t_sz scalefont setfont\n");
+ o(" 12 -21.5 moveto ($track->[$i]) show");
+ o(" grestore\n");
+
+ if ($i > 0) {
+ o(" 0 -$dy moveto",
+ " ",psvec(mkvec( $dx + $cube_sz, 0 )),
+ " rlineto stroke\n");
}
+ o(" ",($token_sz * 0.6 + $cube_gap)," ",
+ (-$dy * 0.5 - 0.5 * (water_cubes_sz(2))),
+ " translate\n");
+ my $bottom = int(($track->[$i+1] + 1) / 2);
+ water_cubes($bottom, $cubeedgecolour);
+ my $new_n = $track->[$i+1] - $bottom;
+ o(" ", 0.5 * (water_cubes_sz($bottom) - water_cubes_sz($new_n)),
+ " ", (water_cubes_sz(2)-water_cubes_sz(1)), " translate\n");
+ water_cubes($new_n, $cubeedgecolour);
o(" grestore\n");
}
o(" grestore\n");
@@ -635,14 +918,14 @@ sub dykes(){
o(" } bind def\n");
o(" /dyke {\n");
o(" newpath dykepath\n");
- o(" gsave 0.50 setgray fill grestore\n");
- o(" gsave 0.00 setgray $lw setlinewidth stroke grestore\n");
+ o(" gsave ",miscpscolour('dykefill')," fill grestore\n");
+ o(" gsave ",miscpscolour('edge')," $lw setlinewidth stroke grestore\n");
o(" } bind def\n");
my $symbol_sz = $w * 1.50;
my $t_sz = $symbol_sz * 1.0;
my $t_at = sub {
my ($ang) = @_;
- print STDERR "ANG $ang\n";
+ #print STDERR "ANG $ang\n";
map { $t_sz * 0.5 * $_ } cos($ang), sin($ang);
};
my @t0 = $t_at->((TAU) * 0.25 );
@@ -652,12 +935,12 @@ sub dykes(){
o(" newpath @t0 moveto\n");
o(" @t1 lineto\n");
o(" @t2 lineto closepath\n");
- o(" gsave ",pscolour($c{Colours}{dyke})," fill grestore\n");
- o(" gsave 0 setgray $lw setlinewidth stroke grestore\n");
+ o(" gsave ",miscpscolour('dykeinit')," fill grestore\n");
+ o(" gsave ",miscpscolour('edge')," $lw setlinewidth stroke grestore\n");
o(" } bind def\n");
foreach my $rr (values %region) {
next if $rr->{Special};
- next if $rr->{Name} eq 'ZZ';
+ next if grep { $_->{Inner} eq $rr->{Name} } @{ $c{DashedHs} };
next if $rr->{Colour} eq 'high';
foreach my $adj (@{ $rr->{Adj} }) {
my $neigh = $adj->{Name};
@@ -679,71 +962,81 @@ sub dykes(){
o(" gsave 0 ", $y * $w, " translate dyke ");
o(" grestore\n");
}
- my $nsymbols = !!$initial + !!$adj->{Deltawerk};
+ my $nsymbols = $initial + !!$adj->{Deltawerk};
o(" ", -0.5 * $symbol_sz * ($nsymbols-1)," 0 translate\n");
+ my $trans = " $symbol_sz 0 translate";
if ($adj->{Deltawerk}) {
one_hs('red', mkvec(0,0), $symbol_sz * 0.8, $lw);
- o(" $symbol_sz 0 translate % DW\n");
+ o($trans);
+ }
+ foreach my $i (1..$initial) {
+ o(" gsave $angle neg rotate dtriangle grestore\n");
+ o($trans);
}
- o(" $angle neg rotate dtriangle ") if $initial;
}
o(" grestore\n");
}
}
}
-sub hs_initial_1 ($$$;$$$) {
- my ($colour, $xi,$yi, $text, $text2, $fn) = @_;
- my $interval = $hs_sz * 1.65;
+sub hs_initial_1 ($) {
+ my ($hs1) = @_;
+ my ($colour) = $hs1->{Colour};
+ my ($text, $text2);
+ if ($hs1->{Water}) {
+ ($text,$text2) = ('up to '.$hs1->{Water}, 'fewer');
+ } elsif ($hs1->{Dykes}) {
+ ($text,$text2) = ('up to '.$hs1->{Dykes}, '');
+ }
+ my $interval = $hs_sz * 1.75;
my $demo_h = $hs_sz; #water_cubes_sz(3);
my $demo_x0 = $hs_sz * 0.75 + $dyke_l * 0.60;
my $demo_w = $demo_x0 + $dyke_l * 0.60;
o(" % HS I $colour\n");
o(" gsave\n");
- o(" 550 1710 translate\n");
- o(" ", ($xi*$interval), " ", (($yi-1)*$interval), " translate\n");
- if ($fn) {
- o(" gsave");
+ o(" ".pos_plus_dy_adjunct($c{PA}{HS1_initials})."\n");
+ o(" ", ($hs1->{XIYI}[0]*$interval), " ",
+ (($hs1->{XIYI}[1]-1)*$interval), " translate\n");
+ if (defined $text) {
+ o(" gsave\n");
o(" $demo_h setlinewidth 0 0 moveto $demo_w 0 rlineto\n");
o(" ", facepscolour($colour), " stroke grestore\n");
}
one_hs($colour, mkvec(0,0));
- if ($fn) {
- o(" /words {");
- o(" 2 copy moveto ($text) show");
- o(" 2 copy moveto 0 -$text_sz rmoveto ($text2) show");
- o(" } bind def");
+ if (defined $text) {
+ o(" /words {\n");
+ o(" 2 copy moveto ($text) show\n");
+ o(" 2 copy moveto 0 -$text_sz rmoveto ($text2) show\n");
+ o(" } bind def\n");
o(" gsave ".($hs_sz * 0.8)." $cube_gap translate wordsshow grestore\n");
o(" $demo_x0 ",($hs_sz * -0.25)," translate\n");
- $fn->();
+ }
+ if ($hs1->{Water}) {
+ o(" ",(water_cubes_sz(1))," 0 translate\n");
+ o(" 0 ",(-water_cubes_sz(1) * 0.3)," translate\n");
+ water_cubes(1, miscpscolour('edge'));
+ } elsif ($hs1->{Dykes}) {
+ o(" newpath dykepath\n");
+ o(" gsave ",miscpscolour('edge')," stroke grestore\n");
+ o(" gsave ",miscpscolour('dykehsadd')," fill grestore\n");
}
o(" grestore\n");
}
sub hs_initial () {
- hs_initial_1('red', 0,0);
- hs_initial_1('purple', 0,1);
- hs_initial_1('green', 1,0, 'up to 6', 'fewer', sub {
- o(" ",(water_cubes_sz(1))," 0 translate\n");
- o(" 0 ",(-water_cubes_sz(1) * 0.3)," translate\n");
- water_cubes(1);
- });
- hs_initial_1('yellow', 1,1, 'up to 4', '', sub {
- o(" newpath dykepath\n");
- o(" gsave 0.50 setgray fill grestore\n");
- o(" gsave ",pscolour($c{Colours}{dyke})," fill grestore\n");
- });
+ hs_initial_1($_) foreach @{ $c{HS1} };
}
sub play_hint () {
my $sz = 20;
- o(" gsave 0 setgray 260 1720 translate");
- o(" /Helvetica-Bold findfont $sz scalefont setfont");
+ o(" gsave ",miscpscolour('hinttext'),
+ " ",pos_plus_dy_adjunct($c{PA}{PlayHint}),"\n");
+ o(" /Helvetica-Bold findfont $sz scalefont setfont\n");
my @t = split /\n/, $c{PlayHint};
foreach my $i (0..$#t) {
my $t = $t[$i];
$t =~ s/[\\()]/\\$&/g;
- o(" 0 ",(-$i * $sz)," moveto ($t) show");
+ o(" 0 ",(-$i * $sz)," moveto ($t) show\n");
}
o(" grestore");
}
@@ -751,6 +1044,9 @@ sub play_hint () {
#----- main program -----
$xopts = shift @ARGV if $ARGV[0] =~ s/^-X//;
+$bounding = $1 if $xopts =~ s/b(\w+)//;
+$maxpaper = $1 if $xopts =~ s/p(\w+)//;
+$maxpaper =~ m/^a[134]$|^a1m$/ or confess;
($facesf, @ARGV) = @ARGV or die;
parse_input_graph();
@@ -758,8 +1054,9 @@ prep_region_rmap();
read_faces();
calculate_centres();
transform_coordinates();
-adjust_nz();
+adjust_sea();
+computeboundings();
preamble();
fill_faces();
edge_faces();