1 | #!@PERL@ |
1 | #!@PERL@ |
2 | |
2 | |
3 | use strict; |
3 | # |
|
|
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
|
|
5 | # |
|
|
6 | # Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
|
|
7 | # |
|
|
8 | # Deliantra is free software: you can redistribute it and/or modify it under |
|
|
9 | # the terms of the Affero GNU General Public License as published by the |
|
|
10 | # Free Software Foundation, either version 3 of the License, or (at your |
|
|
11 | # option) any later version. |
|
|
12 | # |
|
|
13 | # This program is distributed in the hope that it will be useful, |
|
|
14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
16 | # GNU General Public License for more details. |
|
|
17 | # |
|
|
18 | # You should have received a copy of the Affero GNU General Public License |
|
|
19 | # and the GNU General Public License along with this program. If not, see |
|
|
20 | # <http://www.gnu.org/licenses/>. |
|
|
21 | # |
|
|
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
|
|
23 | # |
|
|
24 | |
|
|
25 | use common::sense; |
4 | |
26 | |
5 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
6 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
7 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
9 | |
31 | |
10 | my $CONVERT = "@CONVERT@"; |
32 | my $CONVERT = "@CONVERT@"; |
11 | #my $IDENTIFY = "@IDENTIFY@"; |
33 | my $IDENTIFY = "@IDENTIFY@"; |
12 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
13 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
15 | |
37 | |
16 | use Getopt::Long; |
38 | use Getopt::Long; |
17 | use Coro::Event; |
39 | use File::Temp; |
|
|
40 | use POSIX (); |
|
|
41 | use Carp; |
|
|
42 | |
|
|
43 | use YAML::XS (); |
|
|
44 | use Digest::MD5 (); |
|
|
45 | use Storable (); |
|
|
46 | use JSON::XS (); |
|
|
47 | use IO::AIO (); |
|
|
48 | use Compress::LZF (); |
|
|
49 | |
18 | use AnyEvent; |
50 | use AnyEvent; |
19 | use IO::AIO (); |
51 | use Coro 5.12; |
20 | use File::Temp; |
|
|
21 | use Crossfire; |
|
|
22 | use Coro; |
52 | use Coro::EV; |
23 | use Coro::AIO; |
53 | use Coro::AIO; |
24 | use Coro::Util; |
54 | use Coro::Util; |
25 | use POSIX (); |
|
|
26 | use Carp; |
|
|
27 | use Coro::Channel; |
55 | use Coro::Channel; |
|
|
56 | use Coro::AnyEvent; |
28 | use Coro::Storable; $Storable::canonical = 1; |
57 | use Coro::Storable; $Storable::canonical = 1; |
|
|
58 | |
|
|
59 | use Deliantra; |
29 | |
60 | |
30 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
61 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
31 | |
62 | |
32 | sub usage { |
63 | sub usage { |
33 | warn <<EOF; |
64 | warn <<EOF; |
… | |
… | |
46 | my $VERBOSE = 1; |
77 | my $VERBOSE = 1; |
47 | my $CACHE = 0; |
78 | my $CACHE = 0; |
48 | my $FORCE; |
79 | my $FORCE; |
49 | my $TMPDIR = "/tmp/cfutil$$~"; |
80 | my $TMPDIR = "/tmp/cfutil$$~"; |
50 | my $TMPFILE = "aaaa0"; |
81 | my $TMPFILE = "aaaa0"; |
|
|
82 | my @COMMIT; |
51 | |
83 | |
52 | our %COLOR = ( |
84 | our %COLOR = ( |
|
|
85 | # original cf colours |
53 | black => 0, |
86 | black => 0, |
54 | white => 1, |
87 | white => 1, |
55 | navy => 2, |
88 | navy => 2, # "dark blue" |
56 | red => 3, |
89 | red => 3, |
57 | orange => 4, |
90 | orange => 4, |
58 | blue => 5, |
91 | blue => 5, # "light blue" |
59 | darkorange => 6, |
92 | darkorange => 6, |
60 | green => 7, |
93 | green => 7, |
61 | lightgreen => 8, |
94 | lightgreen => 8, |
62 | grey => 9, |
95 | grey => 9, |
|
|
96 | brown => 10, # "yellow" |
|
|
97 | gold => 11, # "light yellow" |
|
|
98 | tan => 12, # yellowish gray |
|
|
99 | |
|
|
100 | # new for deliantra |
63 | brown => 10, |
101 | none => 13, |
|
|
102 | |
|
|
103 | # compatibility to existing archetypes |
|
|
104 | lightblue => 5, |
64 | gold => 11, |
105 | gray => 9, |
|
|
106 | yellow => 11, |
65 | tan => 12, |
107 | khaki => 12, |
66 | ); |
108 | ); |
67 | |
109 | |
68 | END { system "rm", "-rf", $TMPDIR } |
110 | END { system "rm", "-rf", $TMPDIR } |
69 | |
111 | |
70 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
112 | my $s_INT = AE::signal INT => sub { exit 1 }; |
71 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
113 | my $s_TERM = AE::signal TERM => sub { exit 1 }; |
|
|
114 | |
|
|
115 | our %hash; |
|
|
116 | |
|
|
117 | # here we could try to avoid collisions and reduce chksum size further |
|
|
118 | sub make_hash($\$\$;$) { |
|
|
119 | my ($id, $dataref, $hashref, $clen) = @_; |
|
|
120 | |
|
|
121 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5; |
|
|
122 | |
|
|
123 | if (exists $hash{$hash}) { |
|
|
124 | # hash collision, but some files are simply identical |
|
|
125 | if (${$hash{$hash}[1]} ne $$dataref) { |
|
|
126 | warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n"; |
|
|
127 | exit 1; |
|
|
128 | } else { |
|
|
129 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
|
|
130 | } |
|
|
131 | } |
|
|
132 | $hash{$hash} = [$id, $dataref, $hashref]; |
|
|
133 | |
|
|
134 | $$hashref = $hash; |
|
|
135 | } |
|
|
136 | |
|
|
137 | sub optipng($) { |
|
|
138 | system $OPTIPNG, "-o5", "-i0", "-q", $_[0]; |
|
|
139 | die "$_[0] has zero size, aborting." unless -s $_[0]; |
|
|
140 | } |
72 | |
141 | |
73 | mkdir $TMPDIR, 0700 |
142 | mkdir $TMPDIR, 0700 |
74 | or die "$TMPDIR: $!"; |
143 | or die "$TMPDIR: $!"; |
75 | |
144 | |
76 | sub fork_sub(&) { |
145 | sub fork_exec(&) { |
77 | my ($cb) = @_; |
146 | my ($cb) = @_; |
78 | |
147 | |
79 | if (my $pid = fork) { |
148 | if (my $pid = fork) { |
80 | my $current = $Coro::current; |
149 | my $current = $Coro::current; |
81 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
150 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
… | |
… | |
86 | warn $@; |
155 | warn $@; |
87 | POSIX::_exit 1; |
156 | POSIX::_exit 1; |
88 | } |
157 | } |
89 | } |
158 | } |
90 | |
159 | |
|
|
160 | sub imgsize($) { |
|
|
161 | open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0] |
|
|
162 | or die "$IDENTIFY: $!"; |
|
|
163 | |
|
|
164 | Coro::AnyEvent::readable $fh; |
|
|
165 | |
|
|
166 | my ($w, $h) = split /,/, <$fh>; |
|
|
167 | |
|
|
168 | ($w+0, $h+0) |
|
|
169 | } |
|
|
170 | |
|
|
171 | # make $dst from $src, if not uptodate, by calling $how |
|
|
172 | sub make_file($$$) { |
|
|
173 | my ($src, $dst, $how) = @_; |
|
|
174 | |
|
|
175 | my $t = (aio_stat $dst) ? -1 : (stat _)[9]; |
|
|
176 | |
|
|
177 | for (ref $src ? @$src : $src) { |
|
|
178 | aio_stat $_ |
|
|
179 | and die "$_: $!"; |
|
|
180 | |
|
|
181 | if ((stat _)[9] > $t) { |
|
|
182 | # outdated, redo |
|
|
183 | $how->(); |
|
|
184 | last; |
|
|
185 | } |
|
|
186 | } |
|
|
187 | } |
|
|
188 | |
91 | sub inst_maps($) { |
189 | sub inst_maps($) { |
92 | my (undef, $path) = @_; |
190 | my (undef, $path) = @_; |
93 | |
191 | |
94 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
192 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
95 | |
193 | |
96 | if (!-f "$path/regions") { |
194 | if (!-f "$path/regions") { |
97 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
195 | warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n"; |
98 | exit 1 unless $FORCE; |
196 | exit 1 unless $FORCE; |
99 | } |
197 | } |
100 | |
198 | |
101 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
199 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
102 | "$path/.", "$DATADIR/maps/.", |
200 | "$path/.", "$DATADIR/maps/.", |
… | |
… | |
112 | our %FACEINFO; |
210 | our %FACEINFO; |
113 | our %RESOURCE; |
211 | our %RESOURCE; |
114 | our @ARC; |
212 | our @ARC; |
115 | our %ARC; |
213 | our %ARC; |
116 | our $TRS; |
214 | our $TRS; |
|
|
215 | our %PNG; |
117 | our $NFILE; |
216 | our $NFILE; |
118 | our $PATH; |
217 | our $PATH; |
119 | |
218 | |
120 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
219 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
121 | |
220 | |
122 | our $c_arc = new Coro::Channel; |
221 | our $c_arc = new Coro::Channel; |
123 | our $c_trs = new Coro::Channel; |
222 | our $c_any = new Coro::Channel; |
124 | our $c_res = new Coro::Channel; |
|
|
125 | |
223 | |
126 | our @c_png; |
224 | our @c_png; |
127 | |
225 | |
128 | sub commit_png($$$) { |
226 | sub commit_png($$$$) { |
129 | my ($name, $data, $T) = @_; |
227 | my ($stem, $name, $data, $T) = @_; |
130 | |
228 | |
|
|
229 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
131 | $FACEINFO{$name}{"data$T"} = $data; |
230 | $FACEINFO{$name}{"data$T"} = $data; |
132 | } |
231 | } |
133 | |
232 | |
134 | sub process_png { |
233 | sub process_png { |
135 | while (@c_png) { |
234 | while (@c_png) { |
… | |
… | |
138 | my $png; |
237 | my $png; |
139 | aio_lstat $path; |
238 | aio_lstat $path; |
140 | my ($size, $mtime) = (stat _)[7,9]; |
239 | my ($size, $mtime) = (stat _)[7,9]; |
141 | |
240 | |
142 | if (0 > aio_load $path, $png) { |
241 | if (0 > aio_load $path, $png) { |
143 | warn "$path: $!, skipping.\n"; |
242 | warn "ERROR: $path: $!, skipping.\n"; |
144 | next; |
243 | next; |
145 | } |
244 | } |
146 | |
245 | |
147 | my $stem = $path; |
246 | my $stem = $path; |
148 | my $T; |
247 | my $T; |
… | |
… | |
150 | if ($stem =~ s/\.32x32\.png~?$//) { |
249 | if ($stem =~ s/\.32x32\.png~?$//) { |
151 | $T = 32; |
250 | $T = 32; |
152 | } elsif ($stem =~ s/\.64x64\.png~?$//) { |
251 | } elsif ($stem =~ s/\.64x64\.png~?$//) { |
153 | $T = 64; |
252 | $T = 64; |
154 | } else { |
253 | } else { |
155 | warn "$path: weird filename, skipping.\n"; |
254 | warn "ERROR: $path: weird filename, skipping.\n"; |
156 | next; |
255 | next; |
157 | } |
256 | } |
158 | |
257 | |
159 | # quickly extract width and height of the (necessarily PNG) image |
258 | # quickly extract width and height of the (necessarily PNG) image |
160 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
259 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
161 | warn "$path: not a recognized png file, skipping.\n"; |
260 | warn "ERROR: $path: not a recognized png file, skipping.\n"; |
162 | next; |
261 | next; |
163 | } |
262 | } |
164 | |
263 | |
165 | my ($w, $h) = unpack "NN", $1; |
264 | my ($w, $h) = unpack "NN", $1; |
166 | |
265 | |
167 | if ($w < $T || $h < $T) { |
266 | if ($w < $T || $h < $T) { |
168 | warn "$path: too small ($w $h), skipping.\n"; |
267 | warn "ERROR: $path: too small ($w $h), skipping.\n"; |
169 | next; |
268 | next; |
170 | } |
269 | } |
171 | |
270 | |
172 | if ($w % $T || $h % $T) { |
271 | if ($w % $T || $h % $T) { |
173 | warn "$path: weird png size ($w $h), skipping.\n"; |
272 | warn "ERROR: $path: weird png size ($w $h), skipping.\n"; |
174 | next; |
273 | next; |
175 | } |
274 | } |
176 | |
275 | |
177 | (my $base = $stem) =~ s/^.*\///; |
276 | (my $base = $stem) =~ s/^.*\///; |
178 | |
277 | |
… | |
… | |
187 | unless ($path =~ /~$/) { |
286 | unless ($path =~ /~$/) { |
188 | # possibly enlarge |
287 | # possibly enlarge |
189 | if (0 > aio_stat "$stem.64x64.png") { |
288 | if (0 > aio_stat "$stem.64x64.png") { |
190 | my $other = "$stem.64x64.png~"; |
289 | my $other = "$stem.64x64.png~"; |
191 | |
290 | |
192 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
291 | make_file $path, $other, sub { |
193 | fork_sub { |
292 | fork_exec { |
194 | my $CROP; |
293 | my $CROP; |
195 | my $SRC = "png:\Q$path\E"; |
294 | my $SRC = "png:\Q$path\E"; |
196 | |
295 | |
197 | my $is_floor = $arc->{is_floor}; |
296 | my $is_floor = $arc->{is_floor}; |
198 | my $is_wall = 0; |
297 | my $is_wall = 0; |
… | |
… | |
252 | |
351 | |
253 | system "convert -depth 8 $SRC rgba:-" |
352 | system "convert -depth 8 $SRC rgba:-" |
254 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
353 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
255 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
354 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
256 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
355 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
257 | system $OPTIPNG, "-i0", "-q", "$other~"; |
356 | optipng "$other~"; |
258 | die "$other~ has zero size, aborting." unless -s "$other~"; |
|
|
259 | rename "$other~", $other; |
357 | rename "$other~", $other; |
260 | }; |
358 | }; |
261 | } |
359 | }; |
262 | |
360 | |
263 | push @c_png, [$other, !$CACHE]; |
361 | push @c_png, [$other, !$CACHE]; |
264 | } |
362 | } |
265 | |
363 | |
266 | # possibly scale down |
364 | # possibly scale down |
267 | if (0 > aio_stat "$stem.32x32.png") { |
365 | if (0 > aio_stat "$stem.32x32.png") { |
268 | my $other = "$stem.32x32.png~"; |
366 | my $other = "$stem.32x32.png~"; |
269 | |
367 | |
270 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
368 | make_file $path, $other, sub { |
271 | fork_sub { |
369 | fork_exec { |
272 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
370 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
273 | system $OPTIPNG, "-i0", "-q", "$other~"; |
371 | optipng "$other~"; |
274 | |
372 | |
275 | # reduce smoothfaces >10000 bytes |
373 | # reduce smoothfaces >10000 bytes |
|
|
374 | # obsolete, no longer required |
276 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
375 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
277 | my $ncolor = 256; |
376 | my $ncolor = 256; |
278 | while () { |
377 | while () { |
279 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
378 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
280 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
379 | optipng "$other~~"; |
281 | last if 10000 > -s "$other~~"; |
380 | last if 10000 > -s "$other~~"; |
282 | $ncolor = int $ncolor * 0.9; |
381 | $ncolor = int $ncolor * 0.9; |
283 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
382 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
284 | } |
383 | } |
285 | |
384 | |
… | |
… | |
290 | } |
389 | } |
291 | |
390 | |
292 | die "$other~ has zero size, aborting." unless -s "$other~"; |
391 | die "$other~ has zero size, aborting." unless -s "$other~"; |
293 | rename "$other~", $other; |
392 | rename "$other~", $other; |
294 | }; |
393 | }; |
295 | } |
394 | }; |
296 | |
395 | |
297 | #warn "scaled down $path to $other\n";#d# |
396 | #warn "scaled down $path to $other\n";#d# |
298 | push @c_png, [$other, !$CACHE]; |
397 | push @c_png, [$other, !$CACHE]; |
299 | } |
398 | } |
300 | } |
399 | } |
301 | |
400 | |
302 | (my $face = $stem) =~ s/^.*\///; |
401 | (my $face = $stem) =~ s/^.*\///; |
|
|
402 | |
|
|
403 | for (@{ $fi->{derive} }) { |
|
|
404 | my ($dir, $type) = @$_; |
|
|
405 | |
|
|
406 | my $geom = "${T}x${T}"; |
|
|
407 | my $dpath = "$dir/$type:$face.$geom.png~"; |
|
|
408 | |
|
|
409 | if ($type eq "buildmaterial") { |
|
|
410 | my $ov = "$PATH/mapbuilding/buildmaterial.png"; |
|
|
411 | make_file [$path, $ov], $dpath, sub { |
|
|
412 | fork_exec { |
|
|
413 | system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~"; |
|
|
414 | optipng "$dpath~"; |
|
|
415 | rename "$dpath~", $dpath; |
|
|
416 | }; |
|
|
417 | }; |
|
|
418 | } elsif ($type eq "buildmaterial-box") { |
|
|
419 | my $ov = "$PATH/mapbuilding/buildmaterial-box.png"; |
|
|
420 | make_file [$path, $ov], $dpath, sub { |
|
|
421 | fork_exec { |
|
|
422 | system "$CONVERT \Q$ov\E " |
|
|
423 | . "\\( \Q$path\E -trim -geometry 34x31\\> " |
|
|
424 | . "-gravity center -background transparent -extent 37x34 +gravity " |
|
|
425 | . "-geometry +22+6 \\) -composite " |
|
|
426 | . "-geometry $geom png:\Q$dpath\E~"; |
|
|
427 | optipng "$dpath~"; |
|
|
428 | rename "$dpath~", $dpath; |
|
|
429 | }; |
|
|
430 | }; |
|
|
431 | } elsif ($type eq "buildmaterial-sbox") { |
|
|
432 | my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png"; |
|
|
433 | make_file [$path, $ov], $dpath, sub { |
|
|
434 | fork_exec { |
|
|
435 | system "$CONVERT \Q$ov\E " |
|
|
436 | . "\\( \Q$path\E -trim -geometry 16x24\\> " |
|
|
437 | . "-gravity center -background transparent -extent 18x26 +gravity " |
|
|
438 | . "-geometry +26+16 \\) -composite " |
|
|
439 | . "-geometry $geom png:\Q$dpath\E~"; |
|
|
440 | optipng "$dpath~"; |
|
|
441 | rename "$dpath~", $dpath; |
|
|
442 | }; |
|
|
443 | }; |
|
|
444 | } else { |
|
|
445 | warn "ERROR: facename $type:$face contains unsupported derivation type.\n"; |
|
|
446 | } |
|
|
447 | |
|
|
448 | aio_load $dpath, my $png; |
|
|
449 | IO::AIO::aio_unlink $dpath unless $CACHE; |
|
|
450 | commit_png "$dir/$type:$face", "$type:$face", $png, $T; |
|
|
451 | } |
303 | |
452 | |
304 | # split all bigfaces, but avoid smoothfaces (*_S) |
453 | # split all bigfaces, but avoid smoothfaces (*_S) |
305 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
454 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
306 | # split |
455 | # split |
307 | my @tile; |
456 | my @tile; |
… | |
… | |
312 | push @tile, [$x, $y, $file, (stat _)[9]]; |
461 | push @tile, [$x, $y, $file, (stat _)[9]]; |
313 | } |
462 | } |
314 | } |
463 | } |
315 | |
464 | |
316 | my $mtime = (lstat $path)[9]; |
465 | my $mtime = (lstat $path)[9]; |
317 | my @todo = grep { $_->[3] <= $mtime } @tile; |
466 | my @todo = grep { $_->[3] < $mtime } @tile; |
318 | if (@todo) { |
467 | if (@todo) { |
319 | fork_sub { |
468 | fork_exec { |
320 | open my $convert, "|-", $CONVERT, |
469 | open my $convert, "|-", $CONVERT, |
321 | "png:-", |
470 | "png:-", |
322 | (map { |
471 | (map { |
323 | ( |
472 | ( |
324 | "(", |
473 | "(", |
… | |
… | |
337 | print $convert $png; |
486 | print $convert $png; |
338 | close $convert; |
487 | close $convert; |
339 | |
488 | |
340 | # pass 2, optimise, and rename |
489 | # pass 2, optimise, and rename |
341 | for (@todo) { |
490 | for (@todo) { |
342 | system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; |
491 | optipng "$_->[2]~"; |
343 | die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; |
|
|
344 | rename "$_->[2]~", $_->[2]; |
492 | rename "$_->[2]~", $_->[2]; |
345 | } |
493 | } |
346 | }; |
494 | }; |
347 | } |
495 | } |
348 | |
496 | |
… | |
… | |
352 | |
500 | |
353 | if (0 > aio_load $file, $tile) { |
501 | if (0 > aio_load $file, $tile) { |
354 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
502 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
355 | } |
503 | } |
356 | IO::AIO::aio_unlink $file unless $CACHE; |
504 | IO::AIO::aio_unlink $file unless $CACHE; |
357 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
505 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
358 | } |
506 | } |
359 | } else { |
507 | } else { |
360 | # use as-is (either small, use smooth) |
508 | # use as-is (either small, use smooth) |
361 | commit_png $face, $png, $T; |
509 | commit_png $stem, $face, $png, $T; |
362 | } |
510 | } |
363 | |
511 | |
364 | aio_unlink $path if $delete; |
512 | IO::AIO::aio_unlink $path if $delete; |
|
|
513 | } |
|
|
514 | } |
|
|
515 | |
|
|
516 | sub process_faceinfo { |
|
|
517 | my ($dir, $file) = @_; |
|
|
518 | my $path = "$dir/$file"; |
|
|
519 | |
|
|
520 | my $data; |
|
|
521 | if (0 > aio_load $path, $data) { |
|
|
522 | warn "ERROR: $path: $!, skipping.\n"; |
|
|
523 | return; |
|
|
524 | } |
|
|
525 | |
|
|
526 | for (split /\n/, $data) { |
|
|
527 | chomp; |
|
|
528 | my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5; |
|
|
529 | # bg not used except for text clients |
|
|
530 | |
|
|
531 | utf8::decode $glyph; |
|
|
532 | $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag |
|
|
533 | $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting |
|
|
534 | |
|
|
535 | $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet |
|
|
536 | |
|
|
537 | (my $fgi = $COLOR{$fg}) |
|
|
538 | // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n"; |
|
|
539 | (my $bgi = $COLOR{$bg}) |
|
|
540 | // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n"; |
|
|
541 | |
|
|
542 | my $fi = $FACEINFO{$face} ||= { }; |
|
|
543 | $fi->{visibility} = $visibility * 1; |
|
|
544 | $fi->{magicmap} = $fgi; # foreground colour becomes magicmap |
|
|
545 | |
|
|
546 | $glyph .= " " if 2 > length $glyph; # TODO kanji |
|
|
547 | die "glyph $face too long" if 2 < length $glyph; |
|
|
548 | |
|
|
549 | $fi->{glyph} = ""; |
|
|
550 | for (split //, $glyph) { |
|
|
551 | utf8::encode $_; |
|
|
552 | $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; |
|
|
553 | } |
365 | } |
554 | } |
366 | } |
555 | } |
367 | |
556 | |
368 | sub process_arc { |
557 | sub process_arc { |
369 | while (my $job = $c_arc->get) { |
558 | while (my ($dir, $file) = @{ $c_arc->get }) { |
370 | my ($dir, $file) = @$job; |
|
|
371 | |
|
|
372 | my $arc; |
559 | my $arc; |
373 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
560 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
374 | |
561 | |
375 | my $arc = read_arch "$dir/$file"; |
562 | my $arc = read_arch "$dir/$file"; |
376 | for my $o (values %$arc) { |
563 | for my $o (values %$arc) { |
377 | push @ARC, $o; |
564 | push @ARC, $o; |
378 | for (my $m = $o; $m; $m = $m->{more}) { |
565 | for (my $m = $o; $m; $m = $m->{more}) { |
379 | $ARC{$m->{_name}} = $m; |
566 | $ARC{$m->{_name}} = $m; |
380 | } |
567 | } |
381 | |
568 | |
382 | $o->{editor_folder} = $dir; |
569 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
383 | |
|
|
384 | my $visibility = delete $o->{visibility}; |
|
|
385 | my $magicmap = delete $o->{magicmap}; |
|
|
386 | |
570 | |
387 | # find upper left corner :/ |
571 | # find upper left corner :/ |
388 | # omg, this is sooo broken |
572 | # omg, this is sooo broken |
389 | my ($dx, $dy); |
573 | my ($dx, $dy); |
390 | for (my $o = $o; $o; $o = $o->{more}) { |
574 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
397 | my $y = $o->{y} - $dy; |
581 | my $y = $o->{y} - $dy; |
398 | |
582 | |
399 | my $ext = $x|$y ? "+$x+$y" : ""; |
583 | my $ext = $x|$y ? "+$x+$y" : ""; |
400 | |
584 | |
401 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
585 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
402 | |
|
|
403 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
404 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
405 | |
586 | |
406 | my $anim = delete $o->{anim}; |
587 | my $anim = delete $o->{anim}; |
407 | |
588 | |
408 | if ($anim) { |
589 | if ($anim) { |
409 | # possibly add $ext to the animation name to avoid |
590 | # possibly add $ext to the animation name to avoid |
… | |
… | |
433 | next if /^facings\s/; |
614 | next if /^facings\s/; |
434 | |
615 | |
435 | my $face = $_; |
616 | my $face = $_; |
436 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
617 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
437 | |
618 | |
438 | my $info = $FACEINFO{$face} ||= { }; |
619 | # handle derived faces |
|
|
620 | if ($face =~ /^([^:]+):(.*)/) { |
|
|
621 | my ($type, $base) = ($1, $2); |
|
|
622 | push @{ $FACEINFO{$base}{derive} }, [$dir, $type]; |
|
|
623 | } |
|
|
624 | |
439 | $info->{arc} = $o; |
625 | $FACEINFO{$face}{arc} = $o; |
440 | |
626 | |
441 | next if $face =~ /^blank.x11$|^empty.x11$/; |
627 | next if $face =~ /^blank.x11$|^empty.x11$/; |
442 | |
|
|
443 | $info->{visibility} = $visibility if defined $visibility; |
|
|
444 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
445 | } |
628 | } |
446 | |
629 | |
447 | if (my $smooth = delete $o->{smoothface}) { |
630 | if (my $smooth = delete $o->{smoothface}) { |
448 | my %kv = split /\s+/, $smooth; |
631 | my %kv = split /\s+/, $smooth; |
449 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
632 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
… | |
… | |
458 | } |
641 | } |
459 | } |
642 | } |
460 | } |
643 | } |
461 | |
644 | |
462 | sub process_trs { |
645 | sub process_trs { |
463 | while (my $job = $c_trs->get) { |
|
|
464 | my ($dir, $file) = @$job; |
646 | my ($dir, $file) = @_; |
465 | my $path = "$dir/$file"; |
647 | my $path = "$dir/$file"; |
466 | |
648 | |
467 | my $trs; |
649 | my $trs; |
468 | if (0 > aio_load $path, $trs) { |
650 | if (0 > aio_load $path, $trs) { |
469 | warn "$path: $!, skipping.\n"; |
651 | warn "ERROR: $path: $!, skipping.\n"; |
470 | next; |
652 | return; |
471 | } |
653 | } |
472 | |
654 | |
473 | $TRS .= $trs; |
655 | $TRS .= $trs; |
474 | } |
|
|
475 | } |
656 | } |
476 | |
657 | |
477 | my %FILECACHE; |
658 | my %FILECACHE; |
478 | |
659 | |
479 | sub load_cached($;$) { |
660 | sub load_cached($;$) { |
480 | unless (exists $FILECACHE{$_[0]}) { |
661 | unless (exists $FILECACHE{$_[0]}) { |
481 | my $data; |
662 | my $data; |
482 | if (0 < aio_load $_[0], $data) { |
663 | if (0 < aio_load $_[0], $data) { |
483 | if ($_[1]) { |
664 | if ($_[1]) { |
484 | $data = eval { $_[1]->($data) }; |
665 | $data = eval { $_[1]->($data) }; |
485 | warn "$_[0]: $@" if $@; |
666 | warn "ERROR: $_[0]: $@" if $@; |
486 | } |
667 | } |
487 | } |
668 | } |
488 | |
669 | |
489 | $FILECACHE{$_[0]} = $data; |
670 | $FILECACHE{$_[0]} = $data; |
490 | } |
671 | } |
491 | |
672 | |
492 | $FILECACHE{$_[0]} |
673 | $FILECACHE{$_[0]} |
493 | } |
674 | } |
494 | |
675 | |
|
|
676 | # convert an image and a palette to some indexed 2d-matrix structure |
|
|
677 | sub process_plt { |
|
|
678 | my ($base, $plt) = @_; |
|
|
679 | |
|
|
680 | my ($w, $h) = imgsize "$base.png"; |
|
|
681 | |
|
|
682 | $w * $h |
|
|
683 | or die "$base.png: unable to identify correct size\n"; |
|
|
684 | |
|
|
685 | my @plt; |
|
|
686 | my %map; |
|
|
687 | |
|
|
688 | for (split /\n/, $plt) { |
|
|
689 | next unless /\S/; |
|
|
690 | next if /^\s*#/; |
|
|
691 | |
|
|
692 | /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/ |
|
|
693 | or die "unparseable palette entry for $base.plt: $_"; |
|
|
694 | |
|
|
695 | my ($rgb, $name) = ($1, $2); |
|
|
696 | |
|
|
697 | $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/; |
|
|
698 | |
|
|
699 | $map{pack "H*", $rgb} = chr @plt; |
|
|
700 | push @plt, $name; |
|
|
701 | } |
|
|
702 | |
|
|
703 | make_file ["$base.plt", "$base.png"], "$base.tbl~", sub { |
|
|
704 | warn "building $base\n" if $VERBOSE >= 3; |
|
|
705 | |
|
|
706 | fork_exec { |
|
|
707 | open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:" |
|
|
708 | or die "$base.png: $!"; |
|
|
709 | |
|
|
710 | local $/; |
|
|
711 | $png = <$png>; |
|
|
712 | |
|
|
713 | $w * $h * 3 == length $png |
|
|
714 | or die "$base.png: failed to read enough data from file\n"; |
|
|
715 | |
|
|
716 | $png =~ s/(...)/$map{$1}/ge; |
|
|
717 | |
|
|
718 | $w * $h == length $png |
|
|
719 | or die "$base.png: failed to map all data - wrong palette?\n"; |
|
|
720 | |
|
|
721 | { |
|
|
722 | open my $fh, ">:raw", "$base.tbl~~" |
|
|
723 | or die "$base.tbl~~: $!"; |
|
|
724 | syswrite $fh, $png; |
|
|
725 | } |
|
|
726 | |
|
|
727 | rename "$base.tbl~~", "$base.tbl~"; |
|
|
728 | }; |
|
|
729 | }; |
|
|
730 | |
|
|
731 | 0 <= aio_load "$base.tbl~", my $tbl |
|
|
732 | or die "$base.tbl~: $!"; |
|
|
733 | |
|
|
734 | IO::AIO::aio_unlink "$base.tbl~" unless $CACHE; |
|
|
735 | |
|
|
736 | Compress::LZF::compress nfreeze { |
|
|
737 | w => $w, |
|
|
738 | h => $h, |
|
|
739 | plt => \@plt, |
|
|
740 | tbl => $tbl, |
|
|
741 | } |
|
|
742 | } |
|
|
743 | |
495 | sub process_res { |
744 | sub process_res { |
496 | while (my $job = $c_res->get) { |
|
|
497 | my ($dir, $file, $type) = @$job; |
745 | my ($dir, $file, $type) = @_; |
498 | |
746 | |
499 | my $data; |
|
|
500 | aio_load "$dir/$file", $data; |
747 | 0 <= aio_load "$dir/$file", my $data |
|
|
748 | or die "$dir/$file: $!"; |
501 | |
749 | |
502 | |
|
|
503 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
750 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
504 | |
751 | |
505 | utf8::decode $dir; |
752 | utf8::decode $dir; |
506 | utf8::decode $file; |
753 | utf8::decode $file; |
507 | |
754 | |
508 | # a meta file for resources is now mandatory |
755 | # a meta file for resources is now mandatory |
509 | unless (exists $meta->{$file}) { |
756 | unless (exists $meta->{$file}) { |
510 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
757 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
511 | next; |
758 | return; |
512 | } |
759 | } |
513 | |
760 | |
514 | $meta = { |
761 | $meta = { |
515 | %{ $meta->{"" } || {} }, |
762 | %{ $meta->{"" } || {} }, |
516 | %{ $meta->{$file} || {} }, |
763 | %{ $meta->{$file} || {} }, |
517 | }; |
764 | }; |
518 | |
765 | |
519 | if ($meta->{license} =~ s/^#//) { |
766 | if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification |
520 | $meta->{license} = ({ |
767 | $meta->{license} = ({ |
521 | "pd" => "Public Domain", |
768 | "pd" => "Public Domain", |
522 | "gpl" => "GNU General Public License, version 3.0 or any later", |
769 | "gpl" => "GNU General Public License, version 3.0 or any later", |
523 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
770 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
771 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
524 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
772 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
525 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
773 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
526 | })->{$meta->{license}} |
774 | })->{$meta->{license}} |
527 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
775 | || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found."; |
528 | } |
776 | } |
529 | |
777 | |
|
|
778 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
779 | ($meta->{author} = $1) =~ s/_/ /g; |
|
|
780 | } |
|
|
781 | |
530 | $file =~ s/\.res$//; |
782 | $file =~ s/\.res$//; |
531 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
783 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
532 | |
784 | |
|
|
785 | if ($file =~ s/\.plt$//) { |
|
|
786 | $data = process_plt "$dir/$file", $data; |
|
|
787 | } elsif (my $filter = delete $meta->{cfutil_filter}) { |
|
|
788 | if ($filter eq "yaml2json") { |
|
|
789 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
|
|
790 | } elsif ($filter eq "json2json") { |
|
|
791 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
792 | } elsif ($filter eq "perl2json") { |
|
|
793 | $data = eval $data; die if $@; |
|
|
794 | $data = JSON::XS::encode_json $data; |
|
|
795 | } else { |
|
|
796 | warn "ERROR: $dir/$file: unknown filter $filter, skipping\n"; |
|
|
797 | } |
|
|
798 | } |
|
|
799 | |
533 | substr $dir, 0, 1 + length $PATH, ""; |
800 | substr $dir, 0, 1 + length $PATH, ""; |
534 | |
801 | |
535 | $RESOURCE{"$dir/$file"} = { |
802 | $RESOURCE{"$dir/$file"} = { |
536 | type => (delete $meta->{type}) || $type, |
803 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
537 | data => $data, |
804 | data => $data, |
538 | %$meta ? (meta => $meta) : (), |
805 | %$meta ? (meta => $meta) : (), |
539 | }; |
806 | }; |
|
|
807 | } |
|
|
808 | |
|
|
809 | sub process_any { |
|
|
810 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
811 | $func->(@args); |
540 | } |
812 | } |
541 | } |
813 | } |
542 | |
814 | |
543 | sub find_files; |
815 | sub find_files; |
544 | sub find_files { |
816 | sub find_files { |
545 | my ($path) = @_; |
817 | my ($path) = @_; |
546 | |
818 | |
|
|
819 | my $grp = IO::AIO::aio_group; |
|
|
820 | |
|
|
821 | my $scandir; $scandir = sub { |
|
|
822 | my ($path) = @_; |
|
|
823 | |
547 | IO::AIO::aioreq_pri 4; |
824 | IO::AIO::aioreq_pri 4; |
548 | IO::AIO::aio_scandir $path, 4, sub { |
825 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
549 | my ($dirs, $nondirs) = @_; |
826 | my ($dirs, $nondirs) = @_; |
550 | |
827 | |
551 | find_files "$path/$_" |
828 | $scandir->("$path/$_") |
552 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
829 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
553 | |
830 | |
554 | my $dir = $path; |
831 | my $dir = $path; |
555 | substr $dir, 0, 1 + length $PATH, ""; |
832 | substr $dir, 0, 1 + length $PATH, ""; |
556 | |
833 | |
557 | for my $file (@$nondirs) { |
834 | for my $file (@$nondirs) { |
558 | if ($dir =~ /^music(?:\/|$)/) { |
835 | if ($dir =~ /^music(?:\/|$)/) { |
559 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
836 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
560 | if $file =~ /\.(ogg)$/; |
837 | if $file =~ /\.(ogg)$/; |
561 | |
838 | |
562 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
839 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
563 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
840 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
564 | if $file =~ /\.(wav|ogg)$/; |
841 | if $file =~ /\.(wav|ogg)$/; |
565 | |
842 | |
566 | } elsif ($dir =~ /^res(?:\/|$)/) { |
843 | } elsif ($dir =~ /^res(?:\/|$)/) { |
567 | $c_res->put ([$path, $file, 0]) # FT_FACE |
|
|
568 | if $file =~ /\.(jpg|png)$/; |
844 | if ($file =~ /\.(jpg|png)$/) { |
569 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
845 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
570 | if $file =~ /\.(res)$/; |
846 | } elsif ($file =~ /\.(res)$/) { |
|
|
847 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
848 | } else { |
|
|
849 | $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose |
|
|
850 | } |
571 | |
851 | |
572 | } elsif ($file =~ /\.png$/) { |
852 | } elsif ($file =~ /\.png$/) { |
573 | push @c_png, ["$path/$file", 0]; |
853 | $PNG{$file} = $path; |
574 | |
854 | |
|
|
855 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
856 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
857 | |
575 | } elsif ($file =~ /\.trs$/) { |
858 | } elsif ($file =~ /\.trs$/) { |
576 | $c_trs->put ([$path, $file]); |
859 | $c_any->put ([\&process_trs, $path, $file]); |
577 | |
860 | |
578 | } elsif ($file =~ /\.arc$/) { |
861 | } elsif ($file =~ /\.arc$/) { |
579 | $c_arc->put ([$path, $file]); |
862 | $c_arc->put ([$path, $file]); |
580 | |
863 | |
581 | } else { |
864 | } else { |
582 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
865 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
583 | } |
866 | } |
|
|
867 | } |
584 | } |
868 | }; |
585 | }; |
869 | }; |
|
|
870 | |
|
|
871 | $scandir->($path); |
|
|
872 | aio_wait $grp; |
|
|
873 | } |
|
|
874 | |
|
|
875 | sub generate_plurals { |
|
|
876 | # use Lingua::EN::Inflect (); |
|
|
877 | # Lingua::EN::Inflect::classical; |
|
|
878 | # Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy |
|
|
879 | # Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack |
|
|
880 | # |
|
|
881 | # for my $a (@ARC) { |
|
|
882 | # my $name = $a->{name} || $a->{_name}; |
|
|
883 | # |
|
|
884 | # next unless $a->{name_pl}; |
|
|
885 | # next if $a->{invisible}; |
|
|
886 | # next if $a->{is_floor}; |
|
|
887 | # next if $a->{no_pick}; |
|
|
888 | # |
|
|
889 | # my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; |
|
|
890 | # my $pl = $test =~ /^(?:eq|p:.)$/ |
|
|
891 | # ? $name |
|
|
892 | # : Lingua::EN::Inflect::PL $name; |
|
|
893 | # |
|
|
894 | # if ($pl ne $a->{name_pl}) { |
|
|
895 | # warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; |
|
|
896 | # } |
|
|
897 | # } |
586 | } |
898 | } |
587 | |
899 | |
588 | sub inst_arch($) { |
900 | sub inst_arch($) { |
589 | my (undef, $path) = @_; |
901 | my (undef, $path) = @_; |
590 | |
902 | |
… | |
… | |
599 | "Unless you run verbosely, all following warning\n", |
911 | "Unless you run verbosely, all following warning\n", |
600 | "or error messages indicate serious problems.\n", |
912 | "or error messages indicate serious problems.\n", |
601 | "\n"; |
913 | "\n"; |
602 | |
914 | |
603 | if (!-d "$path/treasures") { |
915 | if (!-d "$path/treasures") { |
604 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
916 | warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
605 | exit 1 unless $FORCE; |
917 | exit 1 unless $FORCE; |
606 | } |
918 | } |
607 | |
919 | |
608 | print "scanning files...\n" if $VERBOSE; |
920 | print "starting file scan, arc, any processing...\n" if $VERBOSE; |
|
|
921 | |
|
|
922 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
923 | my @a_any = map +(async \&process_any), 1..4; |
609 | |
924 | |
610 | find_files $path; |
925 | find_files $path; |
611 | |
926 | |
612 | my @a_arc = map +(async \&process_arc), 1..2; |
927 | $c_arc->shutdown; |
613 | my @a_res = map +(async \&process_res), 1..2; |
928 | $c_any->shutdown; |
614 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
615 | |
|
|
616 | IO::AIO::flush; |
|
|
617 | |
|
|
618 | $c_res->put (undef) for @a_res; |
|
|
619 | $c_arc->put (undef) for @a_arc; |
|
|
620 | $c_trs->put (undef) for @a_trs; |
|
|
621 | |
|
|
622 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
623 | |
929 | |
624 | $_->join for @a_arc; # need to parse all archetypes before png processing |
930 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
931 | print "finished arc processing...\n" if $VERBOSE; |
625 | |
932 | |
|
|
933 | # fill png queue |
|
|
934 | for (keys %FACEINFO) { |
|
|
935 | # we only expect source pngs to exist for non-derived |
|
|
936 | # faces, i.e. no split tiles (+x+x) and no face derivates |
|
|
937 | # (xxx:) |
|
|
938 | /^[^:]+\....$/ |
|
|
939 | or next; |
|
|
940 | |
|
|
941 | my $seen; |
|
|
942 | |
|
|
943 | if (exists $PNG{"$_.32x32.png"}) { |
|
|
944 | push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"]; |
|
|
945 | $seen = 1; |
|
|
946 | } |
|
|
947 | if (exists $PNG{"$_.64x64.png"}) { |
|
|
948 | push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"]; |
|
|
949 | $seen = 1; |
|
|
950 | } |
|
|
951 | |
|
|
952 | warn "ERROR: $_: face not found, expect problems.\n" |
|
|
953 | unless $seen; |
|
|
954 | } |
|
|
955 | |
626 | print "end arc, start png processing...\n" if $VERBOSE; |
956 | print "starting png processing...\n" if $VERBOSE; |
627 | |
957 | |
628 | # four png crunchers work fine for my 2x smp machine |
958 | # eight png crunchers work fine for my 4x smp machine |
629 | my @a_png = map +(async \&process_png), 1..4; |
959 | my @a_png = map +(async \&process_png), 1..8; |
630 | |
960 | |
631 | $_->join for (@a_trs, @a_res, @a_png); |
961 | $_->join for @a_any; |
|
|
962 | print "finished any processing...\n" if $VERBOSE; |
|
|
963 | |
|
|
964 | $_->join for @a_png; |
|
|
965 | print "finished png processing...\n" if $VERBOSE; |
632 | |
966 | |
633 | print "scanning done, processing results...\n" if $VERBOSE; |
967 | print "scanning done, processing results...\n" if $VERBOSE; |
634 | { |
968 | { |
635 | # remove path prefix from editor_folder |
969 | # remove path prefix from editor_folder |
|
|
970 | $_->{editor_folder} =~ /^\x00/ |
636 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
971 | and substr $_->{editor_folder}, 0, 2 + length $path, "" |
637 | for values %ARC; |
972 | for values %ARC; |
638 | |
973 | |
639 | print "resolving inheritance tree...\n" if $VERBOSE; |
974 | print "resolving inheritance tree...\n" if $VERBOSE; |
640 | # resolve inherit |
975 | # resolve inherit |
641 | while () { |
976 | while () { |
642 | my $progress; |
977 | my $progress; |
643 | my $loop; |
978 | my $loop; |
644 | |
979 | |
645 | for my $o (values %ARC) { |
980 | for my $o (values %ARC) { |
646 | if (my $other = $o->{inherit}) { |
981 | for my $other (split /,/, $o->{inherit}) { |
647 | if (my $s = $ARC{$other}) { |
982 | if (my $s = $ARC{$other}) { |
648 | if ($s->{inherit}) { |
983 | if ($s->{inherit}) { |
649 | $loop = $s; |
984 | $loop = $s; |
650 | } else { |
985 | } else { |
651 | delete $o->{inherit}; |
986 | delete $o->{inherit}; |
… | |
… | |
653 | delete @s{qw(_name more name name_pl)}; |
988 | delete @s{qw(_name more name name_pl)}; |
654 | %$o = ( %s, %$o ); |
989 | %$o = ( %s, %$o ); |
655 | ++$progress; |
990 | ++$progress; |
656 | } |
991 | } |
657 | } else { |
992 | } else { |
658 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
993 | warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
659 | delete $ARC{$o->{_name}}; |
994 | delete $ARC{$o->{_name}}; |
660 | } |
995 | } |
661 | } |
996 | } |
662 | } |
997 | } |
663 | |
998 | |
… | |
… | |
670 | } |
1005 | } |
671 | |
1006 | |
672 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
1007 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
673 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
1008 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
674 | |
1009 | |
|
|
1010 | # fix up archetypes without names, where the archanme doesn't work at all |
|
|
1011 | for (@ARC) { |
|
|
1012 | if (!exists $_->{name} and $_->{_name} =~ /_/) { |
|
|
1013 | for ($_->{name} = $_->{_name}) { |
|
|
1014 | s/(?:_\d+)+$//; |
|
|
1015 | s/_[nesw]+$//; |
|
|
1016 | y/_/ /; |
|
|
1017 | } |
|
|
1018 | } |
|
|
1019 | } |
|
|
1020 | |
|
|
1021 | #print "generating plurals...\n" if $VERBOSE; |
|
|
1022 | #generate_plurals; |
|
|
1023 | |
675 | print "writing archetypes...\n" if $VERBOSE; |
1024 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
676 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
1025 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
677 | or die "$DATADIR/archetypes~: $!"; |
1026 | or die "$DATADIR/archetypes~: $!"; |
678 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
1027 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
679 | } |
1028 | } |
680 | |
1029 | |
681 | { |
1030 | { |
682 | print "writing treasures...\n" if $VERBOSE; |
1031 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
683 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
1032 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
684 | or die "$DATADIR/treasures~: $!"; |
1033 | or die "$DATADIR/treasures~: $!"; |
685 | print $fh $TRS; |
1034 | print $fh $TRS; |
686 | } |
1035 | } |
687 | |
1036 | |
688 | { |
1037 | { |
689 | print "processing facedata...\n" if $VERBOSE; |
1038 | print "processing facedata...\n" if $VERBOSE; |
690 | while (my ($k, $v) = each %FACEINFO) { |
1039 | while (my ($k, $v) = each %FACEINFO) { |
691 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
1040 | length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n"; |
692 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
1041 | length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n"; |
693 | |
1042 | |
|
|
1043 | make_hash $k, $v->{data32}, $v->{hash32}; |
|
|
1044 | make_hash $k, $v->{data64}, $v->{hash64}; |
|
|
1045 | |
694 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
1046 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
695 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
1047 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
696 | |
1048 | |
697 | if (my $magicmap = $v->{magicmap}) { |
1049 | $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n"; |
698 | $magicmap =~ y/A-Z_\-/a-z/d; |
1050 | $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n"; |
699 | $v->{magicmap} = $COLOR{$magicmap}; |
1051 | $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n"; |
|
|
1052 | |
|
|
1053 | delete @$v{qw(arc stem derive)}; # not used by the server |
|
|
1054 | } |
|
|
1055 | |
|
|
1056 | print "processing resources...\n" if $VERBOSE; |
|
|
1057 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
1058 | while (my ($k, $v) = each %RESOURCE) { |
|
|
1059 | |
|
|
1060 | if ($v->{meta} && $v->{meta}{datadir}) { |
|
|
1061 | delete $RESOURCE{$k}; |
|
|
1062 | |
|
|
1063 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
|
|
1064 | |
|
|
1065 | printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; |
|
|
1066 | open my $fh, ">:raw", "$DATADIR/$k~" |
|
|
1067 | or die "$DATADIR/$k~: $!"; |
|
|
1068 | syswrite $fh, $v->{data}; |
|
|
1069 | push @COMMIT, $k; |
|
|
1070 | |
|
|
1071 | } else { |
|
|
1072 | if ($v->{type} & 1) { |
|
|
1073 | # prepend meta info |
|
|
1074 | |
|
|
1075 | my $meta = $enc->encode ({ |
|
|
1076 | name => $k, |
|
|
1077 | %{ $v->{meta} || {} }, |
|
|
1078 | }); |
|
|
1079 | |
|
|
1080 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
700 | } |
1081 | } |
701 | |
1082 | |
702 | delete $v->{arc}; |
1083 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
703 | } |
1084 | } |
|
|
1085 | } |
704 | |
1086 | |
705 | print "writing facedata...\n" if $VERBOSE; |
1087 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
|
|
1088 | scalar keys %FACEINFO, |
|
|
1089 | scalar keys %ANIMINFO, |
|
|
1090 | scalar keys %RESOURCE |
|
|
1091 | if $VERBOSE; |
|
|
1092 | |
706 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
1093 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
707 | or die "$DATADIR/facedata~: $!"; |
1094 | or die "$DATADIR/facedata~: $!"; |
708 | |
1095 | |
709 | print $fh freeze { |
1096 | print $fh nfreeze { |
710 | version => 2, |
1097 | version => 2, |
711 | faceinfo => \%FACEINFO, |
1098 | faceinfo => \%FACEINFO, |
712 | animinfo => \%ANIMINFO, |
1099 | animinfo => \%ANIMINFO, |
713 | resource => \%RESOURCE, |
1100 | resource => \%RESOURCE, |
714 | }; |
1101 | }; |
715 | } |
1102 | } |
716 | |
1103 | |
717 | print "committing files...\n" if $VERBOSE; |
1104 | print "committing files...\n" if $VERBOSE; |
718 | |
1105 | |
719 | for (qw(archetypes facedata treasures)) { |
1106 | for (qw(archetypes facedata treasures), @COMMIT) { |
720 | chmod 0644, "$DATADIR/$_~"; |
1107 | chmod 0644, "$DATADIR/$_~"; |
721 | rename "$DATADIR/$_~", "$DATADIR/$_" |
1108 | rename "$DATADIR/$_~", "$DATADIR/$_" |
722 | or die "$DATADIR/$_: $!"; |
1109 | or die "$DATADIR/$_: $!"; |
723 | } |
1110 | } |
724 | |
1111 | |