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.51 by root, Sat Aug 18 20:39:14 2007 UTC vs.
Revision 1.59 by root, Tue Aug 21 20:00:18 2007 UTC

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

Diff Legend

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