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.40 by root, Mon Jul 16 19:43:33 2007 UTC vs.
Revision 1.121 by root, Mon Oct 29 22:50:10 2012 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
9 31
10my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
11#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
17use Coro::Event; 39use File::Temp;
40use POSIX ();
41use Carp;
42
43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS ();
47use IO::AIO ();
48use Compress::LZF ();
49
18use AnyEvent; 50use AnyEvent;
19use IO::AIO (); 51use Coro 5.12;
20use File::Temp;
21use Crossfire;
22use Coro; 52use Coro::EV;
23use Coro::AIO; 53use Coro::AIO;
24use POSIX (); 54use Coro::Util;
25use Digest::MD5; 55use Coro::Channel;
56use Coro::AnyEvent;
26use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
58
59use Deliantra;
60
61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 62
28sub usage { 63sub usage {
29 warn <<EOF; 64 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 65Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 66 [--install-arch path]
… …
42my $VERBOSE = 1; 77my $VERBOSE = 1;
43my $CACHE = 0; 78my $CACHE = 0;
44my $FORCE; 79my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
47 83
48our %COLOR = ( 84our %COLOR = (
85 # original cf colours
49 black => 0, 86 black => 0,
50 white => 1, 87 white => 1,
51 navy => 2, 88 navy => 2, # "dark blue"
52 red => 3, 89 red => 3,
53 orange => 4, 90 orange => 4,
54 blue => 5, 91 blue => 5, # "light blue"
55 darkorange => 6, 92 darkorange => 6,
56 green => 7, 93 green => 7,
57 lightgreen => 8, 94 lightgreen => 8,
58 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
59 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
60 gold => 11, 105 gray => 9,
106 yellow => 11,
61 tan => 12, 107 khaki => 12,
62); 108);
63 109
64END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
65 111
66Event->signal (signal => "INT", cb => sub { exit 1 }); 112my $s_INT = AE::signal INT => sub { exit 1 };
67Event->signal (signal => "TERM", cb => sub { exit 1 }); 113my $s_TERM = AE::signal TERM => sub { exit 1 };
114
115our %hash;
116
117# here we could try to avoid collisions and reduce chksum size further
118sub make_hash($\$\$;$) {
119 my ($id, $dataref, $hashref, $clen) = @_;
120
121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
122
123 if (exists $hash{$hash}) {
124 # hash collision, but some files are simply identical
125 if (${$hash{$hash}[1]} ne $$dataref) {
126 warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
127 exit 1;
128 } else {
129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
130 }
131 }
132 $hash{$hash} = [$id, $dataref, $hashref];
133
134 $$hashref = $hash;
135}
136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
68 141
69mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
70 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
71 144
72sub fork_sub(&) { 145sub fork_exec(&) {
73 my ($cb) = @_; 146 my ($cb) = @_;
74 147
75 if (my $pid = fork) { 148 if (my $pid = fork) {
76 my $current = $Coro::current; 149 my $current = $Coro::current;
77 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
… …
82 warn $@; 155 warn $@;
83 POSIX::_exit 1; 156 POSIX::_exit 1;
84 } 157 }
85} 158}
86 159
160sub imgsize($) {
161 open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0]
162 or die "$IDENTIFY: $!";
163
164 Coro::AnyEvent::readable $fh;
165
166 my ($w, $h) = split /,/, <$fh>;
167
168 ($w+0, $h+0)
169}
170
171# make $dst from $src, if not uptodate, by calling $how
172sub make_file($$$) {
173 my ($src, $dst, $how) = @_;
174
175 my $t = (aio_stat $dst) ? -1 : (stat _)[9];
176
177 for (ref $src ? @$src : $src) {
178 aio_stat $_
179 and die "$_: $!";
180
181 if ((stat _)[9] > $t) {
182 # outdated, redo
183 $how->();
184 last;
185 }
186 }
187}
188
87sub inst_maps($) { 189sub inst_maps($) {
88 my (undef, $path) = @_; 190 my (undef, $path) = @_;
89 191
90 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
91 193
92 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 195 warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
95 } 197 }
96 198
97 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
200 "$path/.", "$DATADIR/maps/.",
201 "--exclude", "CVS", "--exclude", "/world-precomposed",
202 "--delete", "--delete-excluded"
98 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
99 204
100 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
101} 206}
102 207
… …
105 our %FACEINFO; 210 our %FACEINFO;
106 our %RESOURCE; 211 our %RESOURCE;
107 our @ARC; 212 our @ARC;
108 our %ARC; 213 our %ARC;
109 our $TRS; 214 our $TRS;
215 our %PNG;
110 our $NFILE; 216 our $NFILE;
111 our $PATH; 217 our $PATH;
112 218
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 220
115 our (@png, @trs, @arc, @res); # files we are interested in 221 our $c_arc = new Coro::Channel;
222 our $c_any = new Coro::Channel;
116 223
224 our @c_png;
225
226 # texture catalog size, in 64x64 tiles
227 sub TC_W() { 1024 / 64 }
228 sub TC_H() { 1024 / 64 }
229
230 our @TC = ([]); # texture catalogs
231
117 sub commit_png($$$) { 232 sub commit_png($$$$$$) {
118 my ($name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
119 234
235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
120 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
121 } 239 }
122 240
123 sub process_png { 241 sub process_png {
124 while (@png) { 242 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 243 my ($path, $delete) = @{pop @c_png};
126 244
127 my $png; 245 my $png;
128 aio_lstat $path; 246 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
130 248
131 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
132 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
133 next; 251 next;
134 } 252 }
135 253
136 my $stem = $path; 254 my $stem = $path;
137 my $T; 255 my $T;
… …
139 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
140 $T = 32; 258 $T = 32;
141 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
142 $T = 64; 260 $T = 64;
143 } else { 261 } else {
144 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
145 next; 263 next;
146 } 264 }
147 265
148 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
149 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
150 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
151 next; 269 next;
152 } 270 }
153 271
154 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
155 273
156 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
157 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
158 next; 276 next;
159 } 277 }
160 278
161 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
163 next; 281 next;
164 } 282 }
283
284 (my $base = $stem) =~ s/^.*\///;
285
286 my $fi = $FACEINFO{$base};
287 unless ($fi) {
288 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
289 #next;
290 }
291
292 my $arc = $fi->{arc} || { };
165 293
166 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
167 # possibly enlarge 295 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
170 298
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
172 my $wrap = 0; # for the time being
173 fork_sub { 300 fork_exec {
301 my $CROP;
302 my $SRC = "png:\Q$path\E";
303
304 my $is_floor = $arc->{is_floor};
305 my $is_wall = 0;
306
307 my ($wall_pfx, $wall_dir, $wall_sfx);
308
309 if (
310 !$is_floor
311 && !$arc->{alive}
312 && $arc->{move_block} eq "all"
313 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
314 ) {
315 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
316
317 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
318 $is_wall = 1;
319 }
320 }
321
322 if ($is_wall || $is_floor) {
323 # add a 4px border and add other images around it
324 $CROP = "-shave 8x8 +repage";
325
326 $w += 8;
327 $h += 8;
328
329 $SRC = "-size ${w}x${h} xc:transparent";
330 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
331
332 # 8 surrounding images
333 for (
334 # x y b r0 r1
335 [-1, -1, 0, 6],
336 [ 0, -1, 1, 10, 14],
337 [+1, -1, 0, 12],
338
339 [-1, 0, 8, 5, 7],
340 #
341 [+1, 0, 2, 5, 13],
342
343 [-1, +1, 0, 3],
344 [ 0, +1, 4, 10, 11],
345 [+1, +1, 0, 9],
346 ) {
347 my ($x, $y, $d, $r0, $r1) = @$_;
348
349 my $tile = $is_floor ? $path
350 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
351 : die;
352
353 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
354 "\Q$tile",
355 $x * ($w - 8) + 4,
356 $y * ($h - 8) + 4;
357 }
358 }
359
174 system "convert png:\Q$path\E -depth 8 rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
176 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 362 . "| $CONVERT -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
177 and die "convert/hq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 365 rename "$other~", $other;
181 }; 366 };
182 } 367 };
183 368
184 push @png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
185 } 370 }
186 371
187 # possibly scale down 372 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
190 375
191 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
192 fork_sub { 377 fork_exec {
193 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 378 system "$CONVERT png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
194 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
195 380
196 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
382 # obsolete, no longer required
197 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
198 my $ncolor = 256; 384 my $ncolor = 256;
199 while () { 385 while () {
200 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
201 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
202 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
203 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
204 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
205 } 391 }
206 392
… …
211 } 397 }
212 398
213 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
214 rename "$other~", $other; 400 rename "$other~", $other;
215 }; 401 };
216 } 402 };
217 403
218 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
220 } 406 }
221 } 407 }
222 408
223 (my $face = $stem) =~ s/^.*\///; 409 (my $face = $stem) =~ s/^.*\///;
410
411 for (@{ $fi->{derive} }) {
412 my ($dir, $type) = @$_;
413
414 my $geom = "${T}x${T}";
415 my $dpath = "$dir/$type:$face.$geom.png~";
416
417 if ($type eq "buildmaterial") {
418 my $ov = "$PATH/mapbuilding/buildmaterial.png";
419 make_file [$path, $ov], $dpath, sub {
420 fork_exec {
421 system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
422 optipng "$dpath~";
423 rename "$dpath~", $dpath;
424 };
425 };
426 } elsif ($type eq "buildmaterial-box") {
427 my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
428 make_file [$path, $ov], $dpath, sub {
429 fork_exec {
430 system "$CONVERT \Q$ov\E "
431 . "\\( \Q$path\E -trim -geometry 34x31\\> "
432 . "-gravity center -background transparent -extent 37x34 +gravity "
433 . "-geometry +22+6 \\) -composite "
434 . "-geometry $geom png:\Q$dpath\E~";
435 optipng "$dpath~";
436 rename "$dpath~", $dpath;
437 };
438 };
439 } elsif ($type eq "buildmaterial-sbox") {
440 my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
441 make_file [$path, $ov], $dpath, sub {
442 fork_exec {
443 system "$CONVERT \Q$ov\E "
444 . "\\( \Q$path\E -trim -geometry 16x24\\> "
445 . "-gravity center -background transparent -extent 18x26 +gravity "
446 . "-geometry +26+16 \\) -composite "
447 . "-geometry $geom png:\Q$dpath\E~";
448 optipng "$dpath~";
449 rename "$dpath~", $dpath;
450 };
451 };
452 } else {
453 warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
454 }
455
456 aio_load $dpath, my $png;
457 IO::AIO::aio_unlink $dpath unless $CACHE;
458 commit_png "$dir/$type:$face", "$type:$face", $png, $T, 1, 1;
459 }
224 460
225 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
226 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
227 # split 463 # split
228 my @tile; 464 my @tile;
… …
233 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
234 } 470 }
235 } 471 }
236 472
237 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
238 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
239 if (@todo) { 475 if (@todo) {
240 fork_sub { 476 fork_exec {
241 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
242 "png:-", 478 "png:-",
243 (map { 479 (map {
244 ( 480 (
245 "(", 481 "(",
… …
258 print $convert $png; 494 print $convert $png;
259 close $convert; 495 close $convert;
260 496
261 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
262 for (@todo) { 498 for (@todo) {
263 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
264 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
265 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
266 } 501 }
267 }; 502 };
268 } 503 }
269 504
… …
273 508
274 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
275 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
276 } 511 }
277 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
278 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 513 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
279 } 514 }
280 } else { 515 } else {
281 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
282 commit_png $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
283 } 518 }
284 519
285 aio_unlink $path if $delete; 520 IO::AIO::aio_unlink $path if $delete;
521 }
522 }
523
524 sub process_faceinfo {
525 my ($dir, $file) = @_;
526 my $path = "$dir/$file";
527
528 my $data;
529 if (0 > aio_load $path, $data) {
530 warn "ERROR: $path: $!, skipping.\n";
531 return;
532 }
533
534 for (split /\n/, $data) {
535 chomp;
536 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
537 # bg not used except for text clients
538
539 utf8::decode $glyph;
540 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
541 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
542
543 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
544
545 (my $fgi = $COLOR{$fg})
546 // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
547 (my $bgi = $COLOR{$bg})
548 // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
549
550 my $fi = $FACEINFO{$face} ||= { };
551 $fi->{visibility} = $visibility * 1;
552 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
553
554 $glyph .= " " if 2 > length $glyph; # TODO kanji
555 die "glyph $face too long" if 2 < length $glyph;
556
557 $fi->{glyph} = "";
558 for (split //, $glyph) {
559 utf8::encode $_;
560 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
561 }
286 } 562 }
287 } 563 }
288 564
289 sub process_arc { 565 sub process_arc {
290 while (@arc) { 566 while (my ($dir, $file) = @{ $c_arc->get }) {
291 my ($dir, $file) = @{pop @arc};
292
293 my $arc; 567 my $arc;
294 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 568 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
295 569
296 my $arc = read_arch "$dir/$file"; 570 my $arc = read_arch "$dir/$file";
297 for my $o (values %$arc) { 571 for my $o (values %$arc) {
298 push @ARC, $o; 572 push @ARC, $o;
299 for (my $m = $o; $m; $m = $m->{more}) { 573 for (my $m = $o; $m; $m = $m->{more}) {
300 $ARC{$m->{_name}} = $m; 574 $ARC{$m->{_name}} = $m;
301 } 575 }
302 576
303 $o->{editor_folder} = $dir; 577 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
304
305 my $visibility = delete $o->{visibility};
306 my $magicmap = delete $o->{magicmap};
307 578
308 # find upper left corner :/ 579 # find upper left corner :/
309 # omg, this is sooo broken 580 # omg, this is sooo broken
310 my ($dx, $dy); 581 my ($dx, $dy);
311 for (my $o = $o; $o; $o = $o->{more}) { 582 for (my $o = $o; $o; $o = $o->{more}) {
… …
318 my $y = $o->{y} - $dy; 589 my $y = $o->{y} - $dy;
319 590
320 my $ext = $x|$y ? "+$x+$y" : ""; 591 my $ext = $x|$y ? "+$x+$y" : "";
321 592
322 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 593 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
323
324 $visibility = delete $o->{visibility} if exists $o->{visibility};
325 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
326 594
327 my $anim = delete $o->{anim}; 595 my $anim = delete $o->{anim};
328 596
329 if ($anim) { 597 if ($anim) {
330 # possibly add $ext to the animation name to avoid 598 # possibly add $ext to the animation name to avoid
… …
348 facings => $facings, 616 facings => $facings,
349 frames => \@frames, 617 frames => \@frames,
350 }; 618 };
351 } 619 }
352 620
353 for my $face ($o->{face} || (), @{$anim || []}) { 621 for ($o->{face} || (), @{$anim || []}) {
622 next if /^facings\s/;
623
624 my $face = $_;
625 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
626
627 # handle derived faces
628 if ($face =~ /^([^:]+):(.*)/) {
629 my ($type, $base) = ($1, $2);
630 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
631 }
632
633 $FACEINFO{$face}{arc} = $o;
634
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
355
356 my $info = $FACEINFO{$face} ||= {};
357
358 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap;
360 } 636 }
361 637
362 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 639 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 640 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 641 while (my ($face, $smooth) = each %kv) {
642 $FACEINFO{$smooth}{arc} = $o;
643
366 $FACEINFO{$face}{smooth} = $smooth; 644 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 645 $FACEINFO{$face}{smoothlevel} = $level;
368 } 646 }
369 } 647 }
370 } 648 }
371 } 649 }
372 } 650 }
373 } 651 }
374 652
375 sub process_trs { 653 sub process_trs {
376 while (@trs) {
377 my ($dir, $file) = @{pop @trs}; 654 my ($dir, $file) = @_;
378 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
379 656
380 my $trs; 657 my $trs;
381 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 659 warn "ERROR: $path: $!, skipping.\n";
660 return;
661 }
662
663 $TRS .= $trs;
664 }
665
666 my %FILECACHE;
667
668 sub load_cached($;$) {
669 unless (exists $FILECACHE{$_[0]}) {
670 my $data;
671 if (0 < aio_load $_[0], $data) {
672 if ($_[1]) {
673 $data = eval { $_[1]->($data) };
674 warn "ERROR: $_[0]: $@" if $@;
383 next; 675 }
676 }
677
678 $FILECACHE{$_[0]} = $data;
679 }
680
681 $FILECACHE{$_[0]}
682 }
683
684 # convert an image and a palette to some indexed 2d-matrix structure
685 sub process_plt {
686 my ($base, $plt) = @_;
687
688 my ($w, $h) = imgsize "$base.png";
689
690 $w * $h
691 or die "$base.png: unable to identify correct size\n";
692
693 my @plt;
694 my %map;
695
696 for (split /\n/, $plt) {
697 next unless /\S/;
698 next if /^\s*#/;
699
700 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
701 or die "unparseable palette entry for $base.plt: $_";
702
703 my ($rgb, $name) = ($1, $2);
704
705 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
706
707 $map{pack "H*", $rgb} = chr @plt;
708 push @plt, $name;
709 }
710
711 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
712 warn "building $base\n" if $VERBOSE >= 3;
713
714 fork_exec {
715 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
716 or die "$base.png: $!";
717
718 local $/;
719 $png = <$png>;
720
721 $w * $h * 3 == length $png
722 or die "$base.png: failed to read enough data from file\n";
723
724 $png =~ s/(...)/$map{$1}/ge;
725
726 $w * $h == length $png
727 or die "$base.png: failed to map all data - wrong palette?\n";
728
729 {
730 open my $fh, ">:raw", "$base.tbl~~"
731 or die "$base.tbl~~: $!";
732 syswrite $fh, $png;
733 }
734
735 rename "$base.tbl~~", "$base.tbl~";
384 } 736 };
737 };
385 738
386 $TRS .= $trs; 739 0 <= aio_load "$base.tbl~", my $tbl
740 or die "$base.tbl~: $!";
741
742 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
743
744 Compress::LZF::compress nfreeze {
745 w => $w,
746 h => $h,
747 plt => \@plt,
748 tbl => $tbl,
387 } 749 }
388 } 750 }
389 751
390 sub process_res { 752 sub process_res {
391 while (@res) { 753 my ($dir, $file, $type) = @_;
392 my ($dir, $file) = @{pop @res};
393 754
394 my $data;
395 aio_load "$dir/$file", $data; 755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
396 757
397 my $copyright; 758 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
398 aio_load "$dir/copyright", $copyright;
399 759
760 utf8::decode $dir;
761 utf8::decode $file;
762
763 # a meta file for resources is now mandatory
764 unless (exists $meta->{$file}) {
765 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
766 return;
767 }
768
769 $meta = {
770 %{ $meta->{"" } || {} },
771 %{ $meta->{$file} || {} },
772 };
773
774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
775 $meta->{license} = ({
776 "pd" => "Public Domain",
777 "gpl" => "GNU General Public License, version 3.0 or any later",
778 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
779 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
780 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
781 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
782 })->{$meta->{license}}
783 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
784 }
785
786 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
787 ($meta->{author} = $1) =~ s/_/ /g;
788 }
789
400 $file =~ s/\.res$//; 790 $file =~ s/\.res$//;
401 $file =~ /\.([^.]+)$/ 791 $file =~ s/\.(ogg|wav|jpg|png)$//;
402 or next;
403 792
404 my $type = $1; 793 if ($file =~ s/\.plt$//) {
794 $data = process_plt "$dir/$file", $data;
795 } elsif (my $filter = delete $meta->{cfutil_filter}) {
796 if ($filter eq "yaml2json") {
797 $data = JSON::XS::encode_json YAML::XS::Load $data;
798 } elsif ($filter eq "json2json") {
799 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
800 } elsif ($filter eq "perl2json") {
801 $data = eval $data; die if $@;
802 $data = JSON::XS::encode_json $data;
803 } else {
804 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
805 }
806 }
405 807
406 substr $dir, 0, 1 + length $PATH, ""; 808 substr $dir, 0, 1 + length $PATH, "";
407 809
408 $RESOURCE{"$dir/$file"} = { 810 $RESOURCE{"$dir/$file"} = {
409 type => $1, 811 type => (exists $meta->{type} ? delete $meta->{type} : $type),
410 copyright => $copyright,
411 data => $data, 812 data => $data,
412 chksum => Digest::MD5::md5 $data, 813 %$meta ? (meta => $meta) : (),
413 }; 814 };
815 }
816
817 sub process_any {
818 while (my ($func, @args) = @{ $c_any->get }) {
819 $func->(@args);
414 } 820 }
415 } 821 }
416 822
417 sub find_files; 823 sub find_files;
418 sub find_files { 824 sub find_files {
419 my ($path) = @_; 825 my ($path) = @_;
420 826
827 my $grp = IO::AIO::aio_group;
828
829 my $scandir; $scandir = sub {
830 my ($path) = @_;
831
421 IO::AIO::aioreq_pri 4; 832 IO::AIO::aioreq_pri 4;
422 IO::AIO::aio_scandir $path, 4, sub { 833 add $grp IO::AIO::aio_scandir $path, 4, sub {
423 my ($dirs, $nondirs) = @_; 834 my ($dirs, $nondirs) = @_;
424 835
425 find_files "$path/$_" 836 $scandir->("$path/$_")
426 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 837 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
427 838
839 my $dir = $path;
840 substr $dir, 0, 1 + length $PATH, "";
841
428 for my $file (@$nondirs) { 842 for my $file (@$nondirs) {
843 if ($dir =~ /^music(?:\/|$)/) {
844 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
845 if $file =~ /\.(ogg)$/;
846
847 } elsif ($dir =~ /^sound(?:\/|$)/) {
848 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
849 if $file =~ /\.(wav|ogg)$/;
850
851 } elsif ($dir =~ /^res(?:\/|$)/) {
852 if ($file =~ /\.(jpg|png)$/) {
853 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
854 } elsif ($file =~ /\.(res)$/) {
855 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
856 } else {
857 $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
858 }
859
429 if ($file =~ /\.png$/) { 860 } elsif ($file =~ /\.png$/) {
430 push @png, ["$path/$file", 0]; 861 $PNG{$file} = $path;
862
863 } elsif ($file =~ /\.faceinfo$/) {
864 $c_any->put ([\&process_faceinfo, $path, $file]);
865
431 } elsif ($file =~ /\.trs$/) { 866 } elsif ($file =~ /\.trs$/) {
432 push @trs, [$path, $file]; 867 $c_any->put ([\&process_trs, $path, $file]);
868
433 } elsif ($file =~ /\.arc$/) { 869 } elsif ($file =~ /\.arc$/) {
434 push @arc, [$path, $file]; 870 $c_arc->put ([$path, $file]);
435 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 871
436 push @res, [$path, $file];
437 } else { 872 } else {
438 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 873 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
439 } 874 }
875 }
440 } 876 };
441 }; 877 };
878
879 $scandir->($path);
880 aio_wait $grp;
881 }
882
883 sub generate_plurals {
884# use Lingua::EN::Inflect ();
885# Lingua::EN::Inflect::classical;
886# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
887# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
888#
889# for my $a (@ARC) {
890# my $name = $a->{name} || $a->{_name};
891#
892# next unless $a->{name_pl};
893# next if $a->{invisible};
894# next if $a->{is_floor};
895# next if $a->{no_pick};
896#
897# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
898# my $pl = $test =~ /^(?:eq|p:.)$/
899# ? $name
900# : Lingua::EN::Inflect::PL $name;
901#
902# if ($pl ne $a->{name_pl}) {
903# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
904# }
905# }
442 } 906 }
443 907
444 sub inst_arch($) { 908 sub inst_arch($) {
445 my (undef, $path) = @_; 909 my (undef, $path) = @_;
446 910
… …
455 "Unless you run verbosely, all following warning\n", 919 "Unless you run verbosely, all following warning\n",
456 "or error messages indicate serious problems.\n", 920 "or error messages indicate serious problems.\n",
457 "\n"; 921 "\n";
458 922
459 if (!-d "$path/treasures") { 923 if (!-d "$path/treasures") {
460 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 924 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
461 exit 1 unless $FORCE; 925 exit 1 unless $FORCE;
462 } 926 }
463 927
928 print "starting file scan, arc, any processing...\n" if $VERBOSE;
929
930 my @a_arc = map +(async \&process_arc), 1..2;
931 my @a_any = map +(async \&process_any), 1..4;
932
464 find_files $path; 933 find_files $path;
465 IO::AIO::flush;
466 934
467 $_->join for ( 935 $c_arc->shutdown;
936 $c_any->shutdown;
937
938 $_->join for @a_arc; # need to parse all archetypes before png processing
939 print "finished arc processing...\n" if $VERBOSE;
940
941 # fill png queue
942 for (keys %FACEINFO) {
943 # we only expect source pngs to exist for non-derived
944 # faces, i.e. no split tiles (+x+x) and no face derivates
945 # (xxx:)
946 /^[^:]+\....$/
947 or next;
948
949 my $seen;
950
951 if (exists $PNG{"$_.32x32.png"}) {
952 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
953 $seen = 1;
954 }
955 if (exists $PNG{"$_.64x64.png"}) {
956 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
957 $seen = 1;
958 }
959
960 warn "ERROR: $_: face not found, expect problems.\n"
961 unless $seen;
962 }
963
964 print "starting png processing...\n" if $VERBOSE;
965
468 # four png crunchers work fine for my 2x smp machine 966 # eight png crunchers work fine for my 4x smp machine
469 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 967 my @a_png = map +(async \&process_png), 1..8;
470 (async \&process_trs), (async \&process_trs),
471 (async \&process_arc), (async \&process_arc),
472 (async \&process_res), (async \&process_res),
473 );
474 968
969 $_->join for @a_any;
970 print "finished any processing...\n" if $VERBOSE;
971
972 $_->join for @a_png;
973 print "finished png processing...\n" if $VERBOSE;
974
975 print "scanning done, processing results...\n" if $VERBOSE;
475 { 976 {
476 # remove path prefix from editor_folder 977 # remove path prefix from editor_folder
978 $_->{editor_folder} =~ /^\x00/
477 substr $_->{editor_folder}, 0, 1 + length $path, "" 979 and substr $_->{editor_folder}, 0, 2 + length $path, ""
478 for values %ARC; 980 for values %ARC;
479 981
982 print "resolving inheritance tree...\n" if $VERBOSE;
480 # resolve inherit 983 # resolve inherit
481 while () { 984 while () {
482 my $progress; 985 my $progress;
483 my $loop; 986 my $loop;
484 987
485 for my $o (values %ARC) { 988 for my $o (values %ARC) {
486 if (my $other = $o->{inherit}) { 989 for my $other (split /,/, $o->{inherit}) {
487 if (my $s = $ARC{$other}) { 990 if (my $s = $ARC{$other}) {
488 if ($s->{inherit}) { 991 if ($s->{inherit}) {
489 $loop = $s; 992 $loop = $s;
490 } else { 993 } else {
491 delete $o->{inherit}; 994 delete $o->{inherit};
… …
493 delete @s{qw(_name more name name_pl)}; 996 delete @s{qw(_name more name name_pl)};
494 %$o = ( %s, %$o ); 997 %$o = ( %s, %$o );
495 ++$progress; 998 ++$progress;
496 } 999 }
497 } else { 1000 } else {
498 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 1001 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
499 delete $ARC{$o->{_name}}; 1002 delete $ARC{$o->{_name}};
500 } 1003 }
501 } 1004 }
502 } 1005 }
503 1006
… …
510 } 1013 }
511 1014
512 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 1015 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
513 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1016 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
514 1017
1018 # fix up archetypes without names, where the archanme doesn't work at all
1019 for (@ARC) {
1020 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1021 for ($_->{name} = $_->{_name}) {
1022 s/(?:_\d+)+$//;
1023 s/_[nesw]+$//;
1024 y/_/ /;
1025 }
1026 }
1027 }
1028
1029 #print "generating plurals...\n" if $VERBOSE;
1030 #generate_plurals;
1031
1032 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
515 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1033 open my $fh, ">:utf8", "$DATADIR/archetypes~"
516 or die "$DATADIR/archetypes~: $!"; 1034 or die "$DATADIR/archetypes~: $!";
517 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1035 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
518 } 1036 }
519 1037
520 { 1038 {
1039 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/treasures~" 1040 open my $fh, ">:utf8", "$DATADIR/treasures~"
522 or die "$DATADIR/treasures~: $!"; 1041 or die "$DATADIR/treasures~: $!";
523 print $fh $TRS; 1042 print $fh $TRS;
524 } 1043 }
525 1044
526 { 1045 {
527 while (my ($k, $v) = each %FACEINFO) { 1046 print "processing facedata...\n" if $VERBOSE;
528 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
529 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
530
531 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
532 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
533
534 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
535 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
536
537 if (my $magicmap = $v->{magicmap}) {
538 $magicmap =~ y/A-Z_\-/a-z/d;
539 $v->{magicmap} = $COLOR{$magicmap};
540 }
541 } 1047
1048 for my $k (sort keys %FACEINFO) {
1049 my $v = $FACEINFO{$k};
1050
1051 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
1052 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
1053
1054 make_hash $k, $v->{data32}, $v->{hash32};
1055 make_hash $k, $v->{data64}, $v->{hash64};
1056
1057 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
1058 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
1059
1060 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
1061 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
1062 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
1063
1064 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
1065 my $id = @TC;
1066 my $n = @{ $TC[-1] };
1067 my $x = $n % TC_W;
1068 my $y = int $n / TC_W;
1069
1070 push @{ $TC[-1] }, [$v, $x, $y];
1071
1072 $v->{tc} = [$id, $x, $y];
1073
1074 push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
1075 }
1076
1077 delete @$v{qw(w h arc stem derive)}; # not used by the server
1078 }
1079
1080if (0) { #d# texture catalogs
1081 print "creating texture catalogs...\n" if $VERBOSE;
1082
1083 for my $id (0 .. $#TC) {
1084 my $tc = $TC[$id];
1085
1086 my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
1087 my $idx = "a";
1088
1089 for (@$tc) {
1090 my $path = "$TMPDIR/tc" . $idx++;
1091
1092 open my $fh, ">:perlio", $path
1093 or die "$path: $!";
1094 syswrite $fh, $_->[0]{data64};
1095
1096 my $x = $_->[1] * 64;
1097 my $y = $_->[2] * 64;
1098
1099 $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
1100 }
1101
1102 system "$cmd png:\Q$TMPDIR/tc$id\E";
1103 optipng "$TMPDIR/tc$id";
1104 }
1105}
1106
1107 print "processing resources...\n" if $VERBOSE;
1108 my $enc = JSON::XS->new->utf8->canonical->relaxed;
1109 while (my ($k, $v) = each %RESOURCE) {
1110
1111 if ($v->{meta} && $v->{meta}{datadir}) {
1112 delete $RESOURCE{$k};
1113
1114 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
1115
1116 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
1117 open my $fh, ">:raw", "$DATADIR/$k~"
1118 or die "$DATADIR/$k~: $!";
1119 syswrite $fh, $v->{data};
1120 push @COMMIT, $k;
1121
1122 } else {
1123 if ($v->{type} & 1) {
1124 # prepend meta info
1125
1126 my $meta = $enc->encode ({
1127 name => $k,
1128 %{ $v->{meta} || {} },
1129 });
1130
1131 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
1132 }
1133
1134 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
1135 }
1136 }
1137
1138 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
1139 scalar keys %FACEINFO,
1140 scalar keys %ANIMINFO,
1141 scalar keys %RESOURCE
1142 if $VERBOSE;
542 1143
543 open my $fh, ">:perlio", "$DATADIR/facedata~" 1144 open my $fh, ">:perlio", "$DATADIR/facedata~"
544 or die "$DATADIR/facedata~: $!"; 1145 or die "$DATADIR/facedata~: $!";
545 1146
546 print $fh freeze { 1147 print $fh nfreeze {
547 version => 2, 1148 version => 2,
548 faceinfo => \%FACEINFO, 1149 faceinfo => \%FACEINFO,
549 animinfo => \%ANIMINFO, 1150 animinfo => \%ANIMINFO,
550 resource => \%RESOURCE, 1151 resource => \%RESOURCE,
551 }; 1152 };
552 } 1153 }
553 1154
1155 print "committing files...\n" if $VERBOSE;
1156
554 for (qw(archetypes facedata treasures)) { 1157 for (qw(archetypes facedata treasures), @COMMIT) {
555 chmod 0644, "$DATADIR/$_~"; 1158 chmod 0644, "$DATADIR/$_~";
556 rename "$DATADIR/$_~", "$DATADIR/$_" 1159 rename "$DATADIR/$_~", "$DATADIR/$_"
557 or die "$DATADIR/$_: $!"; 1160 or die "$DATADIR/$_: $!";
558 } 1161 }
559 1162

Diff Legend

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