--- deliantra/server/utils/cfutil.in 2009/10/28 04:10:46 1.74
+++ deliantra/server/utils/cfutil.in 2012/11/11 04:29:11 1.123
@@ -1,6 +1,28 @@
#!@PERL@
-use strict;
+#
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+#
+# Copyright (©) 2007,2008,2009,2010,2011,2012 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
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the Affero GNU General Public License
+# and the GNU General Public License along with this program. If not, see
+# .
+#
+# The authors can be reached via e-mail to
+#
+
+use common::sense;
my $prefix = "@prefix@";
my $exec_prefix = "@exec_prefix@";
@@ -8,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@";
@@ -18,16 +40,20 @@
use POSIX ();
use Carp;
-use Coro::EV;
-use AnyEvent;
use YAML::XS ();
+use Digest::MD5 ();
+use Storable ();
use JSON::XS ();
use IO::AIO ();
+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;
@@ -53,32 +79,70 @@
my $FORCE;
my $TMPDIR = "/tmp/cfutil$$~";
my $TMPFILE = "aaaa0";
+my @COMMIT;
our %COLOR = (
+ # original cf colours
black => 0,
white => 1,
- navy => 2,
+ navy => 2, # "dark blue"
red => 3,
orange => 4,
- blue => 5,
+ blue => 5, # "light blue"
darkorange => 6,
green => 7,
lightgreen => 8,
grey => 9,
- brown => 10,
- gold => 11,
- tan => 12,
+ brown => 10, # "yellow"
+ gold => 11, # "light yellow"
+ tan => 12, # yellowish gray
+
+ # new for deliantra
+ none => 13,
+
+ # compatibility to existing archetypes
+ lightblue => 5,
+ gray => 9,
+ yellow => 11,
+ khaki => 12,
);
END { system "rm", "-rf", $TMPDIR }
-my $s_INT = EV::signal INT => 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;
+
+# here we could try to avoid collisions and reduce chksum size further
+sub make_hash($\$\$;$) {
+ my ($id, $dataref, $hashref, $clen) = @_;
+
+ 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 "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;
+ }
+ }
+ $hash{$hash} = [$id, $dataref, $hashref];
+
+ $$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) {
@@ -93,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;
}
@@ -119,21 +212,30 @@
our @ARC;
our %ARC;
our $TRS;
+ our %PNG;
our $NFILE;
our $PATH;
our $QUANTIZE = "+dither -colorspace RGB -colors 256";
our $c_arc = new Coro::Channel;
- our $c_trs = new Coro::Channel;
- our $c_res = new Coro::Channel;
+ our $c_any = new Coro::Channel;
our @c_png;
- sub commit_png($$$) {
- my ($name, $data, $T) = @_;
+ # texture catalog size, in 64x64 tiles
+ sub TC_W() { 1024 / 64 }
+ sub TC_H() { 1024 / 64 }
+
+ our @TC = ([]); # texture catalogs
+
+ sub commit_png($$$$$$) {
+ my ($stem, $name, $data, $T, $w, $h) = @_;
+ $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
$FACEINFO{$name}{"data$T"} = $data;
+ $FACEINFO{$name}{w} = $w;
+ $FACEINFO{$name}{h} = $h;
}
sub process_png {
@@ -145,7 +247,7 @@
my ($size, $mtime) = (stat _)[7,9];
if (0 > aio_load $path, $png) {
- warn "$path: $!, skipping.\n";
+ warn "ERROR: $path: $!, skipping.\n";
next;
}
@@ -157,25 +259,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;
}
@@ -194,8 +296,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";
@@ -255,15 +357,14 @@
}
}
- system "convert -depth 8 $SRC rgba:-"
+ system "$CONVERT -depth 8 $SRC rgba:-"
. "| $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~"
+ . "| $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];
}
@@ -272,10 +373,10 @@
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, "-i0", "-q", "$other~";
+ make_file $path, $other, sub {
+ fork_exec {
+ system "$CONVERT png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
+ optipng "$other~";
# reduce smoothfaces >10000 bytes
# obsolete, no longer required
@@ -283,7 +384,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";
@@ -298,7 +399,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];
@@ -307,6 +408,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, 1, 1;
+ }
+
# split all bigfaces, but avoid smoothfaces (*_S)
if (($w > $T || $h > $T) && $face !~ /_S\./) {
# split
@@ -320,9 +471,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 {
@@ -345,8 +496,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];
}
};
@@ -360,21 +510,60 @@
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, $T;
+ commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
}
} else {
# use as-is (either small, use smooth)
- commit_png $face, $png, $T;
+ commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
}
- aio_unlink $path if $delete;
+ IO::AIO::aio_unlink $path if $delete;
}
}
- sub process_arc {
- while (my $job = $c_arc->get) {
- my ($dir, $file) = @$job;
+ sub process_faceinfo {
+ my ($dir, $file) = @_;
+ my $path = "$dir/$file";
+
+ my $data;
+ if (0 > aio_load $path, $data) {
+ warn "ERROR: $path: $!, skipping.\n";
+ return;
+ }
+ for (split /\n/, $data) {
+ 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 "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
+ (my $bgi = $COLOR{$bg})
+ // 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
+
+ $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) . $_;
+ }
+ }
+ }
+
+ sub process_arc {
+ while (my ($dir, $file) = @{ $c_arc->get }) {
my $arc;
aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
@@ -385,10 +574,7 @@
$ARC{$m->{_name}} = $m;
}
- $o->{editor_folder} = $dir;
-
- my $visibility = delete $o->{visibility};
- my $magicmap = delete $o->{magicmap};
+ $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
# find upper left corner :/
# omg, this is sooo broken
@@ -406,9 +592,6 @@
$o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
- $visibility = delete $o->{visibility} if exists $o->{visibility};
- $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
-
my $anim = delete $o->{anim};
if ($anim) {
@@ -441,13 +624,15 @@
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];
+ }
- next if $face =~ /^blank.x11$|^empty.x11$/;
+ $FACEINFO{$face}{arc} = $o;
- $info->{visibility} = $visibility if defined $visibility;
- $info->{magicmap} = $magicmap if defined $magicmap;
+ next if $face =~ /^blank.x11$|^empty.x11$/;
}
if (my $smooth = delete $o->{smoothface}) {
@@ -466,18 +651,16 @@
}
sub process_trs {
- while (my $job = $c_trs->get) {
- my ($dir, $file) = @$job;
- my $path = "$dir/$file";
-
- my $trs;
- if (0 > aio_load $path, $trs) {
- warn "$path: $!, skipping.\n";
- next;
- }
+ my ($dir, $file) = @_;
+ my $path = "$dir/$file";
- $TRS .= $trs;
+ my $trs;
+ if (0 > aio_load $path, $trs) {
+ warn "ERROR: $path: $!, skipping.\n";
+ return;
}
+
+ $TRS .= $trs;
}
my %FILECACHE;
@@ -488,7 +671,7 @@
if (0 < aio_load $_[0], $data) {
if ($_[1]) {
$data = eval { $_[1]->($data) };
- warn "$_[0]: $@" if $@;
+ warn "ERROR: $_[0]: $@" if $@;
}
}
@@ -498,63 +681,144 @@
$FILECACHE{$_[0]}
}
- sub process_res {
- while (my $job = $c_res->get) {
- my ($dir, $file, $type) = @$job;
+ # convert an image and a palette to some indexed 2d-matrix structure
+ sub process_plt {
+ my ($base, $plt) = @_;
- my $data;
- aio_load "$dir/$file", $data;
+ my ($w, $h) = imgsize "$base.png";
- my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
+ $w * $h
+ or die "$base.png: unable to identify correct size\n";
- utf8::decode $dir;
- utf8::decode $file;
+ my @plt;
+ my %map;
- # a meta file for resources is now mandatory
- unless (exists $meta->{$file}) {
- warn "skipping $dir/$file\n" if $VERBOSE >= 3;
- next;
- }
+ for (split /\n/, $plt) {
+ next unless /\S/;
+ next if /^\s*#/;
- $meta = {
- %{ $meta->{"" } || {} },
- %{ $meta->{$file} || {} },
- };
+ /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
+ or die "unparseable palette entry for $base.plt: $_";
- if ($meta->{license} =~ s/^#//) {
- $meta->{license} = ({
- "pd" => "Public Domain",
- "gpl" => "GNU General Public License, version 3.0 or any later",
- "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
- "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.";
- }
-
- $file =~ s/\.res$//;
- $file =~ s/\.(ogg|wav|jpg|png)$//;
-
- substr $dir, 0, 1 + length $PATH, "";
-
- if (my $filter = $meta->{cfutil_filter}) {
- if ($filter eq "yaml2json") {
- $data = JSON::XS::encode_json YAML::XS::Load $data;
- } elsif ($filter eq "json2json") {
- $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
- } elsif ($filter eq "perl2json") {
- $data = eval $data; die if $@;
- $data = JSON::XS::encode_json $data;
- } else {
- warn "$dir/$file: unknown filter $filter, skipping\n";
+ 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;
}
- }
- $RESOURCE{"$dir/$file"} = {
- type => (exists $meta->{type} ? delete $meta->{type} : $type),
- data => $data,
- %$meta ? (meta => $meta) : (),
+ 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) = @_;
+
+ 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) };
+
+ utf8::decode $dir;
+ utf8::decode $file;
+
+ # a meta file for resources is now mandatory
+ unless (exists $meta->{$file}) {
+ warn "skipping $dir/$file\n" if $VERBOSE >= 3;
+ return;
+ }
+
+ $meta = {
+ %{ $meta->{"" } || {} },
+ %{ $meta->{$file} || {} },
+ };
+
+ if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
+ $meta->{license} = ({
+ "pd" => "Public Domain",
+ "gpl" => "GNU General Public License, version 3.0 or any later",
+ "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
+ "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
+ "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 "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
+ }
+
+ if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
+ ($meta->{author} = $1) =~ s/_/ /g;
+ }
+
+ $file =~ s/\.res$//;
+ $file =~ s/\.(ogg|wav|jpg|png)$//;
+
+ if ($file =~ s/\.plt$//) {
+ $data = process_plt "$dir/$file", $data;
+ } elsif (my $filter = delete $meta->{cfutil_filter}) {
+ if ($filter eq "yaml2json") {
+ $data = JSON::XS::encode_json YAML::XS::Load $data;
+ } elsif ($filter eq "json2json") {
+ $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
+ } elsif ($filter eq "perl2json") {
+ $data = eval $data; die if $@;
+ $data = JSON::XS::encode_json $data;
+ } else {
+ warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
+ }
+ }
+
+ substr $dir, 0, 1 + length $PATH, "";
+
+ my %info = (
+ type => (exists $meta->{type} ? delete $meta->{type} : $type),
+ data => $data,
+ %$meta ? (meta => $meta) : (),
+ );
+
+ $RESOURCE{"$dir/$file"} = \%info;
+ }
+
+ sub process_any {
+ while (my ($func, @args) = @{ $c_any->get }) {
+ $func->(@args);
}
}
@@ -562,48 +826,60 @@
sub find_files {
my ($path) = @_;
- IO::AIO::aioreq_pri 4;
- IO::AIO::aio_scandir $path, 4, sub {
- my ($dirs, $nondirs) = @_;
-
- find_files "$path/$_"
- for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
-
- my $dir = $path;
- substr $dir, 0, 1 + length $PATH, "";
-
- for my $file (@$nondirs) {
- if ($dir =~ /^music(?:\/|$)/) {
- $c_res->put ([$path, $file, 3]) # FT_MUSIC
- if $file =~ /\.(ogg)$/;
-
- } elsif ($dir =~ /^sound(?:\/|$)/) {
- $c_res->put ([$path, $file, 5]) # FT_SOUND
- if $file =~ /\.(wav|ogg)$/;
-
- } elsif ($dir =~ /^res(?:\/|$)/) {
- if ($file =~ /\.(jpg|png)$/) {
- $c_res->put ([$path, $file, 0]) # FT_FACE
- } elsif ($file =~ /\.(res)$/) {
- $c_res->put ([$path, $file, 6]) # FT_RSRC
- } else {
- $c_res->put ([$path, $file, undef]);
- }
+ my $grp = IO::AIO::aio_group;
+
+ my $scandir; $scandir = sub {
+ my ($path) = @_;
+
+ IO::AIO::aioreq_pri 4;
+ add $grp IO::AIO::aio_scandir $path, 4, sub {
+ my ($dirs, $nondirs) = @_;
+
+ $scandir->("$path/$_")
+ for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
+
+ my $dir = $path;
+ substr $dir, 0, 1 + length $PATH, "";
+
+ for my $file (@$nondirs) {
+ if ($dir =~ /^music(?:\/|$)/) {
+ $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
+ if $file =~ /\.(ogg)$/;
+
+ } elsif ($dir =~ /^sound(?:\/|$)/) {
+ $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
+ if $file =~ /\.(wav|ogg)$/;
+
+ } elsif ($dir =~ /^res(?:\/|$)/) {
+ if ($file =~ /\.(jpg|png)$/) {
+ $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
+ } elsif ($file =~ /\.(res)$/) {
+ $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
+ } else {
+ $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose
+ }
- } elsif ($file =~ /\.png$/) {
- push @c_png, ["$path/$file", 0];
+ } elsif ($file =~ /\.png$/) {
+ $PNG{$file} = $path;
- } elsif ($file =~ /\.trs$/) {
- $c_trs->put ([$path, $file]);
+ } elsif ($file =~ /\.faceinfo$/) {
+ $c_any->put ([\&process_faceinfo, $path, $file]);
- } elsif ($file =~ /\.arc$/) {
- $c_arc->put ([$path, $file]);
+ } elsif ($file =~ /\.trs$/) {
+ $c_any->put ([\&process_trs, $path, $file]);
- } else {
- warn "ignoring $path/$file\n" if $VERBOSE >= 3;
+ } elsif ($file =~ /\.arc$/) {
+ $c_arc->put ([$path, $file]);
+
+ } else {
+ warn "ignoring $path/$file\n" if $VERBOSE >= 3;
+ }
}
- }
+ };
};
+
+ $scandir->($path);
+ aio_wait $grp;
}
sub generate_plurals {
@@ -647,40 +923,63 @@
"\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 "scanning files...\n" if $VERBOSE;
-
- find_files $path;
+ print "starting file scan, arc, any processing...\n" if $VERBOSE;
my @a_arc = map +(async \&process_arc), 1..2;
- my @a_res = map +(async \&process_res), 1..2;
- my @a_trs = map +(async \&process_trs), 1..2;
+ my @a_any = map +(async \&process_any), 1..4;
- IO::AIO::flush;
+ find_files $path;
- $c_res->shutdown;
$c_arc->shutdown;
- $c_trs->shutdown;
-
- print "start file scan, arc, res processing...\n" if $VERBOSE;
+ $c_any->shutdown;
$_->join for @a_arc; # need to parse all archetypes before png processing
+ print "finished arc 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;
+ }
- print "end arc, start png processing...\n" if $VERBOSE;
+ 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;
- $_->join for (@a_trs, @a_res, @a_png);
+ $_->join for @a_any;
+ print "finished any processing...\n" if $VERBOSE;
+
+ $_->join for @a_png;
+ print "finished png processing...\n" if $VERBOSE;
print "scanning done, processing results...\n" if $VERBOSE;
{
# remove path prefix from editor_folder
- substr $_->{editor_folder}, 0, 1 + length $path, ""
- for values %ARC;
+ $_->{editor_folder} =~ /^\x00/
+ and substr $_->{editor_folder}, 0, 2 + length $path, ""
+ for values %ARC;
print "resolving inheritance tree...\n" if $VERBOSE;
# resolve inherit
@@ -689,7 +988,7 @@
my $loop;
for my $o (values %ARC) {
- if (my $other = $o->{inherit}) {
+ for my $other (split /,/, $o->{inherit}) {
if (my $s = $ARC{$other}) {
if ($s->{inherit}) {
$loop = $s;
@@ -701,7 +1000,7 @@
++$progress;
}
} else {
- warn "'$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}};
}
}
@@ -718,17 +1017,28 @@
# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
@ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
- print "generating plurals...\n" if $VERBOSE;
- generate_plurals;
+ # fix up archetypes without names, where the archanme doesn't work at all
+ for (@ARC) {
+ if (!exists $_->{name} and $_->{_name} =~ /_/) {
+ for ($_->{name} = $_->{_name}) {
+ s/(?:_\d+)+$//;
+ s/_[nesw]+$//;
+ y/_/ /;
+ }
+ }
+ }
+
+ #print "generating plurals...\n" if $VERBOSE;
+ #generate_plurals;
- print "writing archetypes...\n" if $VERBOSE;
+ printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
open my $fh, ">:utf8", "$DATADIR/archetypes~"
or die "$DATADIR/archetypes~: $!";
print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
}
{
- print "writing treasures...\n" if $VERBOSE;
+ printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
open my $fh, ">:utf8", "$DATADIR/treasures~"
or die "$DATADIR/treasures~: $!";
print $fh $TRS;
@@ -736,26 +1046,137 @@
{
print "processing facedata...\n" if $VERBOSE;
- 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";
+
+ for my $k (sort keys %FACEINFO) {
+ my $v = $FACEINFO{$k};
+
+ 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};
+
+ #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";
+
+ $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";
- #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";
+ if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
+ my $id = @TC;
+ my $n = @{ $TC[-1] };
+ my $x = $n % TC_W;
+ my $y = int $n / TC_W;
- if (my $magicmap = $v->{magicmap}) {
- $magicmap =~ y/A-Z_\-/a-z/d;
- $v->{magicmap} = $COLOR{$magicmap};
+ push @{ $TC[-1] }, [$v, $x, $y];
+
+ $v->{tc} = [$id, $x, $y];
+
+ push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
}
- delete $v->{arc};
+ delete @$v{qw(w h arc stem derive)}; # not used by the server
}
- print "writing facedata...\n" if $VERBOSE;
- open my $fh, ">:perlio", "$DATADIR/facedata~"
- or die "$DATADIR/facedata~: $!";
+if (0) { #d# texture catalogs
+ print "creating texture catalogs...\n" if $VERBOSE;
+
+ for my $id (0 .. $#TC) {
+ my $tc = $TC[$id];
+
+ my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
+ my $idx = "a";
+
+ for (@$tc) {
+ my $path = "$TMPDIR/tc" . $idx++;
+
+ open my $fh, ">:perlio", $path
+ or die "$path: $!";
+ syswrite $fh, $_->[0]{data64};
+
+ my $x = $_->[1] * 64;
+ my $y = $_->[2] * 64;
+
+ $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
+ }
+
+ system "$cmd png:\Q$TMPDIR/tc$id\E";
+ optipng "$TMPDIR/tc$id";
+ }
+}
+
+ print "processing resources...\n" if $VERBOSE;
+ my $enc = JSON::XS->new->utf8->canonical->relaxed;
+ while (my ($k, $v) = each %RESOURCE) {
+ if ($v->{meta} && $v->{meta}{datadir}) {
+ delete $RESOURCE{$k};
+
+ $k =~ s/^res\/// or die "$k: datadir files must be in res/";
+
+ printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
+ open my $fh, ">:raw", "$DATADIR/$k~"
+ or die "$DATADIR/$k~: $!";
+ syswrite $fh, $v->{data};
+ push @COMMIT, $k;
+
+ } else {
+ if ($v->{type} & 1) {
+ # prepend meta info
+
+ my $meta = $enc->encode ({
+ name => $k,
+ %{ $v->{meta} || {} },
+ });
+
+ $v->{data} = pack "(w/a*)*", $meta, $v->{data};
+ }
+
+ make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
+ }
+ }
+
+ printf "writing facedata...\n" if $VERBOSE;
+
+ {
+ open my $fh, ">:perlio", "$DATADIR/facedata~"
+ or die "$DATADIR/facedata~: $!";
+
+ print $fh "FACEDATA";
+ my $fofs = 8;
+
+ my $put = sub {
+ my $len = length $_[0];
+ my $ofs = $fofs;
+
+ print $fh $_[0];
+ $fofs += $len;
+
+ ($len, $ofs)
+ };
+
+ for (values %FACEINFO) {
+ ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
+ ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
+ }
+
+ for (values %RESOURCE) {
+ ($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
+ }
+
+ close $fh;
+ }
+
+ printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
+ scalar keys %FACEINFO,
+ scalar keys %ANIMINFO,
+ scalar keys %RESOURCE
+ if $VERBOSE;
+
+ open my $fh, ">:perlio", "$DATADIR/faceinfo~"
+ or die "$DATADIR/faceinfo~: $!";
- print $fh freeze {
+ print $fh nfreeze {
version => 2,
faceinfo => \%FACEINFO,
animinfo => \%ANIMINFO,
@@ -765,7 +1186,7 @@
print "committing files...\n" if $VERBOSE;
- for (qw(archetypes facedata treasures)) {
+ for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
chmod 0644, "$DATADIR/$_~";
rename "$DATADIR/$_~", "$DATADIR/$_"
or die "$DATADIR/$_: $!";