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.23 by root, Tue Apr 10 09:35:24 2007 UTC vs.
Revision 1.32 by root, Thu Apr 26 00:41:32 2007 UTC

… …
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@";
14 15
15use Getopt::Long; 16use Getopt::Long;
16use Coro::Event; 17use Coro::Event;
17use AnyEvent; 18use AnyEvent;
18use IO::AIO (); 19use IO::AIO ();
… …
20use Crossfire; 21use Crossfire;
21use Coro; 22use Coro;
22use Coro::AIO; 23use Coro::AIO;
23use POSIX (); 24use POSIX ();
24use Digest::MD5; 25use Digest::MD5;
25use Storable; $Storable::canonical = 1; 26use Coro::Storable; $Storable::canonical = 1;
26 27
27sub usage { 28sub usage {
28 warn <<EOF; 29 warn <<EOF;
29Usage: cfutil [-v] [-q] [--force] [--cache] 30Usage: cfutil [-v] [-q] [--force] [--cache]
30 [--install-arch path] 31 [--install-arch path]
… …
68} 69}
69 70
70sub inst_maps($) { 71sub inst_maps($) {
71 my (undef, $path) = @_; 72 my (undef, $path) = @_;
72 73
73 print "installing '$path' to '$DATADIR/maps'\n"; 74 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
74 75
75 if (!-f "$path/regions") { 76 if (!-f "$path/regions") {
76 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 77 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
77 exit 1 unless $FORCE; 78 exit 1 unless $FORCE;
78 } 79 }
… …
82 83
83 print "maps installed successfully.\n"; 84 print "maps installed successfully.\n";
84} 85}
85 86
86{ 87{
88 our %ANIMINFO;
87 our %FACEINFO; 89 our %FACEINFO;
88 our @ARC; 90 our @ARC;
91 our %ARC;
89 our $TRS; 92 our $TRS;
90 our $NFILE; 93 our $NFILE;
91 our %ANIM;
92 94
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 95 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94 96
95 our (@png, @trs, @arc); # files we are interested in 97 our (@png, @trs, @arc); # files we are interested in
96 98
… …
153 fork_sub { 155 fork_sub {
154 system "convert png:\Q$path\E -depth 8 rgba:-" 156 system "convert png:\Q$path\E -depth 8 rgba:-"
155 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 157 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
156 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 158 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
157 and die "convert/hq2xa pipeline error: status $? ($!)"; 159 and die "convert/hq2xa pipeline error: status $? ($!)";
158 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 160 system $OPTIPNG, "-i0", "-q", "$other~";
159 die "$other~ has zero size, aborting." unless -s "$other~"; 161 die "$other~ has zero size, aborting." unless -s "$other~";
160 rename "$other~", $other; 162 rename "$other~", $other;
161 }; 163 };
162 } 164 }
163 165
… …
169 my $other = "$stem.32x32.png~"; 171 my $other = "$stem.32x32.png~";
170 172
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 173 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 fork_sub { 174 fork_sub {
173 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 175 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
174 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 176 system $OPTIPNG, "-i0", "-q", "$other~";
177
178 # reduce smoothfaces >10000 bytes
179 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
180 my $ncolor = 256;
181 while () {
182 system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E";
183 system $OPTIPNG, "-i0", "-q", "$other~~";
184 last if 10000 > -s "$other~~";
185 $ncolor = int $ncolor * 0.9;
186 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
187 }
188
189 printf "reduced %s from %d to %d bytes using %d colours.\n",
190 $other, -s "$other~", -s "$other~~", $ncolor
191 if $VERBOSE >= 2;
192 rename "$other~~", "$other~";
193 }
194
175 die "$other~ has zero size, aborting." unless -s "$other~"; 195 die "$other~ has zero size, aborting." unless -s "$other~";
176 rename "$other~", $other; 196 rename "$other~", $other;
177 }; 197 };
178 } 198 }
179 199
… …
256 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 276 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
257 277
258 my $arc = read_arch "$dir/$file"; 278 my $arc = read_arch "$dir/$file";
259 for my $o (values %$arc) { 279 for my $o (values %$arc) {
260 push @ARC, $o; 280 push @ARC, $o;
281 for (my $m = $o; $m; $m = $m->{more}) {
282 $ARC{$m->{_name}} = $m;
283 }
261 284
262 $o->{editor_folder} = $dir; 285 $o->{editor_folder} = $dir;
263 286
264 my $visibility = delete $o->{visibility}; 287 my $visibility = delete $o->{visibility};
265 my $magicmap = delete $o->{magicmap}; 288 my $magicmap = delete $o->{magicmap};
… …
276 my $x = $o->{x} - $dx; 299 my $x = $o->{x} - $dx;
277 my $y = $o->{y} - $dy; 300 my $y = $o->{y} - $dy;
278 301
279 my $ext = $x|$y ? "+$x+$y" : ""; 302 my $ext = $x|$y ? "+$x+$y" : "";
280 303
281 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; 304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
282 305
283 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 306 my $visibility = delete $o->{visibility} if exists $o->{visibility};
284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
285 308
286 my $anim = delete $o->{anim}; 309 my $anim = delete $o->{anim};
287 310
288 if ($anim) { 311 if ($anim) {
312 # possibly add $ext to the animation name to avoid
313 # the need to specify archnames for all parts
314 # of a multipart archetype.
289 $o->{animation} = "$o->{_name}"; 315 $o->{animation} = "$o->{_name}";
316 my $facings = 1;
317 my @frames;
290 318
291 for (@$anim) { 319 for (@$anim) {
292 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 320 if (/^facings\s+(\d+)/) {
321 $facings = $1*1;
322 } elsif (/^blank.x11$|^empty.x11$/) {
323 push @frames, $_;
324 } else {
325 push @frames, "$_$ext";
326 }
293 } 327 }
294 328
295 $ANIM{"$o->{_name}$ext"} = 329 $ANIMINFO{$o->{animation}} = {
296 join "", map "$_\n", 330 facings => $facings,
297 "anim $o->{_name}", 331 frames => \@frames,
298 @$anim, 332 };
299 "mina";
300 } 333 }
301 334
302 for my $face ($o->{face} || (), @{$anim || []}) { 335 for my $face ($o->{face} || (), @{$anim || []}) {
303 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 336 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
304 337
… …
362 } 395 }
363 396
364 sub inst_arch($) { 397 sub inst_arch($) {
365 my (undef, $path) = @_; 398 my (undef, $path) = @_;
366 399
400 print "\n",
367 print "installing '$path' to '$DATADIR'\n", 401 "Installing '$path' to '$DATADIR'\n",
402 "\n",
368 "(this can take a long time if you run this\n", 403 "This can take a long time if you run this\n",
369 "for the first time or do not use --cache).\n"; 404 "for the first time or do not use --cache.\n",
405 "\n",
406 "Unless you run verbosely, all following warning\n",
407 "or error messages indicate serious problems.\n",
408 "\n";
370 409
371 if (!-d "$path/treasures") { 410 if (!-d "$path/treasures") {
372 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 411 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
373 exit 1 unless $FORCE; 412 exit 1 unless $FORCE;
374 } 413 }
… …
382 (async \&process_trs), (async \&process_trs), 421 (async \&process_trs), (async \&process_trs),
383 (async \&process_arc), (async \&process_arc), 422 (async \&process_arc), (async \&process_arc),
384 ); 423 );
385 424
386 { 425 {
387 open my $fh, ">:utf8", "$DATADIR/animations~" 426 # remove path prefix from editor_folder
388 or die "$DATADIR/animations~: $!"; 427 substr $_->{editor_folder}, 0, 1 + length $path, ""
389 print $fh join "", map $ANIM{$_}, sort keys %ANIM 428 for values %ARC;
429
430 # resolve inherit
431 while () {
432 my $progress;
433 my $loop;
434
435 for my $o (values %ARC) {
436 if (my $other = $o->{inherit}) {
437 if (my $s = $ARC{$other}) {
438 if ($s->{inherit}) {
439 $loop = $s;
440 } else {
441 delete $o->{inherit};
442 my %s = %$s;
443 delete @s{qw(_name more name name_pl)};
444 %$o = ( %s, %$o );
445 ++$progress;
446 }
447 } else {
448 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
449 delete $ARC{$o->{_name}};
450 }
451 }
452 }
453
454 unless ($progress) {
455 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
456 if $loop;
457
458 last;
459 }
390 } 460 }
391 461
392 {
393 open my $fh, ">:utf8", "$DATADIR/archetypes~" 462 open my $fh, ">:utf8", "$DATADIR/archetypes~"
394 or die "$DATADIR/archetypes~: $!"; 463 or die "$DATADIR/archetypes~: $!";
395 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 464 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
396 print $fh Crossfire::archlist_to_string \@ARC;
397 } 465 }
398 466
399 { 467 {
400 open my $fh, ">:utf8", "$DATADIR/treasures~" 468 open my $fh, ">:utf8", "$DATADIR/treasures~"
401 or die "$DATADIR/treasures~: $!"; 469 or die "$DATADIR/treasures~: $!";
… …
415 } 483 }
416 484
417 open my $fh, ">:perlio", "$DATADIR/facedata~" 485 open my $fh, ">:perlio", "$DATADIR/facedata~"
418 or die "$DATADIR/facedata~: $!"; 486 or die "$DATADIR/facedata~: $!";
419 487
420 $FACEINFO{""} = { version => 1}; 488 print $fh freeze {
421 print $fh Storable::nfreeze \%FACEINFO; 489 version => 2,
490 faceinfo => \%FACEINFO,
491 animinfo => \%ANIMINFO,
422 } 492 };
493 }
423 494
424 for (qw(archetypes facedata animations treasures)) { 495 for (qw(archetypes facedata treasures)) {
425 chmod 0644, "$DATADIR/$_~"; 496 chmod 0644, "$DATADIR/$_~";
426 rename "$DATADIR/$_~", "$DATADIR/$_" 497 rename "$DATADIR/$_~", "$DATADIR/$_"
427 or die "$DATADIR/$_: $!"; 498 or die "$DATADIR/$_: $!";
428 } 499 }
429 500

Diff Legend

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