--- deliantra/server/utils/cfutil.in 2007/03/14 16:23:26 1.17 +++ deliantra/server/utils/cfutil.in 2007/04/10 09:35:24 1.23 @@ -84,25 +84,25 @@ } { - our %PNG32; our %FACEINFO; our @ARC; our $TRS; our $NFILE; our %ANIM; + our $QUANTIZE = "+dither -colorspace RGB -colors 256"; + our (@png, @trs, @arc); # files we are interested in - sub commit_png { - my ($name, $data) = @_; + sub commit_png($$$) { + my ($name, $data, $T) = @_; - $PNG32{$name} = $data; - $FACEINFO{$name} ||= {}; + $FACEINFO{$name}{"data$T"} = $data; } sub process_png { while (@png) { - my $path = pop @png; + my ($path, $delete) = @{pop @png}; my $png; aio_lstat $path; @@ -113,22 +113,26 @@ next; } + my $stem = $path; + my $T; + + if ($stem =~ s/\.32x32\.png~?$//) { + $T = 32; + } elsif ($stem =~ s/\.64x64\.png~?$//) { + $T = 64; + } else { + warn "$path: weird filename, skipping.\n"; + next; + } + # quickly extract width and height of the (necessarily PNG) image unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { - warn "$path: not a recongized png file, skipping.\n"; + warn "$path: not a recognized png file, skipping.\n"; next; } my ($w, $h) = unpack "NN", $1; - (my $face = $path) =~ s/^.*\///; - my $T = 32; - - unless ($face =~ s/\.base\.(...)\.png$/.$1/) { - warn "$path: weird filename, skipping.\n"; - next; - } - if ($w < $T || $h < $T) { warn "$path: too small ($w $h), skipping.\n"; next; @@ -139,6 +143,48 @@ next; } + unless ($path =~ /~$/) { + # possibly enlarge + if (0 > aio_stat "$stem.64x64.png") { + my $other = "$stem.64x64.png~"; + + if (0 > aio_lstat $other or (-M _) > (-M $path)) { + 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~"; + die "$other~ has zero size, aborting." unless -s "$other~"; + rename "$other~", $other; + }; + } + + push @png, [$other, !$CACHE]; + } + + # possibly scale down + if (0 > aio_stat "$stem.32x32.png") { + my $other = "$stem.32x32.png~"; + + 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~"; + die "$other~ has zero size, aborting." unless -s "$other~"; + rename "$other~", $other; + }; + } + + #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; @@ -162,7 +208,8 @@ "+clone", -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), "+repage", - -write => "png:$_->[2]~", + -quality => "00", + -write => "png32:$_->[2]~", "+delete", ")", ) @@ -176,6 +223,7 @@ # pass 2, optimise, and rename for (@todo) { system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; + die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; rename "$_->[2]~", $_->[2]; } }; @@ -189,12 +237,14 @@ die "$path: unable to read tile +$x+$y, aborting.\n"; } IO::AIO::aio_unlink $file unless $CACHE; - commit_png $x|$y ? "$face+$x+$y" : $face, $tile; + commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; } } else { # use as-is (either small, use smooth) - commit_png $face, $png; + commit_png $face, $png, $T; } + + aio_unlink $path if $delete; } } @@ -259,11 +309,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; } } } @@ -299,7 +349,7 @@ for my $file (@$nondirs) { if ($file =~ /\.png$/) { - push @png, "$path/$file"; + push @png, ["$path/$file", 0]; } elsif ($file =~ /\.trs$/) { push @trs, [$path, $file]; } elsif ($file =~ /\.arc$/) { @@ -314,7 +364,9 @@ sub inst_arch($) { my (undef, $path) = @_; - print "installing '$path' to '$DATADIR'\n"; + 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"; if (!-d "$path/treasures") { warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; @@ -325,7 +377,8 @@ IO::AIO::flush; $_->join for ( - (async \&process_png), (async \&process_png), + # four png crunchers work fine for my 2x smp machine + (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_trs), (async \&process_trs), (async \&process_arc), (async \&process_arc), ); @@ -351,23 +404,24 @@ { while (my ($k, $v) = each %FACEINFO) { - $v->{data32} ||= delete $PNG32{$k}; - } - - while (my ($k, $v) = each %FACEINFO) { 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}; } - open my $fh, ">:perlio", "$DATADIR/faces~" - or die "$DATADIR/faces~: $!"; + open my $fh, ">:perlio", "$DATADIR/facedata~" + or die "$DATADIR/facedata~: $!"; $FACEINFO{""} = { version => 1}; print $fh Storable::nfreeze \%FACEINFO; } - for (qw(archetypes faces animations treasures)) { + for (qw(archetypes facedata animations treasures)) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_" or die "$DATADIR/$_: $!";