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.52 by root, Sat Aug 18 22:25:35 2007 UTC vs.
Revision 1.58 by root, Tue Aug 21 19:44:57 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 = $FACEINFO{$base}{arc}
183 or die "FATAL: internal error <$base>, cannot continue";
184
170 unless ($path =~ /~$/) { 185 unless ($path =~ /~$/) {
171 # possibly enlarge 186 # possibly enlarge
172 if (0 > aio_stat "$stem.64x64.png") { 187 if (0 > aio_stat "$stem.64x64.png") {
173 my $other = "$stem.64x64.png~"; 188 my $other = "$stem.64x64.png~";
174 189
175 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 190 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
176 fork_sub { 191 fork_sub {
177 my $CROP; 192 my $CROP;
178 my $SRC = "png:\Q$path\E"; 193 my $SRC = "png:\Q$path\E";
179 194
180 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 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"
181 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 204 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
205 ) {
182 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 206 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
183 #check for 0..F images to be sure(?) this is a wall 207
184 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 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) {
185 # add a 4px border and add other images around it 214 # add a 4px border and add other images around it
186 $CROP = "-shave 8x8 +repage"; 215 $CROP = "-shave 8x8 +repage";
187 216
188 $w += 8; 217 $w += 8;
189 $h += 8; 218 $h += 8;
190 219
191 $SRC = "-size ${w}x${h} xc:transparent"; 220 $SRC = "-size ${w}x${h} xc:transparent";
192 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 221 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
193 222
194 # 8 surrounding images 223 # 8 surrounding images
195 for ( 224 for (
196 # x y b r0 r1 225 # x y b r0 r1
197 [-1, -1, 0, 6], 226 [-1, -1, 0, 6],
198 [ 0, -1, 1, 10, 14], 227 [ 0, -1, 1, 10, 14],
199 [+1, -1, 0, 12], 228 [+1, -1, 0, 12],
200 229
201 [-1, 0, 8, 5, 7], 230 [-1, 0, 8, 5, 7],
202 # 231 #
203 [+1, 0, 2, 5, 13], 232 [+1, 0, 2, 5, 13],
204 233
205 [-1, +1, 0, 3], 234 [-1, +1, 0, 3],
206 [ 0, +1, 4, 10, 11], 235 [ 0, +1, 4, 10, 11],
207 [+1, +1, 0, 9], 236 [+1, +1, 0, 9],
208 ) { 237 ) {
209 my ($x, $y, $d, $r0, $r1) = @$_; 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
210 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 244 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
211 "\Q$pfx", 245 "\Q$tile",
212 ($dir & $d) ? $r1 : $r0,
213 "\Q$sfx",
214 $x * ($w - 8) + 4, 246 $x * ($w - 8) + 4,
215 $y * ($h - 8) + 4; 247 $y * ($h - 8) + 4;
216 }
217 } 248 }
218 } 249 }
219 250
220 system "convert -depth 8 $SRC rgba:-" 251 system "convert -depth 8 $SRC rgba:-"
221 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 252 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
… …
225 die "$other~ has zero size, aborting." unless -s "$other~"; 256 die "$other~ has zero size, aborting." unless -s "$other~";
226 rename "$other~", $other; 257 rename "$other~", $other;
227 }; 258 };
228 } 259 }
229 260
230 push @png, [$other, !$CACHE]; 261 push @c_png, [$other, !$CACHE];
231 } 262 }
232 263
233 # possibly scale down 264 # possibly scale down
234 if (0 > aio_stat "$stem.32x32.png") { 265 if (0 > aio_stat "$stem.32x32.png") {
235 my $other = "$stem.32x32.png~"; 266 my $other = "$stem.32x32.png~";
… …
260 rename "$other~", $other; 291 rename "$other~", $other;
261 }; 292 };
262 } 293 }
263 294
264 #warn "scaled down $path to $other\n";#d# 295 #warn "scaled down $path to $other\n";#d#
265 push @png, [$other, !$CACHE]; 296 push @c_png, [$other, !$CACHE];
266 } 297 }
267 } 298 }
268 299
269 (my $face = $stem) =~ s/^.*\///; 300 (my $face = $stem) =~ s/^.*\///;
270 301
… …
331 aio_unlink $path if $delete; 362 aio_unlink $path if $delete;
332 } 363 }
333 } 364 }
334 365
335 sub process_arc { 366 sub process_arc {
336 while (@arc) { 367 while (my $job = $c_arc->get) {
337 my ($dir, $file) = @{pop @arc}; 368 my ($dir, $file) = @$job;
338 369
339 my $arc; 370 my $arc;
340 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 :/
341 372
342 my $arc = read_arch "$dir/$file"; 373 my $arc = read_arch "$dir/$file";
… …
394 facings => $facings, 425 facings => $facings,
395 frames => \@frames, 426 frames => \@frames,
396 }; 427 };
397 } 428 }
398 429
399 for my $face ($o->{face} || (), @{$anim || []}) { 430 for ($o->{face} || (), @{$anim || []}) {
400 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 431 next if /^facings\s/;
401 432
433 my $face = $_;
434 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
435
402 my $info = $FACEINFO{$face} ||= {}; 436 my $info = $FACEINFO{$face} ||= { };
437 $info->{arc} = $o;
438
439 next if $face =~ /^blank.x11$|^empty.x11$/;
403 440
404 $info->{visibility} = $visibility if defined $visibility; 441 $info->{visibility} = $visibility if defined $visibility;
405 $info->{magicmap} = $magicmap if defined $magicmap; 442 $info->{magicmap} = $magicmap if defined $magicmap;
406 } 443 }
407 444
408 if (my $smooth = delete $o->{smoothface}) { 445 if (my $smooth = delete $o->{smoothface}) {
409 my %kv =split /\s+/, $smooth; 446 my %kv = split /\s+/, $smooth;
410 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 447 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
411 while (my ($face, $smooth) = each %kv) { 448 while (my ($face, $smooth) = each %kv) {
449 $FACEINFO{$smooth}{arc} = $o;
450
412 $FACEINFO{$face}{smooth} = $smooth; 451 $FACEINFO{$face}{smooth} = $smooth;
413 $FACEINFO{$face}{smoothlevel} = $level; 452 $FACEINFO{$face}{smoothlevel} = $level;
414 } 453 }
415 } 454 }
416 } 455 }
417 } 456 }
418 } 457 }
419 } 458 }
420 459
421 sub process_trs { 460 sub process_trs {
422 while (@trs) { 461 while (my $job = $c_trs->get) {
423 my ($dir, $file) = @{pop @trs}; 462 my ($dir, $file) = @$job;
424 my $path = "$dir/$file"; 463 my $path = "$dir/$file";
425 464
426 my $trs; 465 my $trs;
427 if (0 > aio_load $path, $trs) { 466 if (0 > aio_load $path, $trs) {
428 warn "$path: $!, skipping.\n"; 467 warn "$path: $!, skipping.\n";
… …
450 489
451 $FILECACHE{$_[0]} 490 $FILECACHE{$_[0]}
452 } 491 }
453 492
454 sub process_res { 493 sub process_res {
455 while (@res) { 494 while (my $job = $c_res->get) {
456 my ($dir, $file, $type) = @{pop @res}; 495 my ($dir, $file, $type) = @$job;
457 496
458 my $data; 497 my $data;
459 aio_load "$dir/$file", $data; 498 aio_load "$dir/$file", $data;
460 499
461 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 };
… …
470 if ($meta->{license} =~ s/^#//) { 509 if ($meta->{license} =~ s/^#//) {
471 $meta->{license} = ({ 510 $meta->{license} = ({
472 "pd" => "Public Domain", 511 "pd" => "Public Domain",
473 "gpl" => "GNU General Public License, version 3.0 or any later", 512 "gpl" => "GNU General Public License, version 3.0 or any later",
474 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 513 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
475 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/", 514 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
476 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 515 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
477 })->{$meta->{license}} 516 })->{$meta->{license}}
478 || warn "$dir/$file: license tag '$meta->{license}' not found."; 517 || warn "$dir/$file: license tag '$meta->{license}' not found.";
479 } 518 }
480 519
… …
484 substr $dir, 0, 1 + length $PATH, ""; 523 substr $dir, 0, 1 + length $PATH, "";
485 524
486 $RESOURCE{"$dir/$file"} = { 525 $RESOURCE{"$dir/$file"} = {
487 type => (delete $meta->{type}) || $type, 526 type => (delete $meta->{type}) || $type,
488 data => $data, 527 data => $data,
489 chksum => (Digest::MD5::md5 $data),
490 %$meta ? (meta => $meta) : (), 528 %$meta ? (meta => $meta) : (),
491 }; 529 };
492 } 530 }
493 } 531 }
494 532
… …
506 my $dir = $path; 544 my $dir = $path;
507 substr $dir, 0, 1 + length $PATH, ""; 545 substr $dir, 0, 1 + length $PATH, "";
508 546
509 for my $file (@$nondirs) { 547 for my $file (@$nondirs) {
510 if ($dir =~ /^music(?:\/|$)/) { 548 if ($dir =~ /^music(?:\/|$)/) {
511 push @res, [$path, $file, 3] # FT_MUSIC 549 $c_res->put ([$path, $file, 3]) # FT_MUSIC
512 if $file =~ /\.(ogg)$/; 550 if $file =~ /\.(ogg)$/;
513 551
514 } elsif ($dir =~ /^sound(?:\/|$)/) { 552 } elsif ($dir =~ /^sound(?:\/|$)/) {
515 push @res, [$path, $file, 5] # FT_SOUND 553 $c_res->put ([$path, $file, 5]) # FT_SOUND
516 if $file =~ /\.(wav|ogg)$/; 554 if $file =~ /\.(wav|ogg)$/;
517 555
518 } elsif ($dir =~ /^res(?:\/|$)/) { 556 } elsif ($dir =~ /^res(?:\/|$)/) {
519 push @res, [$path, $file, 0] # FT_FACE 557 $c_res->put ([$path, $file, 0]) # FT_FACE
520 if $file =~ /\.(jpg|png)$/; 558 if $file =~ /\.(jpg|png)$/;
521 push @res, [$path, $file, 7] # FT_RSRC 559 $c_res->put ([$path, $file, 7]) # FT_RSRC
522 if $file =~ /\.(res)$/; 560 if $file =~ /\.(res)$/;
523 561
524 } elsif ($file =~ /\.png$/) { 562 } elsif ($file =~ /\.png$/) {
525 push @png, ["$path/$file", 0]; 563 push @c_png, ["$path/$file", 0];
526 564
527 } elsif ($file =~ /\.trs$/) { 565 } elsif ($file =~ /\.trs$/) {
528 push @trs, [$path, $file]; 566 $c_trs->put ([$path, $file]);
529 567
530 } elsif ($file =~ /\.arc$/) { 568 } elsif ($file =~ /\.arc$/) {
531 push @arc, [$path, $file]; 569 $c_arc->put ([$path, $file]);
532 570
533 } else { 571 } else {
534 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 572 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
535 } 573 }
536 } 574 }
… …
555 if (!-d "$path/treasures") { 593 if (!-d "$path/treasures") {
556 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";
557 exit 1 unless $FORCE; 595 exit 1 unless $FORCE;
558 } 596 }
559 597
598 print "scanning files...\n" if $VERBOSE;
599
560 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
561 IO::AIO::flush; 606 IO::AIO::flush;
562 607
563 $_->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
564 # four png crunchers work fine for my 2x smp machine 618 # four png crunchers work fine for my 2x smp machine
565 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 619 my @a_png = map +(async \&process_png), 1..4;
566 (async \&process_trs), (async \&process_trs),
567 (async \&process_arc), (async \&process_arc),
568 (async \&process_res), (async \&process_res),
569 );
570 620
621 $_->join for (@a_trs, @a_res, @a_png);
622
623 print "scanning done, processing results...\n" if $VERBOSE;
571 { 624 {
572 # remove path prefix from editor_folder 625 # remove path prefix from editor_folder
573 substr $_->{editor_folder}, 0, 1 + length $path, "" 626 substr $_->{editor_folder}, 0, 1 + length $path, ""
574 for values %ARC; 627 for values %ARC;
575 628
629 print "resolving inheritance tree...\n" if $VERBOSE;
576 # resolve inherit 630 # resolve inherit
577 while () { 631 while () {
578 my $progress; 632 my $progress;
579 my $loop; 633 my $loop;
580 634
… …
606 } 660 }
607 661
608 # 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
609 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 663 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
610 664
665 print "writing archetypes...\n" if $VERBOSE;
611 open my $fh, ">:utf8", "$DATADIR/archetypes~" 666 open my $fh, ">:utf8", "$DATADIR/archetypes~"
612 or die "$DATADIR/archetypes~: $!"; 667 or die "$DATADIR/archetypes~: $!";
613 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];
614 } 669 }
615 670
616 { 671 {
672 print "writing treasures...\n" if $VERBOSE;
617 open my $fh, ">:utf8", "$DATADIR/treasures~" 673 open my $fh, ">:utf8", "$DATADIR/treasures~"
618 or die "$DATADIR/treasures~: $!"; 674 or die "$DATADIR/treasures~: $!";
619 print $fh $TRS; 675 print $fh $TRS;
620 } 676 }
621 677
622 { 678 {
679 print "processing facedata...\n" if $VERBOSE;
623 while (my ($k, $v) = each %FACEINFO) { 680 while (my ($k, $v) = each %FACEINFO) {
624 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";
625 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";
626 683
627 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";
628 #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";
629 686
630 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
631 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
632
633 if (my $magicmap = $v->{magicmap}) { 687 if (my $magicmap = $v->{magicmap}) {
634 $magicmap =~ y/A-Z_\-/a-z/d; 688 $magicmap =~ y/A-Z_\-/a-z/d;
635 $v->{magicmap} = $COLOR{$magicmap}; 689 $v->{magicmap} = $COLOR{$magicmap};
636 } 690 }
637 }
638 691
692 delete $v->{arc};
693 }
694
695 print "writing facedata...\n" if $VERBOSE;
639 open my $fh, ">:perlio", "$DATADIR/facedata~" 696 open my $fh, ">:perlio", "$DATADIR/facedata~"
640 or die "$DATADIR/facedata~: $!"; 697 or die "$DATADIR/facedata~: $!";
641 698
642 print $fh freeze { 699 print $fh freeze {
643 version => 2, 700 version => 2,
644 faceinfo => \%FACEINFO, 701 faceinfo => \%FACEINFO,
645 animinfo => \%ANIMINFO, 702 animinfo => \%ANIMINFO,
646 resource => \%RESOURCE, 703 resource => \%RESOURCE,
647 }; 704 };
648 } 705 }
706
707 print "committing files...\n" if $VERBOSE;
649 708
650 for (qw(archetypes facedata treasures)) { 709 for (qw(archetypes facedata treasures)) {
651 chmod 0644, "$DATADIR/$_~"; 710 chmod 0644, "$DATADIR/$_~";
652 rename "$DATADIR/$_~", "$DATADIR/$_" 711 rename "$DATADIR/$_~", "$DATADIR/$_"
653 or die "$DATADIR/$_: $!"; 712 or die "$DATADIR/$_: $!";

Diff Legend

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