ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.106 by root, Wed Oct 20 06:21:48 2010 UTC vs.
Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC

1#!@PERL@ 1#!@PERL@
2 2
3# 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG. 4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5# 5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 6# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7# 7#
8# Deliantra is free software: you can redistribute it and/or modify it under 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 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 10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version. 11# option) any later version.
12# 12#
13# This program is distributed in the hope that it will be useful, 13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of 14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details. 16# GNU General Public License for more details.
17# 17#
18# You should have received a copy of the Affero GNU General Public License 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 19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>. 20# <http://www.gnu.org/licenses/>.
21# 21#
22# The authors can be reached via e-mail to <support@deliantra.net> 22# The authors can be reached via e-mail to <support@deliantra.net>
23# 23#
24 24
25use common::sense; 25use common::sense;
26 26
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
31 31
32my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
33#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
34my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
35my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
37 37
38use Getopt::Long; 38use Getopt::Long;
39use File::Temp; 39use File::Temp;
40use POSIX (); 40use POSIX ();
41use Carp; 41use Carp;
42 42
43use Coro::EV;
44use AnyEvent;
45use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 (); 48use Compress::LZF ();
49 49
50use AnyEvent;
50use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
51use Coro::AIO; 53use Coro::AIO;
52use Coro::Util; 54use Coro::Util;
53use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
54use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
55 58
56use Deliantra; 59use Deliantra;
57 60
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
104 khaki => 12, 107 khaki => 12,
105); 108);
106 109
107END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
108 111
109my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = AE::signal INT => sub { exit 1 };
110my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = AE::signal TERM => sub { exit 1 };
111 114
112our %hash; 115our %hash;
113 116
114# here we could try to avoid collisions and reduce chksum size further 117# here we could try to avoid collisions and reduce chksum size further
115sub make_hash($\$\$;$) { 118sub make_hash($\$\$;$) {
116 my ($id, $dataref, $hashref, $clen) = @_; 119 my ($id, $dataref, $hashref, $clen) = @_;
117 120
118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
119 122
120 if (exists $hash{$hash}) { 123 if (exists $hash{$hash}) {
121 # hash collision, but some files are simply identical 124 # hash collision, but some files are simply identical
122 if (${$hash{$hash}[1]} ne $$dataref) { 125 if (${$hash{$hash}[1]} ne $$dataref) {
123 warn "hash collision $hash{$hash}[0] vs. $id\n"; 126 warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
124 exit 1; 127 exit 1;
125 } else { 128 } else {
126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
127 } 130 }
128 } 131 }
129 $hash{$hash} = [$id, $dataref, $hashref]; 132 $hash{$hash} = [$id, $dataref, $hashref];
130 133
131 $$hashref = $hash; 134 $$hashref = $hash;
132} 135}
133 136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
141
134mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
135 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
136 144
137sub fork_sub(&) { 145sub fork_exec(&) {
138 my ($cb) = @_; 146 my ($cb) = @_;
139 147
140 if (my $pid = fork) { 148 if (my $pid = fork) {
141 my $current = $Coro::current; 149 my $current = $Coro::current;
142 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
147 warn $@; 155 warn $@;
148 POSIX::_exit 1; 156 POSIX::_exit 1;
149 } 157 }
150} 158}
151 159
160sub 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
172sub 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
152sub inst_maps($) { 189sub inst_maps($) {
153 my (undef, $path) = @_; 190 my (undef, $path) = @_;
154 191
155 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
156 193
157 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
158 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";
159 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
160 } 197 }
161 198
162 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
163 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
173 our %FACEINFO; 210 our %FACEINFO;
174 our %RESOURCE; 211 our %RESOURCE;
175 our @ARC; 212 our @ARC;
176 our %ARC; 213 our %ARC;
177 our $TRS; 214 our $TRS;
215 our %PNG;
178 our $NFILE; 216 our $NFILE;
179 our $PATH; 217 our $PATH;
180 218
181 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
182 220
183 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
184 our $c_any = new Coro::Channel; 222 our $c_any = new Coro::Channel;
185 223
186 our @c_png; 224 our @c_png;
187 225
226 # texture catalog size, in 64x64 tiles
227 sub TC_W() { 1024 / 64 }
228 sub TC_H() { 1024 / 64 }
229
230 our @TC = ([]); # texture catalogs
231
188 sub commit_png($$$$) { 232 sub commit_png($$$$$$) {
189 my ($stem, $name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
190 234
191 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; 235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
192 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
193 } 239 }
194 240
195 sub process_png { 241 sub process_png {
196 while (@c_png) { 242 while (@c_png) {
197 my ($path, $delete) = @{pop @c_png}; 243 my ($path, $delete) = @{pop @c_png};
199 my $png; 245 my $png;
200 aio_lstat $path; 246 aio_lstat $path;
201 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
202 248
203 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
204 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
205 next; 251 next;
206 } 252 }
207 253
208 my $stem = $path; 254 my $stem = $path;
209 my $T; 255 my $T;
211 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
212 $T = 32; 258 $T = 32;
213 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
214 $T = 64; 260 $T = 64;
215 } else { 261 } else {
216 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
217 next; 263 next;
218 } 264 }
219 265
220 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
221 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
222 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
223 next; 269 next;
224 } 270 }
225 271
226 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
227 273
228 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
229 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
230 next; 276 next;
231 } 277 }
232 278
233 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
234 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
235 next; 281 next;
236 } 282 }
237 283
238 (my $base = $stem) =~ s/^.*\///; 284 (my $base = $stem) =~ s/^.*\///;
239 285
248 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
249 # possibly enlarge 295 # possibly enlarge
250 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
251 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
252 298
253 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
254 fork_sub { 300 fork_exec {
255 my $CROP; 301 my $CROP;
256 my $SRC = "png:\Q$path\E"; 302 my $SRC = "png:\Q$path\E";
257 303
258 my $is_floor = $arc->{is_floor}; 304 my $is_floor = $arc->{is_floor};
259 my $is_wall = 0; 305 my $is_wall = 0;
309 $x * ($w - 8) + 4, 355 $x * ($w - 8) + 4,
310 $y * ($h - 8) + 4; 356 $y * ($h - 8) + 4;
311 } 357 }
312 } 358 }
313 359
314 system "convert -depth 8 $SRC rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
315 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
316 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" 362 . "| $CONVERT -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
317 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
318 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
319 die "$other~ has zero size, aborting." unless -s "$other~";
320 rename "$other~", $other; 365 rename "$other~", $other;
321 }; 366 };
322 } 367 };
323 368
324 push @c_png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
325 } 370 }
326 371
327 # possibly scale down 372 # possibly scale down
328 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
329 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
330 375
331 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
332 fork_sub { 377 fork_exec {
333 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 378 system "$CONVERT png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
334 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
335 380
336 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
337 # obsolete, no longer required 382 # obsolete, no longer required
338 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
339 my $ncolor = 256; 384 my $ncolor = 256;
340 while () { 385 while () {
341 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
342 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
343 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
344 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
345 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
346 } 391 }
347 392
352 } 397 }
353 398
354 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
355 rename "$other~", $other; 400 rename "$other~", $other;
356 }; 401 };
357 } 402 };
358 403
359 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
360 push @c_png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
361 } 406 }
362 } 407 }
363 408
364 (my $face = $stem) =~ s/^.*\///; 409 (my $face = $stem) =~ s/^.*\///;
410
411 for (@{ $fi->{derive} }) {
412 my ($dir, $type) = @$_;
413
414 my $geom = "${T}x${T}";
415 my $dpath = "$dir/$type:$face.$geom.png~";
416
417 if ($type eq "buildmaterial") {
418 my $ov = "$PATH/mapbuilding/buildmaterial.png";
419 make_file [$path, $ov], $dpath, sub {
420 fork_exec {
421 system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
422 optipng "$dpath~";
423 rename "$dpath~", $dpath;
424 };
425 };
426 } elsif ($type eq "buildmaterial-box") {
427 my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
428 make_file [$path, $ov], $dpath, sub {
429 fork_exec {
430 system "$CONVERT \Q$ov\E "
431 . "\\( \Q$path\E -trim -geometry 34x31\\> "
432 . "-gravity center -background transparent -extent 37x34 +gravity "
433 . "-geometry +22+6 \\) -composite "
434 . "-geometry $geom png:\Q$dpath\E~";
435 optipng "$dpath~";
436 rename "$dpath~", $dpath;
437 };
438 };
439 } elsif ($type eq "buildmaterial-sbox") {
440 my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
441 make_file [$path, $ov], $dpath, sub {
442 fork_exec {
443 system "$CONVERT \Q$ov\E "
444 . "\\( \Q$path\E -trim -geometry 16x24\\> "
445 . "-gravity center -background transparent -extent 18x26 +gravity "
446 . "-geometry +26+16 \\) -composite "
447 . "-geometry $geom png:\Q$dpath\E~";
448 optipng "$dpath~";
449 rename "$dpath~", $dpath;
450 };
451 };
452 } else {
453 warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
454 }
455
456 aio_load $dpath, my $png;
457 IO::AIO::aio_unlink $dpath unless $CACHE;
458 commit_png "$dir/$type:$face", "$type:$face", $png, $T, 1, 1;
459 }
365 460
366 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
367 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
368 # split 463 # split
369 my @tile; 464 my @tile;
374 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
375 } 470 }
376 } 471 }
377 472
378 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
379 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
380 if (@todo) { 475 if (@todo) {
381 fork_sub { 476 fork_exec {
382 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
383 "png:-", 478 "png:-",
384 (map { 479 (map {
385 ( 480 (
386 "(", 481 "(",
399 print $convert $png; 494 print $convert $png;
400 close $convert; 495 close $convert;
401 496
402 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
403 for (@todo) { 498 for (@todo) {
404 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
405 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
406 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
407 } 501 }
408 }; 502 };
409 } 503 }
410 504
414 508
415 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
416 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
417 } 511 }
418 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
419 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; 513 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
420 } 514 }
421 } else { 515 } else {
422 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
423 commit_png $stem, $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
424 } 518 }
425 519
426 aio_unlink $path if $delete; 520 IO::AIO::aio_unlink $path if $delete;
427 } 521 }
428 } 522 }
429 523
430 sub process_faceinfo { 524 sub process_faceinfo {
431 my ($dir, $file) = @_; 525 my ($dir, $file) = @_;
432 my $path = "$dir/$file"; 526 my $path = "$dir/$file";
433 527
434 my $data; 528 my $data;
435 if (0 > aio_load $path, $data) { 529 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n"; 530 warn "ERROR: $path: $!, skipping.\n";
437 return; 531 return;
438 } 532 }
439 533
440 for (split /\n/, $data) { 534 for (split /\n/, $data) {
441 chomp; 535 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/; 536 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
443 # bg not used except for text clients 537 # bg not used except for text clients
444 538
445 utf8::decode $glyph; 539 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag 540 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
541 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
447 542
448 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet 543 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
449 544
450 (my $fgi = $COLOR{$fg}) 545 (my $fgi = $COLOR{$fg})
451 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n"; 546 // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
452 (my $bgi = $COLOR{$bg}) 547 (my $bgi = $COLOR{$bg})
453 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n"; 548 // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
454 549
455 my $fi = $FACEINFO{$face} ||= { }; 550 my $fi = $FACEINFO{$face} ||= { };
456 $fi->{visibility} = $visibility * 1; 551 $fi->{visibility} = $visibility * 1;
457 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap 552 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
458 553
459 $glyph .= " " if 2 > length $glyph; # TODO kanji 554 $glyph .= " " if 2 > length $glyph; # TODO kanji
555 die "glyph $face too long" if 2 < length $glyph;
460 556
461 $fi->{glyph} = ""; 557 $fi->{glyph} = "";
462 for (split //, $glyph, -1) { 558 for (split //, $glyph) {
463 utf8::encode $_; 559 utf8::encode $_;
464 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; 560 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
465 } 561 }
466 } 562 }
467 } 563 }
526 next if /^facings\s/; 622 next if /^facings\s/;
527 623
528 my $face = $_; 624 my $face = $_;
529 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 625 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
530 626
531 my $info = $FACEINFO{$face} ||= { }; 627 # handle derived faces
628 if ($face =~ /^([^:]+):(.*)/) {
629 my ($type, $base) = ($1, $2);
630 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
631 }
632
532 $info->{arc} = $o; 633 $FACEINFO{$face}{arc} = $o;
533 634
534 next if $face =~ /^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
535 } 636 }
536 637
537 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
553 my ($dir, $file) = @_; 654 my ($dir, $file) = @_;
554 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
555 656
556 my $trs; 657 my $trs;
557 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
558 warn "$path: $!, skipping.\n"; 659 warn "ERROR: $path: $!, skipping.\n";
559 return; 660 return;
560 } 661 }
561 662
562 $TRS .= $trs; 663 $TRS .= $trs;
563 } 664 }
568 unless (exists $FILECACHE{$_[0]}) { 669 unless (exists $FILECACHE{$_[0]}) {
569 my $data; 670 my $data;
570 if (0 < aio_load $_[0], $data) { 671 if (0 < aio_load $_[0], $data) {
571 if ($_[1]) { 672 if ($_[1]) {
572 $data = eval { $_[1]->($data) }; 673 $data = eval { $_[1]->($data) };
573 warn "$_[0]: $@" if $@; 674 warn "ERROR: $_[0]: $@" if $@;
574 } 675 }
575 } 676 }
576 677
577 $FILECACHE{$_[0]} = $data; 678 $FILECACHE{$_[0]} = $data;
578 } 679 }
579 680
580 $FILECACHE{$_[0]} 681 $FILECACHE{$_[0]}
682 }
683
684 # convert an image and a palette to some indexed 2d-matrix structure
685 sub process_plt {
686 my ($base, $plt) = @_;
687
688 my ($w, $h) = imgsize "$base.png";
689
690 $w * $h
691 or die "$base.png: unable to identify correct size\n";
692
693 my @plt;
694 my %map;
695
696 for (split /\n/, $plt) {
697 next unless /\S/;
698 next if /^\s*#/;
699
700 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
701 or die "unparseable palette entry for $base.plt: $_";
702
703 my ($rgb, $name) = ($1, $2);
704
705 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
706
707 $map{pack "H*", $rgb} = chr @plt;
708 push @plt, $name;
709 }
710
711 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
712 warn "building $base\n" if $VERBOSE >= 3;
713
714 fork_exec {
715 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
716 or die "$base.png: $!";
717
718 local $/;
719 $png = <$png>;
720
721 $w * $h * 3 == length $png
722 or die "$base.png: failed to read enough data from file\n";
723
724 $png =~ s/(...)/$map{$1}/ge;
725
726 $w * $h == length $png
727 or die "$base.png: failed to map all data - wrong palette?\n";
728
729 {
730 open my $fh, ">:raw", "$base.tbl~~"
731 or die "$base.tbl~~: $!";
732 syswrite $fh, $png;
733 }
734
735 rename "$base.tbl~~", "$base.tbl~";
736 };
737 };
738
739 0 <= aio_load "$base.tbl~", my $tbl
740 or die "$base.tbl~: $!";
741
742 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
743
744 Compress::LZF::compress nfreeze {
745 w => $w,
746 h => $h,
747 plt => \@plt,
748 tbl => $tbl,
749 }
581 } 750 }
582 751
583 sub process_res { 752 sub process_res {
584 my ($dir, $file, $type) = @_; 753 my ($dir, $file, $type) = @_;
585 754
586 my $data;
587 aio_load "$dir/$file", $data; 755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
588 757
589 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 758 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
590 759
591 utf8::decode $dir; 760 utf8::decode $dir;
592 utf8::decode $file; 761 utf8::decode $file;
600 $meta = { 769 $meta = {
601 %{ $meta->{"" } || {} }, 770 %{ $meta->{"" } || {} },
602 %{ $meta->{$file} || {} }, 771 %{ $meta->{$file} || {} },
603 }; 772 };
604 773
605 if ($meta->{license} =~ s/^#//) { 774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
606 $meta->{license} = ({ 775 $meta->{license} = ({
607 "pd" => "Public Domain", 776 "pd" => "Public Domain",
608 "gpl" => "GNU General Public License, version 3.0 or any later", 777 "gpl" => "GNU General Public License, version 3.0 or any later",
609 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 778 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
610 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 779 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
611 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 780 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
612 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 781 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
613 })->{$meta->{license}} 782 })->{$meta->{license}}
614 || warn "$dir/$file: license tag '$meta->{license}' not found."; 783 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
615 } 784 }
616 785
617 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 786 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
618 ($meta->{author} = $1) =~ s/_/ /g; 787 ($meta->{author} = $1) =~ s/_/ /g;
619 } 788 }
620 789
621 $file =~ s/\.res$//; 790 $file =~ s/\.res$//;
622 $file =~ s/\.(ogg|wav|jpg|png)$//; 791 $file =~ s/\.(ogg|wav|jpg|png)$//;
623 792
624 substr $dir, 0, 1 + length $PATH, ""; 793 if ($file =~ s/\.plt$//) {
625 794 $data = process_plt "$dir/$file", $data;
626 if (my $filter = $meta->{cfutil_filter}) { 795 } elsif (my $filter = delete $meta->{cfutil_filter}) {
627 if ($filter eq "yaml2json") { 796 if ($filter eq "yaml2json") {
628 $data = JSON::XS::encode_json YAML::XS::Load $data; 797 $data = JSON::XS::encode_json YAML::XS::Load $data;
629 } elsif ($filter eq "json2json") { 798 } elsif ($filter eq "json2json") {
630 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 799 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
631 } elsif ($filter eq "perl2json") { 800 } elsif ($filter eq "perl2json") {
632 $data = eval $data; die if $@; 801 $data = eval $data; die if $@;
633 $data = JSON::XS::encode_json $data; 802 $data = JSON::XS::encode_json $data;
634 } else { 803 } else {
635 warn "$dir/$file: unknown filter $filter, skipping\n"; 804 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
636 }
637 } 805 }
806 }
638 807
639 $RESOURCE{"$dir/$file"} = { 808 substr $dir, 0, 1 + length $PATH, "";
809
810 my %info = (
640 type => (exists $meta->{type} ? delete $meta->{type} : $type), 811 type => (exists $meta->{type} ? delete $meta->{type} : $type),
641 data => $data, 812 data => $data,
642 %$meta ? (meta => $meta) : (), 813 %$meta ? (meta => $meta) : (),
643 }; 814 );
815
816 $RESOURCE{"$dir/$file"} = \%info;
644 } 817 }
645 818
646 sub process_any { 819 sub process_any {
647 while (my ($func, @args) = @{ $c_any->get }) { 820 while (my ($func, @args) = @{ $c_any->get }) {
648 $func->(@args); 821 $func->(@args);
681 if ($file =~ /\.(jpg|png)$/) { 854 if ($file =~ /\.(jpg|png)$/) {
682 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE 855 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
683 } elsif ($file =~ /\.(res)$/) { 856 } elsif ($file =~ /\.(res)$/) {
684 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC 857 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
685 } else { 858 } else {
686 $c_any->put ([\&process_res, $path, $file, undef]); 859 $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
687 } 860 }
688 861
689 } elsif ($file =~ /\.png$/) { 862 } elsif ($file =~ /\.png$/) {
690 push @c_png, ["$path/$file", 0]; 863 $PNG{$file} = $path;
691 864
692 } elsif ($file =~ /\.faceinfo$/) { 865 } elsif ($file =~ /\.faceinfo$/) {
693 $c_any->put ([\&process_faceinfo, $path, $file]); 866 $c_any->put ([\&process_faceinfo, $path, $file]);
694 867
695 } elsif ($file =~ /\.trs$/) { 868 } elsif ($file =~ /\.trs$/) {
748 "Unless you run verbosely, all following warning\n", 921 "Unless you run verbosely, all following warning\n",
749 "or error messages indicate serious problems.\n", 922 "or error messages indicate serious problems.\n",
750 "\n"; 923 "\n";
751 924
752 if (!-d "$path/treasures") { 925 if (!-d "$path/treasures") {
753 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 926 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
754 exit 1 unless $FORCE; 927 exit 1 unless $FORCE;
755 } 928 }
756 929
757 print "start file scan, arc, any processing...\n" if $VERBOSE; 930 print "starting file scan, arc, any processing...\n" if $VERBOSE;
758 931
759 my @a_arc = map +(async \&process_arc), 1..2; 932 my @a_arc = map +(async \&process_arc), 1..2;
760 my @a_any = map +(async \&process_any), 1..4; 933 my @a_any = map +(async \&process_any), 1..4;
761 934
762 find_files $path; 935 find_files $path;
763 936
764 $c_arc->shutdown; 937 $c_arc->shutdown;
765 $c_any->shutdown; 938 $c_any->shutdown;
766 939
767 $_->join for @a_arc; # need to parse all archetypes before png processing 940 $_->join for @a_arc; # need to parse all archetypes before png processing
941 print "finished arc processing...\n" if $VERBOSE;
768 942
943 # fill png queue
944 for (keys %FACEINFO) {
945 # we only expect source pngs to exist for non-derived
946 # faces, i.e. no split tiles (+x+x) and no face derivates
947 # (xxx:)
948 /^[^:]+\....$/
949 or next;
950
951 my $seen;
952
953 if (exists $PNG{"$_.32x32.png"}) {
954 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
955 $seen = 1;
956 }
957 if (exists $PNG{"$_.64x64.png"}) {
958 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
959 $seen = 1;
960 }
961
962 warn "ERROR: $_: face not found, expect problems.\n"
963 unless $seen;
964 }
965
769 print "end arc, start png processing...\n" if $VERBOSE; 966 print "starting png processing...\n" if $VERBOSE;
770 967
771 # eight png crunchers work fine for my 4x smp machine 968 # eight png crunchers work fine for my 4x smp machine
772 my @a_png = map +(async \&process_png), 1..8; 969 my @a_png = map +(async \&process_png), 1..8;
773 970
774 print "end any processing...\n" if $VERBOSE;
775 $_->join for @a_any; 971 $_->join for @a_any;
776
777 print "end png processing...\n" if $VERBOSE; 972 print "finished any processing...\n" if $VERBOSE;
973
778 $_->join for @a_png; 974 $_->join for @a_png;
975 print "finished png processing...\n" if $VERBOSE;
779 976
780 print "scanning done, processing results...\n" if $VERBOSE; 977 print "scanning done, processing results...\n" if $VERBOSE;
781 { 978 {
782 # remove path prefix from editor_folder 979 # remove path prefix from editor_folder
783 $_->{editor_folder} =~ /^\x00/ 980 $_->{editor_folder} =~ /^\x00/
801 delete @s{qw(_name more name name_pl)}; 998 delete @s{qw(_name more name name_pl)};
802 %$o = ( %s, %$o ); 999 %$o = ( %s, %$o );
803 ++$progress; 1000 ++$progress;
804 } 1001 }
805 } else { 1002 } else {
806 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 1003 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
807 delete $ARC{$o->{_name}}; 1004 delete $ARC{$o->{_name}};
808 } 1005 }
809 } 1006 }
810 } 1007 }
811 1008
847 print $fh $TRS; 1044 print $fh $TRS;
848 } 1045 }
849 1046
850 { 1047 {
851 print "processing facedata...\n" if $VERBOSE; 1048 print "processing facedata...\n" if $VERBOSE;
852 while (my ($k, $v) = each %FACEINFO) { 1049
1050 for my $k (sort keys %FACEINFO) {
1051 my $v = $FACEINFO{$k};
1052
853 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 1053 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
854 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; 1054 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
855 1055
856 make_hash $k, $v->{data32}, $v->{hash32}; 1056 make_hash $k, $v->{data32}, $v->{hash32};
857 make_hash $k, $v->{data64}, $v->{hash64}; 1057 make_hash $k, $v->{data64}, $v->{hash64};
858 1058
859 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; 1059 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
860 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; 1060 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
861 1061
862 $v->{glyph} // warn "WARNING: face '$k' has glyph."; 1062 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
863 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; 1063 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
864 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour."; 1064 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
865 1065
1066 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
1067 my $id = @TC;
1068 my $n = @{ $TC[-1] };
1069 my $x = $n % TC_W;
1070 my $y = int $n / TC_W;
1071
1072 push @{ $TC[-1] }, [$v, $x, $y];
1073
1074 $v->{tc} = [$id, $x, $y];
1075
1076 push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
1077 }
1078
866 delete @$v{qw(arc stem)}; # not used by the server 1079 delete @$v{qw(w h arc stem derive)}; # not used by the server
1080 }
1081
1082if (0) { #d# texture catalogs
1083 print "creating texture catalogs...\n" if $VERBOSE;
1084
1085 for my $id (0 .. $#TC) {
1086 my $tc = $TC[$id];
1087
1088 my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
1089 my $idx = "a";
1090
1091 for (@$tc) {
1092 my $path = "$TMPDIR/tc" . $idx++;
1093
1094 open my $fh, ">:perlio", $path
1095 or die "$path: $!";
1096 syswrite $fh, $_->[0]{data64};
1097
1098 my $x = $_->[1] * 64;
1099 my $y = $_->[2] * 64;
1100
1101 $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
867 } 1102 }
1103
1104 system "$cmd png:\Q$TMPDIR/tc$id\E";
1105 optipng "$TMPDIR/tc$id";
1106 }
1107}
868 1108
869 print "processing resources...\n" if $VERBOSE; 1109 print "processing resources...\n" if $VERBOSE;
870 my $enc = JSON::XS->new->utf8->canonical->relaxed; 1110 my $enc = JSON::XS->new->utf8->canonical->relaxed;
871 while (my ($k, $v) = each %RESOURCE) { 1111 for my $k (sort keys %RESOURCE) {
1112 my $v = $RESOURCE{$k};
872 1113
873 if ($v->{meta} && $v->{meta}{datadir}) { 1114 if ($v->{meta} && $v->{meta}{datadir}) {
874 delete $RESOURCE{$k}; 1115 delete $RESOURCE{$k};
875 1116
876 $k =~ s/^res\/// or die "$k: datadir files must be in res/"; 1117 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
895 1136
896 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients 1137 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
897 } 1138 }
898 } 1139 }
899 1140
1141 printf "writing facedata...\n" if $VERBOSE;
1142
1143 {
1144 open my $fh, ">:perlio", "$DATADIR/facedata~"
1145 or die "$DATADIR/facedata~: $!";
1146
1147 print $fh "FACEDATA";
1148 my $fofs = 8;
1149
1150 my $put = sub {
1151 my $len = length $_[0];
1152 my $ofs = $fofs;
1153
1154 print $fh $_[0];
1155 $fofs += $len;
1156
1157 ($len, $ofs)
1158 };
1159
1160 for (values %FACEINFO) {
1161 ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
1162 ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
1163 }
1164
1165 for (values %RESOURCE) {
1166 ($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
1167 }
1168
1169 close $fh;
1170 }
1171
900 printf "writing facedata (%d faces, %d anims, %d resources)...\n", 1172 printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
901 scalar keys %FACEINFO, 1173 scalar keys %FACEINFO,
902 scalar keys %ANIMINFO, 1174 scalar keys %ANIMINFO,
903 scalar keys %RESOURCE 1175 scalar keys %RESOURCE
904 if $VERBOSE; 1176 if $VERBOSE;
905 1177
906 open my $fh, ">:perlio", "$DATADIR/facedata~" 1178 open my $fh, ">:perlio", "$DATADIR/faceinfo~"
907 or die "$DATADIR/facedata~: $!"; 1179 or die "$DATADIR/faceinfo~: $!";
908 1180
909 print $fh nfreeze { 1181 print $fh nfreeze {
910 version => 2, 1182 version => 2,
911 faceinfo => \%FACEINFO, 1183 faceinfo => \%FACEINFO,
912 animinfo => \%ANIMINFO, 1184 animinfo => \%ANIMINFO,
913 resource => \%RESOURCE, 1185 resource => \%RESOURCE,
914 }; 1186 };
915
916 } 1187 }
917 1188
918 print "committing files...\n" if $VERBOSE; 1189 print "committing files...\n" if $VERBOSE;
919 1190
920 for (qw(archetypes facedata treasures), @COMMIT) { 1191 for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
921 chmod 0644, "$DATADIR/$_~"; 1192 chmod 0644, "$DATADIR/$_~";
922 rename "$DATADIR/$_~", "$DATADIR/$_" 1193 rename "$DATADIR/$_~", "$DATADIR/$_"
923 or die "$DATADIR/$_: $!"; 1194 or die "$DATADIR/$_: $!";
924 } 1195 }
925 1196

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines