--- deliantra/server/utils/cfutil.in 2010/10/17 08:00:09 1.105 +++ deliantra/server/utils/cfutil.in 2011/05/15 20:14:30 1.116 @@ -3,7 +3,7 @@ # # This file is part of Deliantra, the Roguelike Realtime MMORPG. # -# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team +# Copyright (©) 2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team # # Deliantra is free software: you can redistribute it and/or modify it under # the terms of the Affero GNU General Public License as published by the @@ -30,7 +30,7 @@ my $DATADIR = "@datadir@/@PACKAGE@"; my $CONVERT = "@CONVERT@"; -#my $IDENTIFY = "@IDENTIFY@"; +my $IDENTIFY = "@IDENTIFY@"; my $OPTIPNG = "@OPTIPNG@"; my $RSYNC = "@RSYNC@"; my $PNGNQ = "@PNGNQ@"; @@ -40,25 +40,26 @@ use POSIX (); use Carp; -use Coro::EV; -use AnyEvent; use YAML::XS (); +use Digest::MD5 (); +use Storable (); use JSON::XS (); use IO::AIO (); -use Digest::MD5 (); +use Compress::LZF (); +use AnyEvent; use Coro 5.12; +use Coro::EV; use Coro::AIO; use Coro::Util; use Coro::Channel; +use Coro::AnyEvent; use Coro::Storable; $Storable::canonical = 1; use Deliantra; $SIG{QUIT} = sub { Carp::cluck "QUIT" }; -sub WRITE_FACEINFO() { 0 } - sub usage { warn < sub { exit 1 }; -my $s_TERM = EV::signal TERM => sub { exit 1 }; +my $s_INT = AE::signal INT => sub { exit 1 }; +my $s_TERM = AE::signal TERM => sub { exit 1 }; our %hash; @@ -117,12 +118,12 @@ sub make_hash($\$\$;$) { my ($id, $dataref, $hashref, $clen) = @_; - my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; + my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5; if (exists $hash{$hash}) { # hash collision, but some files are simply identical if (${$hash{$hash}[1]} ne $$dataref) { - warn "hash collision $hash{$hash}[0] vs. $id\n"; + warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n"; exit 1; } else { print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; @@ -133,10 +134,15 @@ $$hashref = $hash; } +sub optipng($) { + system $OPTIPNG, "-o5", "-i0", "-q", $_[0]; + die "$_[0] has zero size, aborting." unless -s $_[0]; +} + mkdir $TMPDIR, 0700 or die "$TMPDIR: $!"; -sub fork_sub(&) { +sub fork_exec(&) { my ($cb) = @_; if (my $pid = fork) { @@ -151,13 +157,42 @@ } } +sub imgsize($) { + open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0] + or die "$IDENTIFY: $!"; + + Coro::AnyEvent::readable $fh; + + my ($w, $h) = split /,/, <$fh>; + + ($w+0, $h+0) +} + +# make $dst from $src, if not uptodate, by calling $how +sub make_file($$$) { + my ($src, $dst, $how) = @_; + + my $t = (aio_stat $dst) ? -1 : (stat _)[9]; + + for (ref $src ? @$src : $src) { + aio_stat $_ + and die "$_: $!"; + + if ((stat _)[9] > $t) { + # outdated, redo + $how->(); + last; + } + } +} + sub inst_maps($) { my (undef, $path) = @_; 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"; + warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n"; exit 1 unless $FORCE; } @@ -171,69 +206,13 @@ } { - no utf8; # == values are utf-8 encoded - - our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); - - # used to create crude text glyphs for text-based clients - sub autoglyph { - my ($stem, $face) = @_; - - if ($stem =~ /^wall\/|Nimwall/) { - return $WALL_SUFFIX[hex $1] - if $stem =~ /(_[0-9A-F]).x11/; - - "█" - - } elsif ($stem =~ /^traps\//) { - "☠" - - } elsif ($stem =~ /^armour\/shield/) { - "Ø" - - } elsif ($stem =~ /^armour\//) { - "A" - - } elsif ($stem =~ /^weapon\//) { - "†" - - } elsif ($stem =~ /^readable\//) { - "✉" - - } elsif ($stem =~ /^river\//) { - "~" - - } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { - "·" - - } elsif ($stem =~ /^spells\//) { - "!" - - } elsif ($stem =~ /^exit\//) { - "⎆" - - } elsif ($stem =~ /^construct\//) { - "⌂" - - } elsif ($stem =~ /^player\//) { - "\@" - - } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) { - $1 - - } else { - substr $stem, 0, 1 - } - } -} - -{ our %ANIMINFO; our %FACEINFO; our %RESOURCE; our @ARC; our %ARC; our $TRS; + our %PNG; our $NFILE; our $PATH; @@ -260,7 +239,7 @@ my ($size, $mtime) = (stat _)[7,9]; if (0 > aio_load $path, $png) { - warn "$path: $!, skipping.\n"; + warn "ERROR: $path: $!, skipping.\n"; next; } @@ -272,25 +251,25 @@ } elsif ($stem =~ s/\.64x64\.png~?$//) { $T = 64; } else { - warn "$path: weird filename, skipping.\n"; + warn "ERROR: $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 recognized png file, skipping.\n"; + warn "ERROR: $path: not a recognized png file, skipping.\n"; next; } my ($w, $h) = unpack "NN", $1; if ($w < $T || $h < $T) { - warn "$path: too small ($w $h), skipping.\n"; + warn "ERROR: $path: too small ($w $h), skipping.\n"; next; } if ($w % $T || $h % $T) { - warn "$path: weird png size ($w $h), skipping.\n"; + warn "ERROR: $path: weird png size ($w $h), skipping.\n"; next; } @@ -309,8 +288,8 @@ if (0 > aio_stat "$stem.64x64.png") { my $other = "$stem.64x64.png~"; - if (0 > aio_lstat $other or (-M _) > (-M $path)) { - fork_sub { + make_file $path, $other, sub { + fork_exec { my $CROP; my $SRC = "png:\Q$path\E"; @@ -374,11 +353,10 @@ . "| $exec_prefix/bin/cfhq2xa $w $h 0" . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" and die "convert/cfhq2xa pipeline error: status $? ($!)"; - system $OPTIPNG, "-i0", "-q", "$other~"; - die "$other~ has zero size, aborting." unless -s "$other~"; + optipng "$other~"; rename "$other~", $other; }; - } + }; push @c_png, [$other, !$CACHE]; } @@ -387,10 +365,10 @@ if (0 > aio_stat "$stem.32x32.png") { my $other = "$stem.32x32.png~"; - if (0 > aio_lstat $other or (-M _) > (-M $path)) { - fork_sub { + make_file $path, $other, sub { + fork_exec { system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; - system $OPTIPNG, "-i0", "-q", "$other~"; + optipng "$other~"; # reduce smoothfaces >10000 bytes # obsolete, no longer required @@ -398,7 +376,7 @@ my $ncolor = 256; while () { system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; - system $OPTIPNG, "-i0", "-q", "$other~~"; + optipng "$other~~"; last if 10000 > -s "$other~~"; $ncolor = int $ncolor * 0.9; $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; @@ -413,7 +391,7 @@ die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; - } + }; #warn "scaled down $path to $other\n";#d# push @c_png, [$other, !$CACHE]; @@ -422,6 +400,56 @@ (my $face = $stem) =~ s/^.*\///; + for (@{ $fi->{derive} }) { + my ($dir, $type) = @$_; + + my $geom = "${T}x${T}"; + my $dpath = "$dir/$type:$face.$geom.png~"; + + if ($type eq "buildmaterial") { + my $ov = "$PATH/mapbuilding/buildmaterial.png"; + make_file [$path, $ov], $dpath, sub { + fork_exec { + system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~"; + optipng "$dpath~"; + rename "$dpath~", $dpath; + }; + }; + } elsif ($type eq "buildmaterial-box") { + my $ov = "$PATH/mapbuilding/buildmaterial-box.png"; + make_file [$path, $ov], $dpath, sub { + fork_exec { + system "$CONVERT \Q$ov\E " + . "\\( \Q$path\E -trim -geometry 34x31\\> " + . "-gravity center -background transparent -extent 37x34 +gravity " + . "-geometry +22+6 \\) -composite " + . "-geometry $geom png:\Q$dpath\E~"; + optipng "$dpath~"; + rename "$dpath~", $dpath; + }; + }; + } elsif ($type eq "buildmaterial-sbox") { + my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png"; + make_file [$path, $ov], $dpath, sub { + fork_exec { + system "$CONVERT \Q$ov\E " + . "\\( \Q$path\E -trim -geometry 16x24\\> " + . "-gravity center -background transparent -extent 18x26 +gravity " + . "-geometry +26+16 \\) -composite " + . "-geometry $geom png:\Q$dpath\E~"; + optipng "$dpath~"; + rename "$dpath~", $dpath; + }; + }; + } else { + warn "ERROR: facename $type:$face contains unsupported derivation type.\n"; + } + + aio_load $dpath, my $png; + IO::AIO::aio_unlink $dpath unless $CACHE; + commit_png "$dir/$type:$face", "$type:$face", $png, $T; + } + # split all bigfaces, but avoid smoothfaces (*_S) if (($w > $T || $h > $T) && $face !~ /_S\./) { # split @@ -435,9 +463,9 @@ } my $mtime = (lstat $path)[9]; - my @todo = grep { $_->[3] <= $mtime } @tile; + my @todo = grep { $_->[3] < $mtime } @tile; if (@todo) { - fork_sub { + fork_exec { open my $convert, "|-", $CONVERT, "png:-", (map { @@ -460,8 +488,7 @@ # pass 2, optimise, and rename for (@todo) { - system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; - die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; + optipng "$_->[2]~"; rename "$_->[2]~", $_->[2]; } }; @@ -482,7 +509,7 @@ commit_png $stem, $face, $png, $T; } - aio_unlink $path if $delete; + IO::AIO::aio_unlink $path if $delete; } } @@ -492,28 +519,38 @@ my $data; if (0 > aio_load $path, $data) { - warn "$path: $!, skipping.\n"; + warn "ERROR: $path: $!, skipping.\n"; return; } for (split /\n/, $data) { - my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/; + chomp; + my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5; + # bg not used except for text clients + utf8::decode $glyph; $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag + $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet (my $fgi = $COLOR{$fg}) - // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n"; + // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n"; (my $bgi = $COLOR{$bg}) - // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n"; + // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n"; my $fi = $FACEINFO{$face} ||= { }; $fi->{visibility} = $visibility * 1; $fi->{magicmap} = $fgi; # foreground colour becomes magicmap - $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph; - #$fi->{glyph} = (chr $fgi) . $glyph;#d#TOOD remove - # bg not used except for text clients + + $glyph .= " " if 2 > length $glyph; # TODO kanji + die "glyph $face too long" if 2 < length $glyph; + + $fi->{glyph} = ""; + for (split //, $glyph) { + utf8::encode $_; + $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; + } } } @@ -579,8 +616,13 @@ my $face = $_; $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates - my $info = $FACEINFO{$face} ||= { }; - $info->{arc} = $o; + # handle derived faces + if ($face =~ /^([^:]+):(.*)/) { + my ($type, $base) = ($1, $2); + push @{ $FACEINFO{$base}{derive} }, [$dir, $type]; + } + + $FACEINFO{$face}{arc} = $o; next if $face =~ /^blank.x11$|^empty.x11$/; } @@ -606,7 +648,7 @@ my $trs; if (0 > aio_load $path, $trs) { - warn "$path: $!, skipping.\n"; + warn "ERROR: $path: $!, skipping.\n"; return; } @@ -621,7 +663,7 @@ if (0 < aio_load $_[0], $data) { if ($_[1]) { $data = eval { $_[1]->($data) }; - warn "$_[0]: $@" if $@; + warn "ERROR: $_[0]: $@" if $@; } } @@ -631,11 +673,79 @@ $FILECACHE{$_[0]} } + # convert an image and a palette to some indexed 2d-matrix structure + sub process_plt { + my ($base, $plt) = @_; + + my ($w, $h) = imgsize "$base.png"; + + $w * $h + or die "$base.png: unable to identify correct size\n"; + + my @plt; + my %map; + + for (split /\n/, $plt) { + next unless /\S/; + next if /^\s*#/; + + /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/ + or die "unparseable palette entry for $base.plt: $_"; + + my ($rgb, $name) = ($1, $2); + + $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/; + + $map{pack "H*", $rgb} = chr @plt; + push @plt, $name; + } + + make_file ["$base.plt", "$base.png"], "$base.tbl~", sub { + warn "building $base\n" if $VERBOSE >= 3; + + fork_exec { + open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:" + or die "$base.png: $!"; + + local $/; + $png = <$png>; + + $w * $h * 3 == length $png + or die "$base.png: failed to read enough data from file\n"; + + $png =~ s/(...)/$map{$1}/ge; + + $w * $h == length $png + or die "$base.png: failed to map all data - wrong palette?\n"; + + { + open my $fh, ">:raw", "$base.tbl~~" + or die "$base.tbl~~: $!"; + syswrite $fh, $png; + } + + rename "$base.tbl~~", "$base.tbl~"; + }; + }; + + 0 <= aio_load "$base.tbl~", my $tbl + or die "$base.tbl~: $!"; + + IO::AIO::aio_unlink "$base.tbl~" unless $CACHE; + + Compress::LZF::compress nfreeze { + w => $w, + h => $h, + plt => \@plt, + tbl => $tbl, + } + } + sub process_res { my ($dir, $file, $type) = @_; - my $data; - aio_load "$dir/$file", $data; + 0 <= aio_load "$dir/$file", my $data + or die "$dir/$file: $!"; my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; @@ -662,7 +772,7 @@ "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", })->{$meta->{license}} - || warn "$dir/$file: license tag '$meta->{license}' not found."; + || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found."; } if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { @@ -672,9 +782,9 @@ $file =~ s/\.res$//; $file =~ s/\.(ogg|wav|jpg|png)$//; - substr $dir, 0, 1 + length $PATH, ""; - - if (my $filter = $meta->{cfutil_filter}) { + if ($file =~ s/\.plt$//) { + $data = process_plt "$dir/$file", $data; + } elsif (my $filter = $meta->{cfutil_filter}) { if ($filter eq "yaml2json") { $data = JSON::XS::encode_json YAML::XS::Load $data; } elsif ($filter eq "json2json") { @@ -683,10 +793,12 @@ $data = eval $data; die if $@; $data = JSON::XS::encode_json $data; } else { - warn "$dir/$file: unknown filter $filter, skipping\n"; + warn "ERROR: $dir/$file: unknown filter $filter, skipping\n"; } } + substr $dir, 0, 1 + length $PATH, ""; + $RESOURCE{"$dir/$file"} = { type => (exists $meta->{type} ? delete $meta->{type} : $type), data => $data, @@ -738,7 +850,7 @@ } } elsif ($file =~ /\.png$/) { - push @c_png, ["$path/$file", 0]; + $PNG{$file} = $path; } elsif ($file =~ /\.faceinfo$/) { $c_any->put ([\&process_faceinfo, $path, $file]); @@ -801,11 +913,11 @@ "\n"; if (!-d "$path/treasures") { - warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; + warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n"; exit 1 unless $FORCE; } - print "start file scan, arc, any processing...\n" if $VERBOSE; + print "starting file scan, arc, any processing...\n" if $VERBOSE; my @a_arc = map +(async \&process_arc), 1..2; my @a_any = map +(async \&process_any), 1..4; @@ -816,17 +928,41 @@ $c_any->shutdown; $_->join for @a_arc; # need to parse all archetypes before png processing + print "ended arc processing...\n" if $VERBOSE; - print "end arc, start png processing...\n" if $VERBOSE; + # fill png queue + for (keys %FACEINFO) { + # we only expect source pngs to exist for non-derived + # faces, i.e. no split tiles (+x+x) and no face derivates + # (xxx:) + /^[^:]+\....$/ + or next; + + my $seen; + + if (exists $PNG{"$_.32x32.png"}) { + push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"]; + $seen = 1; + } + if (exists $PNG{"$_.64x64.png"}) { + push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"]; + $seen = 1; + } + + warn "ERROR: $_: face not found, expect problems.\n" + unless $seen; + } + + print "starting png processing...\n" if $VERBOSE; # eight png crunchers work fine for my 4x smp machine my @a_png = map +(async \&process_png), 1..8; - print "end any processing...\n" if $VERBOSE; $_->join for @a_any; + print "ended any processing...\n" if $VERBOSE; - print "end png processing...\n" if $VERBOSE; $_->join for @a_png; + print "ended png processing...\n" if $VERBOSE; print "scanning done, processing results...\n" if $VERBOSE; { @@ -854,7 +990,7 @@ ++$progress; } } else { - warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; + warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; delete $ARC{$o->{_name}}; } } @@ -891,33 +1027,6 @@ print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; } - if (WRITE_FACEINFO) { - my @table; - for my $face (sort keys %FACEINFO) { - my $v = $FACEINFO{$face}; - (my $xf = $face) =~ s/\+\d+\+\d+$//; - - $v->{magicmap} //= $FACEINFO{$xf}{magicmap}; - $v->{glyph} //= $FACEINFO{$xf}{glyph}; - - $v->{magicmap} =~ y/A-Z_\-/a-z/d; - - delete $v->{glyph} if $v->{glyph} =~ /^\?./; - - my $stem = $v->{stem}; - $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v)); - - push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}]; - } - use Text::Table; - my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef; - $tb->load (@table); - open my $fh, ">:raw", "default.faceinfo"or die; - print $fh $tb; - print "default.faceinfo written, exiting.\n"; - exit 77; - } - { printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; open my $fh, ">:utf8", "$DATADIR/treasures~" @@ -928,8 +1037,8 @@ { print "processing facedata...\n" if $VERBOSE; while (my ($k, $v) = each %FACEINFO) { - length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; - length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; + length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n"; + length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n"; make_hash $k, $v->{data32}, $v->{hash32}; make_hash $k, $v->{data64}, $v->{hash64}; @@ -937,14 +1046,11 @@ #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; - exists $v->{visibility} - or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; - - my $stem = delete $v->{stem}; - $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment."; - #$v->{glyph} //= autoglyph $stem, $v; + $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n"; + $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n"; + $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n"; - delete $v->{arc}; + delete @$v{qw(arc stem derive)}; # not used by the server } print "processing resources...\n" if $VERBOSE; @@ -993,7 +1099,6 @@ animinfo => \%ANIMINFO, resource => \%RESOURCE, }; - } print "committing files...\n" if $VERBOSE;