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.54 by root, Sun Aug 19 10:28:52 2007 UTC

… …
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util; 24use Coro::Util;
25use POSIX (); 25use POSIX ();
26use Digest::MD5; 26use Digest::MD5;
27use Carp; 27use Carp;
28use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
29 30
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 32
32sub usage { 33sub usage {
… …
114 our $NFILE; 115 our $NFILE;
115 our $PATH; 116 our $PATH;
116 117
117 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
118 119
119 our (@png, @trs, @arc, @res); # files we are interested in 120 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123
124 our @c_png;
120 125
121 sub commit_png($$$) { 126 sub commit_png($$$) {
122 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
123 128
124 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
125 } 130 }
126 131
127 sub process_png { 132 sub process_png {
128 while (@png) { 133 while (@c_png) {
129 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
130 135
131 my $png; 136 my $png;
132 aio_lstat $path; 137 aio_lstat $path;
133 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
134 139
… …
165 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
166 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
167 next; 172 next;
168 } 173 }
169 174
175 (my $base = $stem) =~ s/^.*\///;
176
177 my $fi = $FACEINFO{$base};
178 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next;
181 }
182
183 my $arc = $FACEINFO{$base}{arc}
184 or die "FATAL: internal error, cannot continue";
185
170 unless ($path =~ /~$/) { 186 unless ($path =~ /~$/) {
171 # possibly enlarge 187 # possibly enlarge
172 if (0 > aio_stat "$stem.64x64.png") { 188 if (0 > aio_stat "$stem.64x64.png") {
173 my $other = "$stem.64x64.png~"; 189 my $other = "$stem.64x64.png~";
174 190
175 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
176 fork_sub { 192 fork_sub {
177 my $CROP; 193 my $CROP;
178 my $SRC = "png:\Q$path\E"; 194 my $SRC = "png:\Q$path\E";
179 195
180 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 196 my $is_floor = $arc->{is_floor};
197 my $is_wall = 0;
198
199 my ($wall_pfx, $wall_dir, $wall_sfx);
200
201 if (
202 !$is_floor
203 && !$arc->{alive}
204 && $arc->{no_pass}
181 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) {
182 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
183 #check for 0..F images to be sure(?) this is a wall 208
184 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
210 $is_wall = 1;
211 }
212 }
213
214 if ($is_wall || $is_floor) {
185 # add a 4px border and add other images around it 215 # add a 4px border and add other images around it
186 $CROP = "-shave 8x8 +repage"; 216 $CROP = "-shave 8x8 +repage";
187 217
188 $w += 8; 218 $w += 8;
189 $h += 8; 219 $h += 8;
190 220
191 $SRC = "-size ${w}x${h} xc:transparent"; 221 $SRC = "-size ${w}x${h} xc:transparent";
192 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 222 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
193 223
194 # 8 surrounding images 224 # 8 surrounding images
195 for ( 225 for (
196 # x y b r0 r1 226 # x y b r0 r1
197 [-1, -1, 0, 6], 227 [-1, -1, 0, 6],
198 [ 0, -1, 1, 10, 14], 228 [ 0, -1, 1, 10, 14],
199 [+1, -1, 0, 12], 229 [+1, -1, 0, 12],
200 230
201 [-1, 0, 8, 5, 7], 231 [-1, 0, 8, 5, 7],
202 # 232 #
203 [+1, 0, 2, 5, 13], 233 [+1, 0, 2, 5, 13],
204 234
205 [-1, +1, 0, 3], 235 [-1, +1, 0, 3],
206 [ 0, +1, 4, 10, 11], 236 [ 0, +1, 4, 10, 11],
207 [+1, +1, 0, 9], 237 [+1, +1, 0, 9],
208 ) { 238 ) {
209 my ($x, $y, $d, $r0, $r1) = @$_; 239 my ($x, $y, $d, $r0, $r1) = @$_;
240
241 my $tile = $is_floor ? $path
242 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
243 : die;
244
210 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 245 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
211 "\Q$pfx", 246 "\Q$tile",
212 ($dir & $d) ? $r1 : $r0,
213 "\Q$sfx",
214 $x * ($w - 8) + 4, 247 $x * ($w - 8) + 4,
215 $y * ($h - 8) + 4; 248 $y * ($h - 8) + 4;
216 }
217 } 249 }
218 } 250 }
219 251
220 system "convert -depth 8 $SRC rgba:-" 252 system "convert -depth 8 $SRC rgba:-"
221 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 253 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
… …
225 die "$other~ has zero size, aborting." unless -s "$other~"; 257 die "$other~ has zero size, aborting." unless -s "$other~";
226 rename "$other~", $other; 258 rename "$other~", $other;
227 }; 259 };
228 } 260 }
229 261
230 push @png, [$other, !$CACHE]; 262 push @c_png, [$other, !$CACHE];
231 } 263 }
232 264
233 # possibly scale down 265 # possibly scale down
234 if (0 > aio_stat "$stem.32x32.png") { 266 if (0 > aio_stat "$stem.32x32.png") {
235 my $other = "$stem.32x32.png~"; 267 my $other = "$stem.32x32.png~";
… …
260 rename "$other~", $other; 292 rename "$other~", $other;
261 }; 293 };
262 } 294 }
263 295
264 #warn "scaled down $path to $other\n";#d# 296 #warn "scaled down $path to $other\n";#d#
265 push @png, [$other, !$CACHE]; 297 push @c_png, [$other, !$CACHE];
266 } 298 }
267 } 299 }
268 300
269 (my $face = $stem) =~ s/^.*\///; 301 (my $face = $stem) =~ s/^.*\///;
270 302
… …
331 aio_unlink $path if $delete; 363 aio_unlink $path if $delete;
332 } 364 }
333 } 365 }
334 366
335 sub process_arc { 367 sub process_arc {
336 while (@arc) { 368 while (my $job = $c_arc->get) {
337 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
338 370
339 my $arc; 371 my $arc;
340 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 372 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
341 373
342 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
… …
399 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
400 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
401 433
402 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= {};
403 435
436 $info->{arc} = $o;
404 $info->{visibility} = $visibility if defined $visibility; 437 $info->{visibility} = $visibility if defined $visibility;
405 $info->{magicmap} = $magicmap if defined $magicmap; 438 $info->{magicmap} = $magicmap if defined $magicmap;
406 } 439 }
407 440
408 if (my $smooth = delete $o->{smoothface}) { 441 if (my $smooth = delete $o->{smoothface}) {
409 my %kv =split /\s+/, $smooth; 442 my %kv = split /\s+/, $smooth;
410 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 443 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
411 while (my ($face, $smooth) = each %kv) { 444 while (my ($face, $smooth) = each %kv) {
445 $FACEINFO{$smooth}{arc} = $o;
446
412 $FACEINFO{$face}{smooth} = $smooth; 447 $FACEINFO{$face}{smooth} = $smooth;
413 $FACEINFO{$face}{smoothlevel} = $level; 448 $FACEINFO{$face}{smoothlevel} = $level;
414 } 449 }
415 } 450 }
416 } 451 }
417 } 452 }
418 } 453 }
419 } 454 }
420 455
421 sub process_trs { 456 sub process_trs {
422 while (@trs) { 457 while (my $job = $c_trs->get) {
423 my ($dir, $file) = @{pop @trs}; 458 my ($dir, $file) = @$job;
424 my $path = "$dir/$file"; 459 my $path = "$dir/$file";
425 460
426 my $trs; 461 my $trs;
427 if (0 > aio_load $path, $trs) { 462 if (0 > aio_load $path, $trs) {
428 warn "$path: $!, skipping.\n"; 463 warn "$path: $!, skipping.\n";
… …
450 485
451 $FILECACHE{$_[0]} 486 $FILECACHE{$_[0]}
452 } 487 }
453 488
454 sub process_res { 489 sub process_res {
455 while (@res) { 490 while (my $job = $c_res->get) {
456 my ($dir, $file, $type) = @{pop @res}; 491 my ($dir, $file, $type) = @$job;
457 492
458 my $data; 493 my $data;
459 aio_load "$dir/$file", $data; 494 aio_load "$dir/$file", $data;
460 495
461 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 496 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
… …
470 if ($meta->{license} =~ s/^#//) { 505 if ($meta->{license} =~ s/^#//) {
471 $meta->{license} = ({ 506 $meta->{license} = ({
472 "pd" => "Public Domain", 507 "pd" => "Public Domain",
473 "gpl" => "GNU General Public License, version 3.0 or any later", 508 "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/", 509 "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/", 510 "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/", 511 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
477 })->{$meta->{license}} 512 })->{$meta->{license}}
478 || warn "$dir/$file: license tag '$meta->{license}' not found."; 513 || warn "$dir/$file: license tag '$meta->{license}' not found.";
479 } 514 }
480 515
… …
506 my $dir = $path; 541 my $dir = $path;
507 substr $dir, 0, 1 + length $PATH, ""; 542 substr $dir, 0, 1 + length $PATH, "";
508 543
509 for my $file (@$nondirs) { 544 for my $file (@$nondirs) {
510 if ($dir =~ /^music(?:\/|$)/) { 545 if ($dir =~ /^music(?:\/|$)/) {
511 push @res, [$path, $file, 3] # FT_MUSIC 546 $c_res->put ([$path, $file, 3]) # FT_MUSIC
512 if $file =~ /\.(ogg)$/; 547 if $file =~ /\.(ogg)$/;
513 548
514 } elsif ($dir =~ /^sound(?:\/|$)/) { 549 } elsif ($dir =~ /^sound(?:\/|$)/) {
515 push @res, [$path, $file, 5] # FT_SOUND 550 $c_res->put ([$path, $file, 5]) # FT_SOUND
516 if $file =~ /\.(wav|ogg)$/; 551 if $file =~ /\.(wav|ogg)$/;
517 552
518 } elsif ($dir =~ /^res(?:\/|$)/) { 553 } elsif ($dir =~ /^res(?:\/|$)/) {
519 push @res, [$path, $file, 0] # FT_FACE 554 $c_res->put ([$path, $file, 0]) # FT_FACE
520 if $file =~ /\.(jpg|png)$/; 555 if $file =~ /\.(jpg|png)$/;
521 push @res, [$path, $file, 7] # FT_RSRC 556 $c_res->put ([$path, $file, 7]) # FT_RSRC
522 if $file =~ /\.(res)$/; 557 if $file =~ /\.(res)$/;
523 558
524 } elsif ($file =~ /\.png$/) { 559 } elsif ($file =~ /\.png$/) {
525 push @png, ["$path/$file", 0]; 560 push @c_png, ["$path/$file", 0];
526 561
527 } elsif ($file =~ /\.trs$/) { 562 } elsif ($file =~ /\.trs$/) {
528 push @trs, [$path, $file]; 563 $c_trs->put ([$path, $file]);
529 564
530 } elsif ($file =~ /\.arc$/) { 565 } elsif ($file =~ /\.arc$/) {
531 push @arc, [$path, $file]; 566 $c_arc->put ([$path, $file]);
532 567
533 } else { 568 } else {
534 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 569 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
535 } 570 }
536 } 571 }
… …
555 if (!-d "$path/treasures") { 590 if (!-d "$path/treasures") {
556 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 591 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
557 exit 1 unless $FORCE; 592 exit 1 unless $FORCE;
558 } 593 }
559 594
595 print "scanning files...\n" if $VERBOSE;
596
560 find_files $path; 597 find_files $path;
598
599 my @a_arc = map +(async \&process_arc), 1..2;
600 my @a_res = map +(async \&process_res), 1..2;
601 my @a_trs = map +(async \&process_trs), 1..2;
602
561 IO::AIO::flush; 603 IO::AIO::flush;
562 604
563 $_->join for ( 605 $c_res->put (undef) for @a_res;
606 $c_arc->put (undef) for @a_arc;
607 $c_trs->put (undef) for @a_trs;
608
609 print "start file scan, arc, res processing...\n" if $VERBOSE;
610
611 $_->join for @a_arc; # need to parse all archetypes before png processing
612
613 print "end arc, start png processing...\n" if $VERBOSE;
614
564 # four png crunchers work fine for my 2x smp machine 615 # four png crunchers work fine for my 2x smp machine
565 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 616 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 617
618 $_->join for (@a_trs, @a_res, @a_png);
619
620 print "scanning done, processing results...\n" if $VERBOSE;
571 { 621 {
572 # remove path prefix from editor_folder 622 # remove path prefix from editor_folder
573 substr $_->{editor_folder}, 0, 1 + length $path, "" 623 substr $_->{editor_folder}, 0, 1 + length $path, ""
574 for values %ARC; 624 for values %ARC;
575 625
626 print "resolving inheritance tree...\n" if $VERBOSE;
576 # resolve inherit 627 # resolve inherit
577 while () { 628 while () {
578 my $progress; 629 my $progress;
579 my $loop; 630 my $loop;
580 631
… …
606 } 657 }
607 658
608 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
609 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
610 661
662 print "writing archetypes...\n" if $VERBOSE;
611 open my $fh, ">:utf8", "$DATADIR/archetypes~" 663 open my $fh, ">:utf8", "$DATADIR/archetypes~"
612 or die "$DATADIR/archetypes~: $!"; 664 or die "$DATADIR/archetypes~: $!";
613 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
614 } 666 }
615 667
616 { 668 {
669 print "writing treasures...\n" if $VERBOSE;
617 open my $fh, ">:utf8", "$DATADIR/treasures~" 670 open my $fh, ">:utf8", "$DATADIR/treasures~"
618 or die "$DATADIR/treasures~: $!"; 671 or die "$DATADIR/treasures~: $!";
619 print $fh $TRS; 672 print $fh $TRS;
620 } 673 }
621 674
622 { 675 {
676 print "processing facedata...\n" if $VERBOSE;
623 while (my ($k, $v) = each %FACEINFO) { 677 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"; 678 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"; 679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
626 680
627 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
… …
632 686
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