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.22 by root, Thu Apr 5 13:50:49 2007 UTC vs.
Revision 1.25 by root, Fri Apr 13 05:08:51 2007 UTC

… …
20use Crossfire; 20use Crossfire;
21use Coro; 21use Coro;
22use Coro::AIO; 22use Coro::AIO;
23use POSIX (); 23use POSIX ();
24use Digest::MD5; 24use Digest::MD5;
25use Storable; $Storable::canonical = 1; 25use Coro::Storable; $Storable::canonical = 1;
26 26
27sub usage { 27sub usage {
28 warn <<EOF; 28 warn <<EOF;
29Usage: cfutil [-v] [-q] [--force] [--cache] 29Usage: cfutil [-v] [-q] [--force] [--cache]
30 [--install-arch path] 30 [--install-arch path]
… …
82 82
83 print "maps installed successfully.\n"; 83 print "maps installed successfully.\n";
84} 84}
85 85
86{ 86{
87 our %ANIMINFO;
87 our %FACEINFO; 88 our %FACEINFO;
88 our @ARC; 89 our @ARC;
89 our $TRS; 90 our $TRS;
90 our $NFILE; 91 our $NFILE;
91 our %ANIM;
92 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94 94
95 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
96 96
… …
182 } 182 }
183 } 183 }
184 184
185 (my $face = $stem) =~ s/^.*\///; 185 (my $face = $stem) =~ s/^.*\///;
186 186
187 # split all bigfaces, but avoid smoothfaces (*_S)
187 if (($w > $T || $h > $T) && $face !~ /_S\./) { 188 if (($w > $T || $h > $T) && $face !~ /_S\./) {
188 # split 189 # split
189 my @tile; 190 my @tile;
190 for my $x (0 .. (int $w / $T) - 1) { 191 for my $x (0 .. (int $w / $T) - 1) {
191 for my $y (0 .. (int $h / $T) - 1) { 192 for my $y (0 .. (int $h / $T) - 1) {
… …
283 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
284 285
285 my $anim = delete $o->{anim}; 286 my $anim = delete $o->{anim};
286 287
287 if ($anim) { 288 if ($anim) {
289 # possibly add $ext to the animation name to avoid
290 # the need to specify archnames for all parts
291 # of a multipart archetype.
288 $o->{animation} = "$o->{_name}"; 292 $o->{animation} = "$o->{_name}";
293 my $facings = 1;
294 my @frames;
289 295
290 for (@$anim) { 296 for (@$anim) {
291 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 297 if (/^facings\s+(\d+)/) {
298 $facings = $1*1;
299 } elsif (/^blank.x11$|^empty.x11$/) {
300 push @frames, $_;
301 } else {
302 push @frames, "$_$ext";
303 }
292 } 304 }
293 305
294 $ANIM{"$o->{_name}$ext"} = 306 $ANIMINFO{$o->{animation}} = {
295 join "", map "$_\n", 307 facings => $facings,
296 "anim $o->{_name}", 308 frames => \@frames,
297 @$anim, 309 };
298 "mina";
299 } 310 }
300 311
301 for my $face ($o->{face} || (), @{$anim || []}) { 312 for my $face ($o->{face} || (), @{$anim || []}) {
302 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 313 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
303 314
… …
306 $info->{visibility} = $visibility if defined $visibility; 317 $info->{visibility} = $visibility if defined $visibility;
307 $info->{magicmap} = $magicmap if defined $magicmap; 318 $info->{magicmap} = $magicmap if defined $magicmap;
308 } 319 }
309 320
310 if (my $smooth = delete $o->{smoothface}) { 321 if (my $smooth = delete $o->{smoothface}) {
311 my ($face, $smooth) = split /\s+/, $smooth; 322 my %kv =split /\s+/, $smooth;
312 # skip empty_S.x11, it seems to server no purpose whatsoever 323 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
313 # but increases bandwidth demands and worse. 324 while (my ($face, $smooth) = each %kv) {
314 unless ($smooth eq "empty_S.x11") {
315 $FACEINFO{$face}{smooth} = $smooth; 325 $FACEINFO{$face}{smooth} = $smooth;
326 $FACEINFO{$face}{smoothlevel} = $level;
316 } 327 }
317 } 328 }
318 } 329 }
319 } 330 }
320 } 331 }
… …
381 (async \&process_trs), (async \&process_trs), 392 (async \&process_trs), (async \&process_trs),
382 (async \&process_arc), (async \&process_arc), 393 (async \&process_arc), (async \&process_arc),
383 ); 394 );
384 395
385 { 396 {
386 open my $fh, ">:utf8", "$DATADIR/animations~"
387 or die "$DATADIR/animations~: $!";
388 print $fh join "", map $ANIM{$_}, sort keys %ANIM
389 }
390
391 {
392 open my $fh, ">:utf8", "$DATADIR/archetypes~" 397 open my $fh, ">:utf8", "$DATADIR/archetypes~"
393 or die "$DATADIR/archetypes~: $!"; 398 or die "$DATADIR/archetypes~: $!";
394 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 399 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
395 print $fh Crossfire::archlist_to_string \@ARC; 400 print $fh Crossfire::archlist_to_string \@ARC;
396 } 401 }
… …
414 } 419 }
415 420
416 open my $fh, ">:perlio", "$DATADIR/facedata~" 421 open my $fh, ">:perlio", "$DATADIR/facedata~"
417 or die "$DATADIR/facedata~: $!"; 422 or die "$DATADIR/facedata~: $!";
418 423
419 $FACEINFO{""} = { version => 1}; 424 print $fh freeze {
420 print $fh Storable::nfreeze \%FACEINFO; 425 version => 2,
426 faceinfo => \%FACEINFO,
427 animinfo => \%ANIMINFO,
421 } 428 };
429 }
422 430
423 for (qw(archetypes facedata animations treasures)) { 431 for (qw(archetypes facedata treasures)) {
424 chmod 0644, "$DATADIR/$_~"; 432 chmod 0644, "$DATADIR/$_~";
425 rename "$DATADIR/$_~", "$DATADIR/$_" 433 rename "$DATADIR/$_~", "$DATADIR/$_"
426 or die "$DATADIR/$_: $!"; 434 or die "$DATADIR/$_: $!";
427 } 435 }
428 436

Diff Legend

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