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.46 by root, Wed Jul 25 22:30:38 2007 UTC vs.
Revision 1.58 by root, Tue Aug 21 19:44:57 2007 UTC

… …
19use IO::AIO (); 19use IO::AIO ();
20use File::Temp; 20use File::Temp;
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
24use POSIX (); 25use POSIX ();
25use Digest::MD5;
26use Carp; 26use Carp;
27use Coro::Channel;
27use Coro::Storable; $Storable::canonical = 1; 28use Coro::Storable; $Storable::canonical = 1;
28 29
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 30$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 31
31sub usage { 32sub usage {
… …
113 our $NFILE; 114 our $NFILE;
114 our $PATH; 115 our $PATH;
115 116
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 117 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 118
118 our (@png, @trs, @arc, @res); # files we are interested in 119 our $c_arc = new Coro::Channel;
120 our $c_trs = new Coro::Channel;
121 our $c_res = new Coro::Channel;
122
123 our @c_png;
119 124
120 sub commit_png($$$) { 125 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 126 my ($name, $data, $T) = @_;
122 127
123 $FACEINFO{$name}{"data$T"} = $data; 128 $FACEINFO{$name}{"data$T"} = $data;
124 } 129 }
125 130
126 sub process_png { 131 sub process_png {
127 while (@png) { 132 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 133 my ($path, $delete) = @{pop @c_png};
129 134
130 my $png; 135 my $png;
131 aio_lstat $path; 136 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 137 my ($size, $mtime) = (stat _)[7,9];
133 138
… …
164 if ($w % $T || $h % $T) { 169 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 170 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 171 next;
167 } 172 }
168 173
174 (my $base = $stem) =~ s/^.*\///;
175
176 my $fi = $FACEINFO{$base};
177 unless ($fi) {
178 warn "$path: <$base> not referenced by any archetype, skipping.\n";
179 next;
180 }
181
182 my $arc = $FACEINFO{$base}{arc}
183 or die "FATAL: internal error <$base>, cannot continue";
184
169 unless ($path =~ /~$/) { 185 unless ($path =~ /~$/) {
170 # possibly enlarge 186 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 187 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 188 my $other = "$stem.64x64.png~";
173 189
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 190 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 191 fork_sub {
192 my $CROP;
193 my $SRC = "png:\Q$path\E";
194
195 my $is_floor = $arc->{is_floor};
196 my $is_wall = 0;
197
198 my ($wall_pfx, $wall_dir, $wall_sfx);
199
200 if (
201 !$is_floor
202 && !$arc->{alive}
203 && $arc->{move_block} eq "all"
204 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
205 ) {
206 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
207
208 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
209 $is_wall = 1;
210 }
211 }
212
213 if ($is_wall || $is_floor) {
214 # add a 4px border and add other images around it
215 $CROP = "-shave 8x8 +repage";
216
217 $w += 8;
218 $h += 8;
219
220 $SRC = "-size ${w}x${h} xc:transparent";
221 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
222
223 # 8 surrounding images
224 for (
225 # x y b r0 r1
226 [-1, -1, 0, 6],
227 [ 0, -1, 1, 10, 14],
228 [+1, -1, 0, 12],
229
230 [-1, 0, 8, 5, 7],
231 #
232 [+1, 0, 2, 5, 13],
233
234 [-1, +1, 0, 3],
235 [ 0, +1, 4, 10, 11],
236 [+1, +1, 0, 9],
237 ) {
238 my ($x, $y, $d, $r0, $r1) = @$_;
239
240 my $tile = $is_floor ? $path
241 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
242 : die;
243
244 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
245 "\Q$tile",
246 $x * ($w - 8) + 4,
247 $y * ($h - 8) + 4;
248 }
249 }
250
177 system "convert png:\Q$path\E -depth 8 rgba:-" 251 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 252 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 253 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)"; 254 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 255 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 256 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 257 rename "$other~", $other;
184 }; 258 };
185 } 259 }
186 260
187 push @png, [$other, !$CACHE]; 261 push @c_png, [$other, !$CACHE];
188 } 262 }
189 263
190 # possibly scale down 264 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 265 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 266 my $other = "$stem.32x32.png~";
… …
217 rename "$other~", $other; 291 rename "$other~", $other;
218 }; 292 };
219 } 293 }
220 294
221 #warn "scaled down $path to $other\n";#d# 295 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 296 push @c_png, [$other, !$CACHE];
223 } 297 }
224 } 298 }
225 299
226 (my $face = $stem) =~ s/^.*\///; 300 (my $face = $stem) =~ s/^.*\///;
227 301
… …
288 aio_unlink $path if $delete; 362 aio_unlink $path if $delete;
289 } 363 }
290 } 364 }
291 365
292 sub process_arc { 366 sub process_arc {
293 while (@arc) { 367 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 368 my ($dir, $file) = @$job;
295 369
296 my $arc; 370 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 371 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 372
299 my $arc = read_arch "$dir/$file"; 373 my $arc = read_arch "$dir/$file";
… …
351 facings => $facings, 425 facings => $facings,
352 frames => \@frames, 426 frames => \@frames,
353 }; 427 };
354 } 428 }
355 429
356 for my $face ($o->{face} || (), @{$anim || []}) { 430 for ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 431 next if /^facings\s/;
358 432
433 my $face = $_;
434 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
435
359 my $info = $FACEINFO{$face} ||= {}; 436 my $info = $FACEINFO{$face} ||= { };
437 $info->{arc} = $o;
438
439 next if $face =~ /^blank.x11$|^empty.x11$/;
360 440
361 $info->{visibility} = $visibility if defined $visibility; 441 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 442 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 443 }
364 444
365 if (my $smooth = delete $o->{smoothface}) { 445 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 446 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 447 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 448 while (my ($face, $smooth) = each %kv) {
449 $FACEINFO{$smooth}{arc} = $o;
450
369 $FACEINFO{$face}{smooth} = $smooth; 451 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 452 $FACEINFO{$face}{smoothlevel} = $level;
371 } 453 }
372 } 454 }
373 } 455 }
374 } 456 }
375 } 457 }
376 } 458 }
377 459
378 sub process_trs { 460 sub process_trs {
379 while (@trs) { 461 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 462 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 463 my $path = "$dir/$file";
382 464
383 my $trs; 465 my $trs;
384 if (0 > aio_load $path, $trs) { 466 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 467 warn "$path: $!, skipping.\n";
… …
394 476
395 sub load_cached($;$) { 477 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) { 478 unless (exists $FILECACHE{$_[0]}) {
397 my $data; 479 my $data;
398 if (0 < aio_load $_[0], $data) { 480 if (0 < aio_load $_[0], $data) {
481 if ($_[1]) {
399 $data = $_[1]->($data) 482 $data = eval { $_[1]->($data) };
400 if $_[1]; 483 warn "$_[0]: $@" if $@;
484 }
401 } 485 }
402 486
403 $FILECACHE{$_[0]} = $data; 487 $FILECACHE{$_[0]} = $data;
404 } 488 }
405 489
406 $FILECACHE{$_[0]} 490 $FILECACHE{$_[0]}
407 } 491 }
408 492
409 sub process_res { 493 sub process_res {
410 while (@res) { 494 while (my $job = $c_res->get) {
411 my ($dir, $file, $type) = @{pop @res}; 495 my ($dir, $file, $type) = @$job;
412 496
413 my $data; 497 my $data;
414 aio_load "$dir/$file", $data; 498 aio_load "$dir/$file", $data;
415 499
416 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 500 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
417 501
418 $file =~ s/\.res$//; 502 next if $meta && !exists $meta->{$file};
419 $file =~ s/\.(ogg|wav|jpg|png)$//;
420
421 substr $dir, 0, 1 + length $PATH, "";
422 503
423 $meta = { 504 $meta = {
424 %{ $meta->{"" } || {} }, 505 %{ $meta->{"" } || {} },
425 %{ $meta->{$file} || {} }, 506 %{ $meta->{$file} || {} },
426 }; 507 };
427 508
509 if ($meta->{license} =~ s/^#//) {
510 $meta->{license} = ({
511 "pd" => "Public Domain",
512 "gpl" => "GNU General Public License, version 3.0 or any later",
513 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
514 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
515 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
516 })->{$meta->{license}}
517 || warn "$dir/$file: license tag '$meta->{license}' not found.";
518 }
519
520 $file =~ s/\.res$//;
521 $file =~ s/\.(ogg|wav|jpg|png)$//;
522
523 substr $dir, 0, 1 + length $PATH, "";
524
428 $RESOURCE{"$dir/$file"} = { 525 $RESOURCE{"$dir/$file"} = {
429 type => (delete $meta->{type}) || $type, 526 type => (delete $meta->{type}) || $type,
430 data => $data, 527 data => $data,
431 chksum => (Digest::MD5::md5 $data),
432 %$meta ? (meta => $meta) : (), 528 %$meta ? (meta => $meta) : (),
433 }; 529 };
434 } 530 }
435 } 531 }
436 532
… …
448 my $dir = $path; 544 my $dir = $path;
449 substr $dir, 0, 1 + length $PATH, ""; 545 substr $dir, 0, 1 + length $PATH, "";
450 546
451 for my $file (@$nondirs) { 547 for my $file (@$nondirs) {
452 if ($dir =~ /^music(?:\/|$)/) { 548 if ($dir =~ /^music(?:\/|$)/) {
453 push @res, [$path, $file, 3] # FT_MUSIC 549 $c_res->put ([$path, $file, 3]) # FT_MUSIC
454 if $file =~ /\.(ogg)$/; 550 if $file =~ /\.(ogg)$/;
455 551
456 } elsif ($dir =~ /^sounds(?:\/|$)/) { 552 } elsif ($dir =~ /^sound(?:\/|$)/) {
457 push @res, [$path, $file, 5] # FT_SOUND 553 $c_res->put ([$path, $file, 5]) # FT_SOUND
458 if $file =~ /\.(wav|ogg)$/; 554 if $file =~ /\.(wav|ogg)$/;
459 555
460 } elsif ($dir =~ /^res(?:\/|$)/) { 556 } elsif ($dir =~ /^res(?:\/|$)/) {
461 push @res, [$path, $file, 0] # FT_FACE 557 $c_res->put ([$path, $file, 0]) # FT_FACE
462 if $file =~ /\.(jpg|png)$/; 558 if $file =~ /\.(jpg|png)$/;
463 push @res, [$path, $file, 7] # FT_RSRC 559 $c_res->put ([$path, $file, 7]) # FT_RSRC
464 if $file =~ /\.(res)$/; 560 if $file =~ /\.(res)$/;
465 561
466 } elsif ($file =~ /\.png$/) { 562 } elsif ($file =~ /\.png$/) {
467 push @png, ["$path/$file", 0]; 563 push @c_png, ["$path/$file", 0];
468 564
469 } elsif ($file =~ /\.trs$/) { 565 } elsif ($file =~ /\.trs$/) {
470 push @trs, [$path, $file]; 566 $c_trs->put ([$path, $file]);
471 567
472 } elsif ($file =~ /\.arc$/) { 568 } elsif ($file =~ /\.arc$/) {
473 push @arc, [$path, $file]; 569 $c_arc->put ([$path, $file]);
474 570
475 } else { 571 } else {
476 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 572 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
477 } 573 }
478 } 574 }
… …
497 if (!-d "$path/treasures") { 593 if (!-d "$path/treasures") {
498 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 594 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
499 exit 1 unless $FORCE; 595 exit 1 unless $FORCE;
500 } 596 }
501 597
598 print "scanning files...\n" if $VERBOSE;
599
502 find_files $path; 600 find_files $path;
601
602 my @a_arc = map +(async \&process_arc), 1..2;
603 my @a_res = map +(async \&process_res), 1..2;
604 my @a_trs = map +(async \&process_trs), 1..2;
605
503 IO::AIO::flush; 606 IO::AIO::flush;
504 607
505 $_->join for ( 608 $c_res->put (undef) for @a_res;
609 $c_arc->put (undef) for @a_arc;
610 $c_trs->put (undef) for @a_trs;
611
612 print "start file scan, arc, res processing...\n" if $VERBOSE;
613
614 $_->join for @a_arc; # need to parse all archetypes before png processing
615
616 print "end arc, start png processing...\n" if $VERBOSE;
617
506 # four png crunchers work fine for my 2x smp machine 618 # four png crunchers work fine for my 2x smp machine
507 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 619 my @a_png = map +(async \&process_png), 1..4;
508 (async \&process_trs), (async \&process_trs),
509 (async \&process_arc), (async \&process_arc),
510 (async \&process_res), (async \&process_res),
511 );
512 620
621 $_->join for (@a_trs, @a_res, @a_png);
622
623 print "scanning done, processing results...\n" if $VERBOSE;
513 { 624 {
514 # remove path prefix from editor_folder 625 # remove path prefix from editor_folder
515 substr $_->{editor_folder}, 0, 1 + length $path, "" 626 substr $_->{editor_folder}, 0, 1 + length $path, ""
516 for values %ARC; 627 for values %ARC;
517 628
629 print "resolving inheritance tree...\n" if $VERBOSE;
518 # resolve inherit 630 # resolve inherit
519 while () { 631 while () {
520 my $progress; 632 my $progress;
521 my $loop; 633 my $loop;
522 634
… …
548 } 660 }
549 661
550 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 662 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
551 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 663 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
552 664
665 print "writing archetypes...\n" if $VERBOSE;
553 open my $fh, ">:utf8", "$DATADIR/archetypes~" 666 open my $fh, ">:utf8", "$DATADIR/archetypes~"
554 or die "$DATADIR/archetypes~: $!"; 667 or die "$DATADIR/archetypes~: $!";
555 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 668 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
556 } 669 }
557 670
558 { 671 {
672 print "writing treasures...\n" if $VERBOSE;
559 open my $fh, ">:utf8", "$DATADIR/treasures~" 673 open my $fh, ">:utf8", "$DATADIR/treasures~"
560 or die "$DATADIR/treasures~: $!"; 674 or die "$DATADIR/treasures~: $!";
561 print $fh $TRS; 675 print $fh $TRS;
562 } 676 }
563 677
564 { 678 {
679 print "processing facedata...\n" if $VERBOSE;
565 while (my ($k, $v) = each %FACEINFO) { 680 while (my ($k, $v) = each %FACEINFO) {
566 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 681 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
567 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 682 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
568 683
569 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 684 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
570 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 685 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
571 686
572 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
573 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
574
575 if (my $magicmap = $v->{magicmap}) { 687 if (my $magicmap = $v->{magicmap}) {
576 $magicmap =~ y/A-Z_\-/a-z/d; 688 $magicmap =~ y/A-Z_\-/a-z/d;
577 $v->{magicmap} = $COLOR{$magicmap}; 689 $v->{magicmap} = $COLOR{$magicmap};
578 } 690 }
579 }
580 691
692 delete $v->{arc};
693 }
694
695 print "writing facedata...\n" if $VERBOSE;
581 open my $fh, ">:perlio", "$DATADIR/facedata~" 696 open my $fh, ">:perlio", "$DATADIR/facedata~"
582 or die "$DATADIR/facedata~: $!"; 697 or die "$DATADIR/facedata~: $!";
583 698
584 print $fh freeze { 699 print $fh freeze {
585 version => 2, 700 version => 2,
586 faceinfo => \%FACEINFO, 701 faceinfo => \%FACEINFO,
587 animinfo => \%ANIMINFO, 702 animinfo => \%ANIMINFO,
588 resource => \%RESOURCE, 703 resource => \%RESOURCE,
589 }; 704 };
590 } 705 }
706
707 print "committing files...\n" if $VERBOSE;
591 708
592 for (qw(archetypes facedata treasures)) { 709 for (qw(archetypes facedata treasures)) {
593 chmod 0644, "$DATADIR/$_~"; 710 chmod 0644, "$DATADIR/$_~";
594 rename "$DATADIR/$_~", "$DATADIR/$_" 711 rename "$DATADIR/$_~", "$DATADIR/$_"
595 or die "$DATADIR/$_: $!"; 712 or die "$DATADIR/$_: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines