--- deliantra/server/utils/cfutil.in 2007/04/01 00:36:35 1.19 +++ deliantra/server/utils/cfutil.in 2007/07/24 04:55:35 1.44 @@ -8,9 +8,10 @@ my $DATADIR = "@datadir@/@PACKAGE@"; my $CONVERT = "@CONVERT@"; -my $IDENTIFY = "@IDENTIFY@"; +#my $IDENTIFY = "@IDENTIFY@"; my $OPTIPNG = "@OPTIPNG@"; my $RSYNC = "@RSYNC@"; +my $PNGNQ = "@PNGNQ@"; use Getopt::Long; use Coro::Event; @@ -22,7 +23,10 @@ use Coro::AIO; use POSIX (); use Digest::MD5; -use Storable; $Storable::canonical = 1; +use Carp; +use Coro::Storable; $Storable::canonical = 1; + +$SIG{QUIT} = sub { Carp::cluck "QUIT" }; sub usage { warn < 0, + white => 1, + navy => 2, + red => 3, + orange => 4, + blue => 5, + darkorange => 6, + green => 7, + lightgreen => 8, + grey => 9, + brown => 10, + gold => 11, + tan => 12, +); + END { system "rm", "-rf", $TMPDIR } Event->signal (signal => "INT", cb => sub { exit 1 }); @@ -70,29 +90,32 @@ sub inst_maps($) { my (undef, $path) = @_; - print "installing '$path' to '$DATADIR/maps'\n"; + print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; if (!-f "$path/regions") { warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; exit 1 unless $FORCE; } - system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" + system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" and die "map installation failed.\n"; print "maps installed successfully.\n"; } { + our %ANIMINFO; our %FACEINFO; + our %RESOURCE; our @ARC; + our %ARC; our $TRS; our $NFILE; - our %ANIM; + our $PATH; our $QUANTIZE = "+dither -colorspace RGB -colors 256"; - our (@png, @trs, @arc); # files we are interested in + our (@png, @trs, @arc, @res); # files we are interested in sub commit_png($$$) { my ($name, $data, $T) = @_; @@ -149,14 +172,13 @@ my $other = "$stem.64x64.png~"; if (0 > aio_lstat $other or (-M _) > (-M $path)) { - warn "rescale $other\n";#d# my $wrap = 0; # for the time being fork_sub { system "convert png:\Q$path\E -depth 8 rgba:-" . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" and die "convert/hq2xa pipeline error: status $? ($!)"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + system $OPTIPNG, "-i0", "-q", "$other~"; die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; @@ -172,20 +194,38 @@ if (0 > aio_lstat $other or (-M _) > (-M $path)) { fork_sub { system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + system $OPTIPNG, "-i0", "-q", "$other~"; + + # reduce smoothfaces >10000 bytes + if ($stem =~ /_S\./ && (-s "$other~") > 10000) { + my $ncolor = 256; + while () { + system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; + system $OPTIPNG, "-i0", "-q", "$other~~"; + last if 10000 > -s "$other~~"; + $ncolor = int $ncolor * 0.9; + $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; + } + + printf "reduced %s from %d to %d bytes using %d colours.\n", + $other, -s "$other~", -s "$other~~", $ncolor + if $VERBOSE >= 2; + rename "$other~~", "$other~"; + } + die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; } - warn "scaled down $path to $other\n";#d# - + #warn "scaled down $path to $other\n";#d# push @png, [$other, !$CACHE]; } } (my $face = $stem) =~ s/^.*\///; + # split all bigfaces, but avoid smoothfaces (*_S) if (($w > $T || $h > $T) && $face !~ /_S\./) { # split my @tile; @@ -259,6 +299,9 @@ my $arc = read_arch "$dir/$file"; for my $o (values %$arc) { push @ARC, $o; + for (my $m = $o; $m; $m = $m->{more}) { + $ARC{$m->{_name}} = $m; + } $o->{editor_folder} = $dir; @@ -279,25 +322,35 @@ my $ext = $x|$y ? "+$x+$y" : ""; - $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; + $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; - my $visibility = delete $o->{visibility} if exists $o->{visibility}; - my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; + $visibility = delete $o->{visibility} if exists $o->{visibility}; + $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; my $anim = delete $o->{anim}; if ($anim) { + # possibly add $ext to the animation name to avoid + # the need to specify archnames for all parts + # of a multipart archetype. $o->{animation} = "$o->{_name}"; + my $facings = 1; + my @frames; for (@$anim) { - $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; + if (/^facings\s+(\d+)/) { + $facings = $1*1; + } elsif (/^blank.x11$|^empty.x11$/) { + push @frames, $_; + } else { + push @frames, "$_$ext"; + } } - $ANIM{"$o->{_name}$ext"} = - join "", map "$_\n", - "anim $o->{_name}", - @$anim, - "mina"; + $ANIMINFO{$o->{animation}} = { + facings => $facings, + frames => \@frames, + }; } for my $face ($o->{face} || (), @{$anim || []}) { @@ -310,11 +363,11 @@ } if (my $smooth = delete $o->{smoothface}) { - my ($face, $smooth) = split /\s+/, $smooth; - # skip empty_S.x11, it seems to server no purpose whatsoever - # but increases bandwidth demands and worse. - unless ($smooth eq "empty_S.x11") { - $FACEINFO{$face}{smooth} = $smooth; + my %kv =split /\s+/, $smooth; + my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support + while (my ($face, $smooth) = each %kv) { + $FACEINFO{$face}{smooth} = $smooth; + $FACEINFO{$face}{smoothlevel} = $level; } } } @@ -337,6 +390,31 @@ } } + sub process_res { + while (@res) { + my ($dir, $file, $type) = @{pop @res}; + + my $data; + aio_load "$dir/$file", $data; + + my $copyright; + aio_load "$dir/copyright", $copyright; + + $file =~ s/\.res$//; + $file =~ /\.([^.]+)$/ + or next; + + substr $dir, 0, 1 + length $PATH, ""; + + $RESOURCE{"$dir/$file"} = { + type => $type, + copyright => $copyright, + data => $data, + chksum => Digest::MD5::md5 $data, + }; + } + } + sub find_files; sub find_files { my ($path) = @_; @@ -348,15 +426,35 @@ find_files "$path/$_" for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; + my $dir = $path; + substr $dir, 0, 1 + length $PATH, ""; + for my $file (@$nondirs) { - if ($file =~ /\.png$/) { + if ($dir =~ /^music(?:\/|$)/) { + push @res, [$path, $file, 3] # FT_MUSIC + if $file =~ /\.(ogg)$/; + + } elsif ($dir =~ /^sounds(?:\/|$)/) { + push @res, [$path, $file, 5] # FT_SOUND + if $file =~ /\.(wav|ogg)$/; + + } elsif ($dir =~ /^res(?:\/|$)/) { + push @res, [$path, $file, 0] # FT_FACE + if $file =~ /\.(jpg|png)$/; + push @res, [$path, $file, 7] # FT_RSRC + if $file =~ /\.(res)$/; + + } elsif ($file =~ /\.png$/) { push @png, ["$path/$file", 0]; + } elsif ($file =~ /\.trs$/) { push @trs, [$path, $file]; + } elsif ($file =~ /\.arc$/) { push @arc, [$path, $file]; + } else { - warn "ignoring $path/$file\n" if $VERBOSE >= 2; + warn "ignoring $path/$file\n" if $VERBOSE >= 3; } } }; @@ -365,9 +463,17 @@ sub inst_arch($) { my (undef, $path) = @_; - print "installing '$path' to '$DATADIR'\n", - "(this can take a long time if you run this\n", - "for the first time or do not use --cache).\n"; + $PATH = $path; + + print "\n", + "Installing '$path' to '$DATADIR'\n", + "\n", + "This can take a long time if you run this\n", + "for the first time or do not use --cache.\n", + "\n", + "Unless you run verbosely, all following warning\n", + "or error messages indicate serious problems.\n", + "\n"; if (!-d "$path/treasures") { warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; @@ -382,19 +488,52 @@ (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_trs), (async \&process_trs), (async \&process_arc), (async \&process_arc), + (async \&process_res), (async \&process_res), ); { - open my $fh, ">:utf8", "$DATADIR/animations~" - or die "$DATADIR/animations~: $!"; - print $fh join "", map $ANIM{$_}, sort keys %ANIM - } + # remove path prefix from editor_folder + substr $_->{editor_folder}, 0, 1 + length $path, "" + for values %ARC; + + # resolve inherit + while () { + my $progress; + my $loop; + + for my $o (values %ARC) { + if (my $other = $o->{inherit}) { + if (my $s = $ARC{$other}) { + if ($s->{inherit}) { + $loop = $s; + } else { + delete $o->{inherit}; + my %s = %$s; + delete @s{qw(_name more name name_pl)}; + %$o = ( %s, %$o ); + ++$progress; + } + } else { + warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; + delete $ARC{$o->{_name}}; + } + } + } + + unless ($progress) { + die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n" + if $loop; + + last; + } + } + + # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit + @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; - { open my $fh, ">:utf8", "$DATADIR/archetypes~" or die "$DATADIR/archetypes~: $!"; - substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; - print $fh Crossfire::archlist_to_string \@ARC; + print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; } { @@ -408,18 +547,30 @@ length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; + length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; + #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; + $v->{chksum32} = Digest::MD5::md5 $v->{data32}; $v->{chksum64} = Digest::MD5::md5 $v->{data64}; + + if (my $magicmap = $v->{magicmap}) { + $magicmap =~ y/A-Z_\-/a-z/d; + $v->{magicmap} = $COLOR{$magicmap}; + } } open my $fh, ">:perlio", "$DATADIR/facedata~" or die "$DATADIR/facedata~: $!"; - $FACEINFO{""} = { version => 1}; - print $fh Storable::nfreeze \%FACEINFO; + print $fh freeze { + version => 2, + faceinfo => \%FACEINFO, + animinfo => \%ANIMINFO, + resource => \%RESOURCE, + }; } - for (qw(archetypes facedata animations treasures)) { + for (qw(archetypes facedata treasures)) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_" or die "$DATADIR/$_: $!";