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