| … | |
… | |
| 6 | my $exec_prefix = "@exec_prefix@"; |
6 | my $exec_prefix = "@exec_prefix@"; |
| 7 | my $datarootdir = "@datarootdir@"; |
7 | my $datarootdir = "@datarootdir@"; |
| 8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
| 9 | |
9 | |
| 10 | my $CONVERT = "@CONVERT@"; |
10 | my $CONVERT = "@CONVERT@"; |
| 11 | my $IDENTIFY = "@IDENTIFY@"; |
11 | #my $IDENTIFY = "@IDENTIFY@"; |
| 12 | my $OPTIPNG = "@OPTIPNG@"; |
12 | my $OPTIPNG = "@OPTIPNG@"; |
| 13 | my $RSYNC = "@RSYNC@"; |
13 | my $RSYNC = "@RSYNC@"; |
|
|
14 | my $PNGNQ = "@PNGNQ@"; |
| 14 | |
15 | |
| 15 | use Getopt::Long; |
16 | use Getopt::Long; |
| 16 | use Coro::Event; |
17 | use Coro::Event; |
| 17 | use AnyEvent; |
18 | use AnyEvent; |
| 18 | use IO::AIO (); |
19 | use IO::AIO (); |
| 19 | use File::Temp; |
20 | use File::Temp; |
| 20 | use Crossfire; |
21 | use Crossfire; |
| 21 | use Coro; |
22 | use Coro; |
| 22 | use Coro::AIO; |
23 | use Coro::AIO; |
|
|
24 | use Coro::Util; |
| 23 | use POSIX (); |
25 | use POSIX (); |
| 24 | use Digest::MD5; |
26 | use Carp; |
|
|
27 | use Coro::Channel; |
|
|
28 | use Coro::Storable; $Storable::canonical = 1; |
|
|
29 | |
|
|
30 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
| 25 | |
31 | |
| 26 | sub usage { |
32 | sub usage { |
| 27 | warn <<EOF; |
33 | warn <<EOF; |
| 28 | Usage: cfutil [-v] [-q] [--force] [--cache] |
34 | Usage: cfutil [-v] [-q] [--force] [--cache] |
| 29 | [--install-arch path] |
35 | [--install-arch path] |
| … | |
… | |
| 41 | my $CACHE = 0; |
47 | my $CACHE = 0; |
| 42 | my $FORCE; |
48 | my $FORCE; |
| 43 | my $TMPDIR = "/tmp/cfutil$$~"; |
49 | my $TMPDIR = "/tmp/cfutil$$~"; |
| 44 | my $TMPFILE = "aaaa0"; |
50 | my $TMPFILE = "aaaa0"; |
| 45 | |
51 | |
|
|
52 | our %COLOR = ( |
|
|
53 | black => 0, |
|
|
54 | white => 1, |
|
|
55 | navy => 2, |
|
|
56 | red => 3, |
|
|
57 | orange => 4, |
|
|
58 | blue => 5, |
|
|
59 | darkorange => 6, |
|
|
60 | green => 7, |
|
|
61 | lightgreen => 8, |
|
|
62 | grey => 9, |
|
|
63 | brown => 10, |
|
|
64 | gold => 11, |
|
|
65 | tan => 12, |
|
|
66 | ); |
|
|
67 | |
| 46 | END { system "rm", "-rf", $TMPDIR } |
68 | END { system "rm", "-rf", $TMPDIR } |
| 47 | |
69 | |
| 48 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
70 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
| 49 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
71 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
| 50 | |
72 | |
| … | |
… | |
| 67 | } |
89 | } |
| 68 | |
90 | |
| 69 | sub inst_maps($) { |
91 | sub inst_maps($) { |
| 70 | my (undef, $path) = @_; |
92 | my (undef, $path) = @_; |
| 71 | |
93 | |
| 72 | print "installing '$path' to '$DATADIR/maps'\n"; |
94 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
| 73 | |
95 | |
| 74 | if (!-f "$path/regions") { |
96 | if (!-f "$path/regions") { |
| 75 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
97 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
| 76 | exit 1 unless $FORCE; |
98 | exit 1 unless $FORCE; |
| 77 | } |
99 | } |
| 78 | |
100 | |
| 79 | system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
101 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
| 80 | and die "map installation failed.\n"; |
102 | and die "map installation failed.\n"; |
| 81 | |
103 | |
| 82 | print "maps installed successfully.\n"; |
104 | print "maps installed successfully.\n"; |
| 83 | } |
105 | } |
| 84 | |
106 | |
| 85 | { |
107 | { |
| 86 | our %PNG32; |
108 | our %ANIMINFO; |
| 87 | our %FACEINFO; |
109 | our %FACEINFO; |
|
|
110 | our %RESOURCE; |
| 88 | our @ARC; |
111 | our @ARC; |
|
|
112 | our %ARC; |
| 89 | our $TRS; |
113 | our $TRS; |
| 90 | our $NFILE; |
114 | our $NFILE; |
| 91 | our %ANIM; |
115 | our $PATH; |
| 92 | |
116 | |
| 93 | our (@png, @trs, @arc); # files we are interested in |
117 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 94 | |
118 | |
|
|
119 | our $c_arc = new Coro::Channel; |
|
|
120 | our $c_trs = new Coro::Channel; |
|
|
121 | our $c_res = new Coro::Channel; |
|
|
122 | |
|
|
123 | our @c_png; |
|
|
124 | |
| 95 | sub commit_png { |
125 | sub commit_png($$$) { |
| 96 | my ($name, $data) = @_; |
126 | my ($name, $data, $T) = @_; |
| 97 | |
127 | |
| 98 | $PNG32{$name} = $data; |
128 | $FACEINFO{$name}{"data$T"} = $data; |
| 99 | $FACEINFO{$name} ||= {}; |
|
|
| 100 | } |
129 | } |
| 101 | |
130 | |
| 102 | sub process_png { |
131 | sub process_png { |
| 103 | while (@png) { |
132 | while (@c_png) { |
| 104 | my $path = pop @png; |
133 | my ($path, $delete) = @{pop @c_png}; |
| 105 | |
134 | |
| 106 | my $png; |
135 | my $png; |
| 107 | aio_lstat $path; |
136 | aio_lstat $path; |
| 108 | my ($size, $mtime) = (stat _)[7,9]; |
137 | my ($size, $mtime) = (stat _)[7,9]; |
| 109 | |
138 | |
| 110 | if (0 > aio_load $path, $png) { |
139 | if (0 > aio_load $path, $png) { |
| 111 | warn "$path: $!, skipping.\n"; |
140 | warn "$path: $!, skipping.\n"; |
| 112 | next; |
141 | next; |
| 113 | } |
142 | } |
| 114 | |
143 | |
|
|
144 | my $stem = $path; |
|
|
145 | my $T; |
|
|
146 | |
|
|
147 | if ($stem =~ s/\.32x32\.png~?$//) { |
|
|
148 | $T = 32; |
|
|
149 | } elsif ($stem =~ s/\.64x64\.png~?$//) { |
|
|
150 | $T = 64; |
|
|
151 | } else { |
|
|
152 | warn "$path: weird filename, skipping.\n"; |
|
|
153 | next; |
|
|
154 | } |
|
|
155 | |
| 115 | # quickly extract width and height of the (necessarily PNG) image |
156 | # quickly extract width and height of the (necessarily PNG) image |
| 116 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
157 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
| 117 | warn "$path: not a recongized png file, skipping.\n"; |
158 | warn "$path: not a recognized png file, skipping.\n"; |
| 118 | next; |
159 | next; |
| 119 | } |
160 | } |
| 120 | |
161 | |
| 121 | my ($w, $h) = unpack "NN", $1; |
162 | my ($w, $h) = unpack "NN", $1; |
| 122 | |
|
|
| 123 | (my $face = $path) =~ s/^.*\///; |
|
|
| 124 | my $T = 32; |
|
|
| 125 | |
|
|
| 126 | unless ($face =~ s/\.base\.(...)\.png$/.$1/) { |
|
|
| 127 | warn "$path: weird filename, skipping.\n"; |
|
|
| 128 | next; |
|
|
| 129 | } |
|
|
| 130 | |
163 | |
| 131 | if ($w < $T || $h < $T) { |
164 | if ($w < $T || $h < $T) { |
| 132 | warn "$path: too small ($w $h), skipping.\n"; |
165 | warn "$path: too small ($w $h), skipping.\n"; |
| 133 | next; |
166 | next; |
| 134 | } |
167 | } |
| … | |
… | |
| 136 | if ($w % $T || $h % $T) { |
169 | if ($w % $T || $h % $T) { |
| 137 | warn "$path: weird png size ($w $h), skipping.\n"; |
170 | warn "$path: weird png size ($w $h), skipping.\n"; |
| 138 | next; |
171 | next; |
| 139 | } |
172 | } |
| 140 | |
173 | |
|
|
174 | (my $base = $stem) =~ s/^.*\///; |
|
|
175 | |
|
|
176 | my $fi = $FACEINFO{$base}; |
|
|
177 | unless ($fi) { |
|
|
178 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
|
|
179 | #next; |
|
|
180 | } |
|
|
181 | |
|
|
182 | my $arc = $fi->{arc} || { }; |
|
|
183 | |
|
|
184 | unless ($path =~ /~$/) { |
|
|
185 | # possibly enlarge |
|
|
186 | if (0 > aio_stat "$stem.64x64.png") { |
|
|
187 | my $other = "$stem.64x64.png~"; |
|
|
188 | |
|
|
189 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
|
|
190 | fork_sub { |
|
|
191 | my $CROP; |
|
|
192 | my $SRC = "png:\Q$path\E"; |
|
|
193 | |
|
|
194 | my $is_floor = $arc->{is_floor}; |
|
|
195 | my $is_wall = 0; |
|
|
196 | |
|
|
197 | my ($wall_pfx, $wall_dir, $wall_sfx); |
|
|
198 | |
|
|
199 | if ( |
|
|
200 | !$is_floor |
|
|
201 | && !$arc->{alive} |
|
|
202 | && $arc->{move_block} eq "all" |
|
|
203 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
|
|
204 | ) { |
|
|
205 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
|
|
206 | |
|
|
207 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
|
|
208 | $is_wall = 1; |
|
|
209 | } |
|
|
210 | } |
|
|
211 | |
|
|
212 | if ($is_wall || $is_floor) { |
|
|
213 | # add a 4px border and add other images around it |
|
|
214 | $CROP = "-shave 8x8 +repage"; |
|
|
215 | |
|
|
216 | $w += 8; |
|
|
217 | $h += 8; |
|
|
218 | |
|
|
219 | $SRC = "-size ${w}x${h} xc:transparent"; |
|
|
220 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
|
|
221 | |
|
|
222 | # 8 surrounding images |
|
|
223 | for ( |
|
|
224 | # x y b r0 r1 |
|
|
225 | [-1, -1, 0, 6], |
|
|
226 | [ 0, -1, 1, 10, 14], |
|
|
227 | [+1, -1, 0, 12], |
|
|
228 | |
|
|
229 | [-1, 0, 8, 5, 7], |
|
|
230 | # |
|
|
231 | [+1, 0, 2, 5, 13], |
|
|
232 | |
|
|
233 | [-1, +1, 0, 3], |
|
|
234 | [ 0, +1, 4, 10, 11], |
|
|
235 | [+1, +1, 0, 9], |
|
|
236 | ) { |
|
|
237 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
238 | |
|
|
239 | my $tile = $is_floor ? $path |
|
|
240 | : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx |
|
|
241 | : die; |
|
|
242 | |
|
|
243 | $SRC .= sprintf " png:%s -geometry %+d%+d -composite", |
|
|
244 | "\Q$tile", |
|
|
245 | $x * ($w - 8) + 4, |
|
|
246 | $y * ($h - 8) + 4; |
|
|
247 | } |
|
|
248 | } |
|
|
249 | |
|
|
250 | system "convert -depth 8 $SRC rgba:-" |
|
|
251 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
|
|
252 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
|
|
253 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
|
|
254 | system $OPTIPNG, "-i0", "-q", "$other~"; |
|
|
255 | die "$other~ has zero size, aborting." unless -s "$other~"; |
|
|
256 | rename "$other~", $other; |
|
|
257 | }; |
|
|
258 | } |
|
|
259 | |
|
|
260 | push @c_png, [$other, !$CACHE]; |
|
|
261 | } |
|
|
262 | |
|
|
263 | # possibly scale down |
|
|
264 | if (0 > aio_stat "$stem.32x32.png") { |
|
|
265 | my $other = "$stem.32x32.png~"; |
|
|
266 | |
|
|
267 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
|
|
268 | fork_sub { |
|
|
269 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
|
|
270 | system $OPTIPNG, "-i0", "-q", "$other~"; |
|
|
271 | |
|
|
272 | # reduce smoothfaces >10000 bytes |
|
|
273 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
|
|
274 | my $ncolor = 256; |
|
|
275 | while () { |
|
|
276 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
|
|
277 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
|
|
278 | last if 10000 > -s "$other~~"; |
|
|
279 | $ncolor = int $ncolor * 0.9; |
|
|
280 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
|
|
281 | } |
|
|
282 | |
|
|
283 | printf "reduced %s from %d to %d bytes using %d colours.\n", |
|
|
284 | $other, -s "$other~", -s "$other~~", $ncolor |
|
|
285 | if $VERBOSE >= 2; |
|
|
286 | rename "$other~~", "$other~"; |
|
|
287 | } |
|
|
288 | |
|
|
289 | die "$other~ has zero size, aborting." unless -s "$other~"; |
|
|
290 | rename "$other~", $other; |
|
|
291 | }; |
|
|
292 | } |
|
|
293 | |
|
|
294 | #warn "scaled down $path to $other\n";#d# |
|
|
295 | push @c_png, [$other, !$CACHE]; |
|
|
296 | } |
|
|
297 | } |
|
|
298 | |
|
|
299 | (my $face = $stem) =~ s/^.*\///; |
|
|
300 | |
|
|
301 | # split all bigfaces, but avoid smoothfaces (*_S) |
| 141 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
302 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
| 142 | # split |
303 | # split |
| 143 | my @tile; |
304 | my @tile; |
| 144 | for my $x (0 .. (int $w / $T) - 1) { |
305 | for my $x (0 .. (int $w / $T) - 1) { |
| 145 | for my $y (0 .. (int $h / $T) - 1) { |
306 | for my $y (0 .. (int $h / $T) - 1) { |
| … | |
… | |
| 159 | ( |
320 | ( |
| 160 | "(", |
321 | "(", |
| 161 | "+clone", |
322 | "+clone", |
| 162 | -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), |
323 | -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), |
| 163 | "+repage", |
324 | "+repage", |
|
|
325 | -quality => "00", |
| 164 | -write => "png:$_->[2]~", |
326 | -write => "png32:$_->[2]~", |
| 165 | "+delete", |
327 | "+delete", |
| 166 | ")", |
328 | ")", |
| 167 | ) |
329 | ) |
| 168 | } @todo), |
330 | } @todo), |
| 169 | "null:"; |
331 | "null:"; |
| … | |
… | |
| 173 | close $convert; |
335 | close $convert; |
| 174 | |
336 | |
| 175 | # pass 2, optimise, and rename |
337 | # pass 2, optimise, and rename |
| 176 | for (@todo) { |
338 | for (@todo) { |
| 177 | system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; |
339 | system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; |
|
|
340 | die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; |
| 178 | rename "$_->[2]~", $_->[2]; |
341 | rename "$_->[2]~", $_->[2]; |
| 179 | } |
342 | } |
| 180 | }; |
343 | }; |
| 181 | } |
344 | } |
| 182 | |
345 | |
| … | |
… | |
| 186 | |
349 | |
| 187 | if (0 > aio_load $file, $tile) { |
350 | if (0 > aio_load $file, $tile) { |
| 188 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
351 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
| 189 | } |
352 | } |
| 190 | IO::AIO::aio_unlink $file unless $CACHE; |
353 | IO::AIO::aio_unlink $file unless $CACHE; |
| 191 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile; |
354 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
| 192 | } |
355 | } |
| 193 | } else { |
356 | } else { |
| 194 | # use as-is (either small, use smooth) |
357 | # use as-is (either small, use smooth) |
| 195 | commit_png $face, $png; |
358 | commit_png $face, $png, $T; |
| 196 | } |
359 | } |
|
|
360 | |
|
|
361 | aio_unlink $path if $delete; |
| 197 | } |
362 | } |
| 198 | } |
363 | } |
| 199 | |
364 | |
| 200 | sub process_arc { |
365 | sub process_arc { |
| 201 | while (@arc) { |
366 | while (my $job = $c_arc->get) { |
| 202 | my ($dir, $file) = @{pop @arc}; |
367 | my ($dir, $file) = @$job; |
| 203 | |
368 | |
| 204 | my $arc; |
369 | my $arc; |
| 205 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
370 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 206 | |
371 | |
| 207 | my $arc = read_arch "$dir/$file"; |
372 | my $arc = read_arch "$dir/$file"; |
| 208 | for my $o (values %$arc) { |
373 | for my $o (values %$arc) { |
| 209 | push @ARC, $o; |
374 | push @ARC, $o; |
|
|
375 | for (my $m = $o; $m; $m = $m->{more}) { |
|
|
376 | $ARC{$m->{_name}} = $m; |
|
|
377 | } |
| 210 | |
378 | |
| 211 | $o->{editor_folder} = $dir; |
379 | $o->{editor_folder} = $dir; |
| 212 | |
380 | |
| 213 | my $visibility = delete $o->{visibility}; |
381 | my $visibility = delete $o->{visibility}; |
| 214 | my $magicmap = delete $o->{magicmap}; |
382 | my $magicmap = delete $o->{magicmap}; |
| … | |
… | |
| 225 | my $x = $o->{x} - $dx; |
393 | my $x = $o->{x} - $dx; |
| 226 | my $y = $o->{y} - $dy; |
394 | my $y = $o->{y} - $dy; |
| 227 | |
395 | |
| 228 | my $ext = $x|$y ? "+$x+$y" : ""; |
396 | my $ext = $x|$y ? "+$x+$y" : ""; |
| 229 | |
397 | |
| 230 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; |
398 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
| 231 | |
399 | |
| 232 | my $visibility = delete $o->{visibility} if exists $o->{visibility}; |
400 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
| 233 | my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
401 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
| 234 | |
402 | |
| 235 | my $anim = delete $o->{anim}; |
403 | my $anim = delete $o->{anim}; |
| 236 | |
404 | |
| 237 | if ($anim) { |
405 | if ($anim) { |
|
|
406 | # possibly add $ext to the animation name to avoid |
|
|
407 | # the need to specify archnames for all parts |
|
|
408 | # of a multipart archetype. |
| 238 | $o->{animation} = "$o->{_name}"; |
409 | $o->{animation} = "$o->{_name}"; |
|
|
410 | my $facings = 1; |
|
|
411 | my @frames; |
| 239 | |
412 | |
| 240 | for (@$anim) { |
413 | for (@$anim) { |
| 241 | $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; |
414 | if (/^facings\s+(\d+)/) { |
|
|
415 | $facings = $1*1; |
|
|
416 | } elsif (/^blank.x11$|^empty.x11$/) { |
|
|
417 | push @frames, $_; |
|
|
418 | } else { |
|
|
419 | push @frames, "$_$ext"; |
|
|
420 | } |
| 242 | } |
421 | } |
| 243 | |
422 | |
| 244 | $ANIM{"$o->{_name}$ext"} = |
423 | $ANIMINFO{$o->{animation}} = { |
| 245 | join "", map "$_\n", |
424 | facings => $facings, |
| 246 | "anim $o->{_name}", |
425 | frames => \@frames, |
| 247 | @$anim, |
426 | }; |
| 248 | "mina"; |
|
|
| 249 | } |
427 | } |
| 250 | |
428 | |
| 251 | for my $face ($o->{face} || (), @{$anim || []}) { |
429 | for ($o->{face} || (), @{$anim || []}) { |
| 252 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
430 | next if /^facings\s/; |
| 253 | |
431 | |
|
|
432 | my $face = $_; |
|
|
433 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
434 | |
| 254 | my $info = $FACEINFO{$face} ||= {}; |
435 | my $info = $FACEINFO{$face} ||= { }; |
|
|
436 | $info->{arc} = $o; |
|
|
437 | |
|
|
438 | next if $face =~ /^blank.x11$|^empty.x11$/; |
| 255 | |
439 | |
| 256 | $info->{visibility} = $visibility if defined $visibility; |
440 | $info->{visibility} = $visibility if defined $visibility; |
| 257 | $info->{magicmap} = $magicmap if defined $magicmap; |
441 | $info->{magicmap} = $magicmap if defined $magicmap; |
| 258 | } |
442 | } |
| 259 | |
443 | |
| 260 | if (my $smooth = delete $o->{smoothface}) { |
444 | if (my $smooth = delete $o->{smoothface}) { |
| 261 | my ($face, $smooth) = split /\s+/, $smooth; |
445 | my %kv = split /\s+/, $smooth; |
| 262 | # skip empty_S.x11, it seems to server no purpose whatsoever |
446 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
| 263 | # but increases bandwidth demands and worse. |
447 | while (my ($face, $smooth) = each %kv) { |
| 264 | unless ($smooth eq "empty_S.x11") { |
448 | $FACEINFO{$smooth}{arc} = $o; |
|
|
449 | |
| 265 | $FACEINFO{$face}{smooth} = $smooth; |
450 | $FACEINFO{$face}{smooth} = $smooth; |
|
|
451 | $FACEINFO{$face}{smoothlevel} = $level; |
| 266 | } |
452 | } |
| 267 | } |
453 | } |
| 268 | } |
454 | } |
| 269 | } |
455 | } |
| 270 | } |
456 | } |
| 271 | } |
457 | } |
| 272 | |
458 | |
| 273 | sub process_trs { |
459 | sub process_trs { |
| 274 | while (@trs) { |
460 | while (my $job = $c_trs->get) { |
| 275 | my ($dir, $file) = @{pop @trs}; |
461 | my ($dir, $file) = @$job; |
| 276 | my $path = "$dir/$file"; |
462 | my $path = "$dir/$file"; |
| 277 | |
463 | |
| 278 | my $trs; |
464 | my $trs; |
| 279 | if (0 > aio_load $path, $trs) { |
465 | if (0 > aio_load $path, $trs) { |
| 280 | warn "$path: $!, skipping.\n"; |
466 | warn "$path: $!, skipping.\n"; |
| … | |
… | |
| 283 | |
469 | |
| 284 | $TRS .= $trs; |
470 | $TRS .= $trs; |
| 285 | } |
471 | } |
| 286 | } |
472 | } |
| 287 | |
473 | |
|
|
474 | my %FILECACHE; |
|
|
475 | |
|
|
476 | sub load_cached($;$) { |
|
|
477 | unless (exists $FILECACHE{$_[0]}) { |
|
|
478 | my $data; |
|
|
479 | if (0 < aio_load $_[0], $data) { |
|
|
480 | if ($_[1]) { |
|
|
481 | $data = eval { $_[1]->($data) }; |
|
|
482 | warn "$_[0]: $@" if $@; |
|
|
483 | } |
|
|
484 | } |
|
|
485 | |
|
|
486 | $FILECACHE{$_[0]} = $data; |
|
|
487 | } |
|
|
488 | |
|
|
489 | $FILECACHE{$_[0]} |
|
|
490 | } |
|
|
491 | |
|
|
492 | sub process_res { |
|
|
493 | while (my $job = $c_res->get) { |
|
|
494 | my ($dir, $file, $type) = @$job; |
|
|
495 | |
|
|
496 | my $data; |
|
|
497 | aio_load "$dir/$file", $data; |
|
|
498 | |
|
|
499 | |
|
|
500 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
|
|
501 | |
|
|
502 | utf8::decode $dir; |
|
|
503 | utf8::decode $file; |
|
|
504 | |
|
|
505 | # a meta file for resources is now mandatory |
|
|
506 | unless (exists $meta->{$file}) { |
|
|
507 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
508 | next; |
|
|
509 | } |
|
|
510 | |
|
|
511 | $meta = { |
|
|
512 | %{ $meta->{"" } || {} }, |
|
|
513 | %{ $meta->{$file} || {} }, |
|
|
514 | }; |
|
|
515 | |
|
|
516 | if ($meta->{license} =~ s/^#//) { |
|
|
517 | $meta->{license} = ({ |
|
|
518 | "pd" => "Public Domain", |
|
|
519 | "gpl" => "GNU General Public License, version 3.0 or any later", |
|
|
520 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
521 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
|
|
522 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
|
|
523 | })->{$meta->{license}} |
|
|
524 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
|
|
525 | } |
|
|
526 | |
|
|
527 | $file =~ s/\.res$//; |
|
|
528 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
|
|
529 | |
|
|
530 | substr $dir, 0, 1 + length $PATH, ""; |
|
|
531 | |
|
|
532 | $RESOURCE{"$dir/$file"} = { |
|
|
533 | type => (delete $meta->{type}) || $type, |
|
|
534 | data => $data, |
|
|
535 | %$meta ? (meta => $meta) : (), |
|
|
536 | }; |
|
|
537 | } |
|
|
538 | } |
|
|
539 | |
| 288 | sub find_files; |
540 | sub find_files; |
| 289 | sub find_files { |
541 | sub find_files { |
| 290 | my ($path) = @_; |
542 | my ($path) = @_; |
| 291 | |
543 | |
| 292 | IO::AIO::aioreq_pri 4; |
544 | IO::AIO::aioreq_pri 4; |
| … | |
… | |
| 294 | my ($dirs, $nondirs) = @_; |
546 | my ($dirs, $nondirs) = @_; |
| 295 | |
547 | |
| 296 | find_files "$path/$_" |
548 | find_files "$path/$_" |
| 297 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
549 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
| 298 | |
550 | |
|
|
551 | my $dir = $path; |
|
|
552 | substr $dir, 0, 1 + length $PATH, ""; |
|
|
553 | |
| 299 | for my $file (@$nondirs) { |
554 | for my $file (@$nondirs) { |
|
|
555 | if ($dir =~ /^music(?:\/|$)/) { |
|
|
556 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
|
|
557 | if $file =~ /\.(ogg)$/; |
|
|
558 | |
|
|
559 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
|
|
560 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
|
|
561 | if $file =~ /\.(wav|ogg)$/; |
|
|
562 | |
|
|
563 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
564 | $c_res->put ([$path, $file, 0]) # FT_FACE |
|
|
565 | if $file =~ /\.(jpg|png)$/; |
|
|
566 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
|
|
567 | if $file =~ /\.(res)$/; |
|
|
568 | |
| 300 | if ($file =~ /\.png$/) { |
569 | } elsif ($file =~ /\.png$/) { |
| 301 | push @png, "$path/$file"; |
570 | push @c_png, ["$path/$file", 0]; |
|
|
571 | |
| 302 | } elsif ($file =~ /\.trs$/) { |
572 | } elsif ($file =~ /\.trs$/) { |
| 303 | push @trs, [$path, $file]; |
573 | $c_trs->put ([$path, $file]); |
|
|
574 | |
| 304 | } elsif ($file =~ /\.arc$/) { |
575 | } elsif ($file =~ /\.arc$/) { |
| 305 | push @arc, [$path, $file]; |
576 | $c_arc->put ([$path, $file]); |
|
|
577 | |
| 306 | } else { |
578 | } else { |
| 307 | warn "ignoring $path/$file\n" if $VERBOSE >= 2; |
579 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
| 308 | } |
580 | } |
| 309 | } |
581 | } |
| 310 | }; |
582 | }; |
| 311 | } |
583 | } |
| 312 | |
584 | |
| 313 | sub inst_arch($) { |
585 | sub inst_arch($) { |
| 314 | my (undef, $path) = @_; |
586 | my (undef, $path) = @_; |
| 315 | |
587 | |
|
|
588 | $PATH = $path; |
|
|
589 | |
|
|
590 | print "\n", |
| 316 | print "installing '$path' to '$DATADIR'\n"; |
591 | "Installing '$path' to '$DATADIR'\n", |
|
|
592 | "\n", |
|
|
593 | "This can take a long time if you run this\n", |
|
|
594 | "for the first time or do not use --cache.\n", |
|
|
595 | "\n", |
|
|
596 | "Unless you run verbosely, all following warning\n", |
|
|
597 | "or error messages indicate serious problems.\n", |
|
|
598 | "\n"; |
| 317 | |
599 | |
| 318 | if (!-d "$path/treasures") { |
600 | if (!-d "$path/treasures") { |
| 319 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
601 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 320 | exit 1 unless $FORCE; |
602 | exit 1 unless $FORCE; |
| 321 | } |
603 | } |
| 322 | |
604 | |
|
|
605 | print "scanning files...\n" if $VERBOSE; |
|
|
606 | |
| 323 | find_files $path; |
607 | find_files $path; |
|
|
608 | |
|
|
609 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
610 | my @a_res = map +(async \&process_res), 1..2; |
|
|
611 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
612 | |
| 324 | IO::AIO::flush; |
613 | IO::AIO::flush; |
| 325 | |
614 | |
| 326 | $_->join for ( |
615 | $c_res->put (undef) for @a_res; |
| 327 | (async \&process_png), (async \&process_png), |
616 | $c_arc->put (undef) for @a_arc; |
| 328 | (async \&process_trs), (async \&process_trs), |
617 | $c_trs->put (undef) for @a_trs; |
| 329 | (async \&process_arc), (async \&process_arc), |
|
|
| 330 | ); |
|
|
| 331 | |
618 | |
|
|
619 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
620 | |
|
|
621 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
622 | |
|
|
623 | print "end arc, start png processing...\n" if $VERBOSE; |
|
|
624 | |
|
|
625 | # four png crunchers work fine for my 2x smp machine |
|
|
626 | my @a_png = map +(async \&process_png), 1..4; |
|
|
627 | |
|
|
628 | $_->join for (@a_trs, @a_res, @a_png); |
|
|
629 | |
|
|
630 | print "scanning done, processing results...\n" if $VERBOSE; |
| 332 | { |
631 | { |
| 333 | open my $fh, ">:utf8", "$DATADIR/animations~" |
632 | # remove path prefix from editor_folder |
| 334 | or die "$DATADIR/animations~: $!"; |
633 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
| 335 | print $fh join "", map $ANIM{$_}, sort keys %ANIM |
634 | for values %ARC; |
|
|
635 | |
|
|
636 | print "resolving inheritance tree...\n" if $VERBOSE; |
|
|
637 | # resolve inherit |
|
|
638 | while () { |
|
|
639 | my $progress; |
|
|
640 | my $loop; |
|
|
641 | |
|
|
642 | for my $o (values %ARC) { |
|
|
643 | if (my $other = $o->{inherit}) { |
|
|
644 | if (my $s = $ARC{$other}) { |
|
|
645 | if ($s->{inherit}) { |
|
|
646 | $loop = $s; |
|
|
647 | } else { |
|
|
648 | delete $o->{inherit}; |
|
|
649 | my %s = %$s; |
|
|
650 | delete @s{qw(_name more name name_pl)}; |
|
|
651 | %$o = ( %s, %$o ); |
|
|
652 | ++$progress; |
|
|
653 | } |
|
|
654 | } else { |
|
|
655 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
|
|
656 | delete $ARC{$o->{_name}}; |
|
|
657 | } |
|
|
658 | } |
|
|
659 | } |
|
|
660 | |
|
|
661 | unless ($progress) { |
|
|
662 | die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n" |
|
|
663 | if $loop; |
|
|
664 | |
|
|
665 | last; |
|
|
666 | } |
| 336 | } |
667 | } |
| 337 | |
668 | |
| 338 | { |
669 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
|
|
670 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
|
|
671 | |
|
|
672 | print "writing archetypes...\n" if $VERBOSE; |
| 339 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
673 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 340 | or die "$DATADIR/archetypes~: $!"; |
674 | or die "$DATADIR/archetypes~: $!"; |
| 341 | substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; |
675 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 342 | print $fh Crossfire::archlist_to_string \@ARC; |
|
|
| 343 | } |
676 | } |
| 344 | |
677 | |
| 345 | { |
678 | { |
|
|
679 | print "writing treasures...\n" if $VERBOSE; |
| 346 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
680 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 347 | or die "$DATADIR/treasures~: $!"; |
681 | or die "$DATADIR/treasures~: $!"; |
| 348 | print $fh $TRS; |
682 | print $fh $TRS; |
| 349 | } |
683 | } |
| 350 | |
684 | |
| 351 | { |
685 | { |
| 352 | while (my ($k, $v) = each %FACEINFO) { |
686 | print "processing facedata...\n" if $VERBOSE; |
| 353 | $v->{data32} ||= delete $PNG32{$k}; |
|
|
| 354 | } |
|
|
| 355 | |
|
|
| 356 | while (my ($k, $v) = each %FACEINFO) { |
687 | while (my ($k, $v) = each %FACEINFO) { |
| 357 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
688 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
|
|
689 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
| 358 | |
690 | |
| 359 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
691 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
|
|
692 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
|
|
693 | |
|
|
694 | if (my $magicmap = $v->{magicmap}) { |
|
|
695 | $magicmap =~ y/A-Z_\-/a-z/d; |
|
|
696 | $v->{magicmap} = $COLOR{$magicmap}; |
| 360 | } |
697 | } |
| 361 | |
698 | |
|
|
699 | delete $v->{arc}; |
|
|
700 | } |
|
|
701 | |
|
|
702 | print "writing facedata...\n" if $VERBOSE; |
| 362 | open my $fh, ">:perlio", "$DATADIR/faces~" |
703 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
| 363 | or die "$DATADIR/faces~: $!"; |
704 | or die "$DATADIR/facedata~: $!"; |
| 364 | |
705 | |
| 365 | $FACEINFO{""} = { version => 1}; |
706 | print $fh freeze { |
| 366 | print $fh Storable::nfreeze \%FACEINFO; |
707 | version => 2, |
|
|
708 | faceinfo => \%FACEINFO, |
|
|
709 | animinfo => \%ANIMINFO, |
|
|
710 | resource => \%RESOURCE, |
| 367 | } |
711 | }; |
|
|
712 | } |
| 368 | |
713 | |
|
|
714 | print "committing files...\n" if $VERBOSE; |
|
|
715 | |
| 369 | for (qw(archetypes faces animations treasures)) { |
716 | for (qw(archetypes facedata treasures)) { |
| 370 | chmod 0644, "$DATADIR/$_~"; |
717 | chmod 0644, "$DATADIR/$_~"; |
| 371 | rename "$DATADIR/$_~", "$DATADIR/$_" |
718 | rename "$DATADIR/$_~", "$DATADIR/$_" |
| 372 | or die "$DATADIR/$_: $!"; |
719 | or die "$DATADIR/$_: $!"; |
| 373 | } |
720 | } |
| 374 | |
721 | |
