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.53 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.76 by root, Tue Nov 3 14:49:39 2009 UTC

… …
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
17use File::Temp;
18use POSIX ();
19use Carp;
20
17use Coro::Event; 21use Coro::EV;
18use AnyEvent; 22use AnyEvent;
23use YAML::XS ();
24use JSON::XS ();
19use IO::AIO (); 25use IO::AIO ();
20use File::Temp; 26
21use Crossfire;
22use Coro; 27use Coro 5.12;
23use Coro::AIO; 28use Coro::AIO;
24use Coro::Util; 29use Coro::Util;
25use POSIX ();
26use Digest::MD5;
27use Carp;
28use Coro::Channel; 30use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 31use Coro::Storable; $Storable::canonical = 1;
32
33use Deliantra;
30 34
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 35$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 36
33sub usage { 37sub usage {
34 warn <<EOF; 38 warn <<EOF;
… …
66 tan => 12, 70 tan => 12,
67); 71);
68 72
69END { system "rm", "-rf", $TMPDIR } 73END { system "rm", "-rf", $TMPDIR }
70 74
71Event->signal (signal => "INT", cb => sub { exit 1 }); 75my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => sub { exit 1 }); 76my $s_TERM = EV::signal TERM => sub { exit 1 };
73 77
74mkdir $TMPDIR, 0700 78mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 79 or die "$TMPDIR: $!";
76 80
77sub fork_sub(&) { 81sub fork_sub(&) {
… …
97 if (!-f "$path/regions") { 101 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 102 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 103 exit 1 unless $FORCE;
100 } 104 }
101 105
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 106 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
107 "$path/.", "$DATADIR/maps/.",
108 "--exclude", "CVS", "--exclude", "/world-precomposed",
109 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 110 and die "map installation failed.\n";
104 111
105 print "maps installed successfully.\n"; 112 print "maps installed successfully.\n";
106} 113}
107 114
… …
170 if ($w % $T || $h % $T) { 177 if ($w % $T || $h % $T) {
171 warn "$path: weird png size ($w $h), skipping.\n"; 178 warn "$path: weird png size ($w $h), skipping.\n";
172 next; 179 next;
173 } 180 }
174 181
182 (my $base = $stem) =~ s/^.*\///;
183
184 my $fi = $FACEINFO{$base};
185 unless ($fi) {
186 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
187 #next;
188 }
189
190 my $arc = $fi->{arc} || { };
191
175 unless ($path =~ /~$/) { 192 unless ($path =~ /~$/) {
176 # possibly enlarge 193 # possibly enlarge
177 if (0 > aio_stat "$stem.64x64.png") { 194 if (0 > aio_stat "$stem.64x64.png") {
178 my $other = "$stem.64x64.png~"; 195 my $other = "$stem.64x64.png~";
179 196
180 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 197 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
181 fork_sub { 198 fork_sub {
182 my $CROP; 199 my $CROP;
183 my $SRC = "png:\Q$path\E"; 200 my $SRC = "png:\Q$path\E";
184 201
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 202 my $is_floor = $arc->{is_floor};
203 my $is_wall = 0;
204
205 my ($wall_pfx, $wall_dir, $wall_sfx);
206
207 if (
208 !$is_floor
209 && !$arc->{alive}
210 && $arc->{move_block} eq "all"
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 211 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
212 ) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 213 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall 214
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 215 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
216 $is_wall = 1;
217 }
218 }
219
220 if ($is_wall || $is_floor) {
190 # add a 4px border and add other images around it 221 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage"; 222 $CROP = "-shave 8x8 +repage";
192 223
193 $w += 8; 224 $w += 8;
194 $h += 8; 225 $h += 8;
195 226
196 $SRC = "-size ${w}x${h} xc:transparent"; 227 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 228 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198 229
199 # 8 surrounding images 230 # 8 surrounding images
200 for ( 231 for (
201 # x y b r0 r1 232 # x y b r0 r1
202 [-1, -1, 0, 6], 233 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14], 234 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12], 235 [+1, -1, 0, 12],
205 236
206 [-1, 0, 8, 5, 7], 237 [-1, 0, 8, 5, 7],
207 # 238 #
208 [+1, 0, 2, 5, 13], 239 [+1, 0, 2, 5, 13],
209 240
210 [-1, +1, 0, 3], 241 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11], 242 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9], 243 [+1, +1, 0, 9],
213 ) { 244 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_; 245 my ($x, $y, $d, $r0, $r1) = @$_;
246
247 my $tile = $is_floor ? $path
248 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
249 : die;
250
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 251 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
216 "\Q$pfx", 252 "\Q$tile",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4, 253 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4; 254 $y * ($h - 8) + 4;
221 }
222 } 255 }
223 } 256 }
224 257
225 system "convert -depth 8 $SRC rgba:-" 258 system "convert -depth 8 $SRC rgba:-"
226 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 259 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
… …
243 fork_sub { 276 fork_sub {
244 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 277 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
245 system $OPTIPNG, "-i0", "-q", "$other~"; 278 system $OPTIPNG, "-i0", "-q", "$other~";
246 279
247 # reduce smoothfaces >10000 bytes 280 # reduce smoothfaces >10000 bytes
281 # obsolete, no longer required
248 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 282 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
249 my $ncolor = 256; 283 my $ncolor = 256;
250 while () { 284 while () {
251 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 285 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
252 system $OPTIPNG, "-i0", "-q", "$other~~"; 286 system $OPTIPNG, "-i0", "-q", "$other~~";
253 last if 10000 > -s "$other~~"; 287 last if 10000 > -s "$other~~";
… …
349 push @ARC, $o; 383 push @ARC, $o;
350 for (my $m = $o; $m; $m = $m->{more}) { 384 for (my $m = $o; $m; $m = $m->{more}) {
351 $ARC{$m->{_name}} = $m; 385 $ARC{$m->{_name}} = $m;
352 } 386 }
353 387
354 $o->{editor_folder} = $dir; 388 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
355 389
356 my $visibility = delete $o->{visibility}; 390 my $visibility = delete $o->{visibility};
357 my $magicmap = delete $o->{magicmap}; 391 my $magicmap = delete $o->{magicmap};
358 392
359 # find upper left corner :/ 393 # find upper left corner :/
… …
399 facings => $facings, 433 facings => $facings,
400 frames => \@frames, 434 frames => \@frames,
401 }; 435 };
402 } 436 }
403 437
404 for my $face ($o->{face} || (), @{$anim || []}) { 438 for ($o->{face} || (), @{$anim || []}) {
405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 439 next if /^facings\s/;
406 440
441 my $face = $_;
442 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
443
407 my $info = $FACEINFO{$face} ||= {}; 444 my $info = $FACEINFO{$face} ||= { };
408
409 $info->{arc} = $o; 445 $info->{arc} = $o;
446
447 next if $face =~ /^blank.x11$|^empty.x11$/;
448
410 $info->{visibility} = $visibility if defined $visibility; 449 $info->{visibility} = $visibility if defined $visibility;
411 $info->{magicmap} = $magicmap if defined $magicmap; 450 $info->{magicmap} = $magicmap if defined $magicmap;
412 } 451 }
413 452
414 if (my $smooth = delete $o->{smoothface}) { 453 if (my $smooth = delete $o->{smoothface}) {
415 my %kv =split /\s+/, $smooth; 454 my %kv = split /\s+/, $smooth;
416 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
417 while (my ($face, $smooth) = each %kv) { 456 while (my ($face, $smooth) = each %kv) {
457 $FACEINFO{$smooth}{arc} = $o;
458
418 $FACEINFO{$face}{smooth} = $smooth; 459 $FACEINFO{$face}{smooth} = $smooth;
419 $FACEINFO{$face}{smoothlevel} = $level; 460 $FACEINFO{$face}{smoothlevel} = $level;
420 } 461 }
421 } 462 }
422 } 463 }
… …
462 my ($dir, $file, $type) = @$job; 503 my ($dir, $file, $type) = @$job;
463 504
464 my $data; 505 my $data;
465 aio_load "$dir/$file", $data; 506 aio_load "$dir/$file", $data;
466 507
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 508 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
468 509
469 next if $meta && !exists $meta->{$file}; 510 utf8::decode $dir;
511 utf8::decode $file;
512
513 # a meta file for resources is now mandatory
514 unless (exists $meta->{$file}) {
515 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516 next;
517 }
470 518
471 $meta = { 519 $meta = {
472 %{ $meta->{"" } || {} }, 520 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} }, 521 %{ $meta->{$file} || {} },
474 }; 522 };
… …
487 $file =~ s/\.res$//; 535 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//; 536 $file =~ s/\.(ogg|wav|jpg|png)$//;
489 537
490 substr $dir, 0, 1 + length $PATH, ""; 538 substr $dir, 0, 1 + length $PATH, "";
491 539
540 if (my $filter = $meta->{cfutil_filter}) {
541 if ($filter eq "yaml2json") {
542 $data = JSON::XS::encode_json YAML::XS::Load $data;
543 } elsif ($filter eq "json2json") {
544 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545 } elsif ($filter eq "perl2json") {
546 $data = eval $data; die if $@;
547 $data = JSON::XS::encode_json $data;
548 } else {
549 warn "$dir/$file: unknown filter $filter, skipping\n";
550 }
551 }
552
492 $RESOURCE{"$dir/$file"} = { 553 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type, 554 type => (exists $meta->{type} ? delete $meta->{type} : $type),
494 data => $data, 555 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (), 556 %$meta ? (meta => $meta) : (),
497 }; 557 };
498 } 558 }
499 } 559 }
500 560
… …
520 } elsif ($dir =~ /^sound(?:\/|$)/) { 580 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND 581 $c_res->put ([$path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/; 582 if $file =~ /\.(wav|ogg)$/;
523 583
524 } elsif ($dir =~ /^res(?:\/|$)/) { 584 } elsif ($dir =~ /^res(?:\/|$)/) {
585 if ($file =~ /\.(jpg|png)$/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE 586 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/; 587 } elsif ($file =~ /\.(res)$/) {
527 $c_res->put ([$path, $file, 7]) # FT_RSRC 588 $c_res->put ([$path, $file, 6]) # FT_RSRC
528 if $file =~ /\.(res)$/; 589 } else {
590 $c_res->put ([$path, $file, undef]);
591 }
529 592
530 } elsif ($file =~ /\.png$/) { 593 } elsif ($file =~ /\.png$/) {
531 push @c_png, ["$path/$file", 0]; 594 push @c_png, ["$path/$file", 0];
532 595
533 } elsif ($file =~ /\.trs$/) { 596 } elsif ($file =~ /\.trs$/) {
… …
539 } else { 602 } else {
540 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
541 } 604 }
542 } 605 }
543 }; 606 };
607 }
608
609 sub generate_plurals {
610# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
613# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
614#
615# for my $a (@ARC) {
616# my $name = $a->{name} || $a->{_name};
617#
618# next unless $a->{name_pl};
619# next if $a->{invisible};
620# next if $a->{is_floor};
621# next if $a->{no_pick};
622#
623# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
624# my $pl = $test =~ /^(?:eq|p:.)$/
625# ? $name
626# : Lingua::EN::Inflect::PL $name;
627#
628# if ($pl ne $a->{name_pl}) {
629# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
630# }
631# }
544 } 632 }
545 633
546 sub inst_arch($) { 634 sub inst_arch($) {
547 my (undef, $path) = @_; 635 my (undef, $path) = @_;
548 636
… …
571 my @a_res = map +(async \&process_res), 1..2; 659 my @a_res = map +(async \&process_res), 1..2;
572 my @a_trs = map +(async \&process_trs), 1..2; 660 my @a_trs = map +(async \&process_trs), 1..2;
573 661
574 IO::AIO::flush; 662 IO::AIO::flush;
575 663
576 $c_res->put (undef) for @a_res; 664 $c_res->shutdown;
577 $c_arc->put (undef) for @a_arc; 665 $c_arc->shutdown;
578 $c_trs->put (undef) for @a_trs; 666 $c_trs->shutdown;
579 667
580 print "start file scan, arc, res processing...\n" if $VERBOSE; 668 print "start file scan, arc, res processing...\n" if $VERBOSE;
581 669
582 $_->join for @a_arc; # need to parse all archetypes before png processing 670 $_->join for @a_arc; # need to parse all archetypes before png processing
583 671
584 print "end arc, start png processing...\n" if $VERBOSE; 672 print "end arc, start png processing...\n" if $VERBOSE;
585 673
586 # four png crunchers work fine for my 2x smp machine 674 # eight png crunchers work fine for my 4x smp machine
587 my @a_png = map +(async \&process_png), 1..4; 675 my @a_png = map +(async \&process_png), 1..8;
588 676
589 $_->join for (@a_trs, @a_res, @a_png); 677 $_->join for (@a_trs, @a_res, @a_png);
590 678
591 print "scanning done, processing results...\n" if $VERBOSE; 679 print "scanning done, processing results...\n" if $VERBOSE;
592 { 680 {
593 # remove path prefix from editor_folder 681 # remove path prefix from editor_folder
682 $_->{editor_folder} =~ /^\x00/
594 substr $_->{editor_folder}, 0, 1 + length $path, "" 683 and substr $_->{editor_folder}, 0, 2 + length $path, ""
595 for values %ARC; 684 for values %ARC;
596 685
597 print "resolving inheritance tree...\n" if $VERBOSE; 686 print "resolving inheritance tree...\n" if $VERBOSE;
598 # resolve inherit 687 # resolve inherit
599 while () { 688 while () {
600 my $progress; 689 my $progress;
… …
628 } 717 }
629 718
630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 719 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 720 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
632 721
722 print "generating plurals...\n" if $VERBOSE;
723 generate_plurals;
724
633 print "writing archetypes...\n" if $VERBOSE; 725 print "writing archetypes...\n" if $VERBOSE;
634 open my $fh, ">:utf8", "$DATADIR/archetypes~" 726 open my $fh, ">:utf8", "$DATADIR/archetypes~"
635 or die "$DATADIR/archetypes~: $!"; 727 or die "$DATADIR/archetypes~: $!";
636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 728 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
637 } 729 }
638 730
639 { 731 {
640 print "writing treasures...\n" if $VERBOSE; 732 print "writing treasures...\n" if $VERBOSE;
641 open my $fh, ">:utf8", "$DATADIR/treasures~" 733 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
647 print "processing facedata...\n" if $VERBOSE; 739 print "processing facedata...\n" if $VERBOSE;
648 while (my ($k, $v) = each %FACEINFO) { 740 while (my ($k, $v) = each %FACEINFO) {
649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 741 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 742 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
651 743
652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 744 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
653 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 745 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
654
655 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
656 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
657 746
658 if (my $magicmap = $v->{magicmap}) { 747 if (my $magicmap = $v->{magicmap}) {
659 $magicmap =~ y/A-Z_\-/a-z/d; 748 $magicmap =~ y/A-Z_\-/a-z/d;
660 $v->{magicmap} = $COLOR{$magicmap}; 749 $v->{magicmap} = $COLOR{$magicmap};
661 } 750 }

Diff Legend

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