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.32 by root, Thu Apr 26 00:41:32 2007 UTC vs.
Revision 1.126 by root, Wed Jan 11 11:39:02 2017 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@";
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;
83
84our %COLOR = (
85 # original cf colours
86 black => 0,
87 white => 1,
88 navy => 2, # "dark blue"
89 red => 3,
90 orange => 4,
91 blue => 5, # "light blue"
92 darkorange => 6,
93 green => 7,
94 lightgreen => 8,
95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
105 gray => 9,
106 yellow => 11,
107 khaki => 12,
108);
47 109
48END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
49 111
50Event->signal (signal => "INT", cb => sub { exit 1 }); 112my $s_INT = AE::signal INT => sub { exit 1 };
51Event->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}
52 141
53mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
54 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
55 144
56sub fork_sub(&) { 145sub fork_exec(&) {
57 my ($cb) = @_; 146 my ($cb) = @_;
58 147
59 if (my $pid = fork) { 148 if (my $pid = fork) {
60 my $current = $Coro::current; 149 my $current = $Coro::current;
61 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
66 warn $@; 155 warn $@;
67 POSIX::_exit 1; 156 POSIX::_exit 1;
68 } 157 }
69} 158}
70 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
71sub inst_maps($) { 189sub inst_maps($) {
72 my (undef, $path) = @_; 190 my (undef, $path) = @_;
73 191
74 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
75 193
76 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
77 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";
78 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
79 } 197 }
80 198
81 system $RSYNC, "-av", "$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"
82 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
83 204
84 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
85} 206}
86 207
87{ 208{
88 our %ANIMINFO; 209 our %ANIMINFO;
89 our %FACEINFO; 210 our %FACEINFO;
211 our %RESOURCE;
90 our @ARC; 212 our @ARC;
91 our %ARC; 213 our %ARC;
92 our $TRS; 214 our $TRS;
215 our %PNG;
93 our $NFILE; 216 our $NFILE;
217 our $PATH;
94 218
95 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
96 220
97 our (@png, @trs, @arc); # files we are interested in 221 our $c_arc = new Coro::Channel;
222 our $c_any = new Coro::Channel;
98 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
99 sub commit_png($$$) { 232 sub commit_png($$$$$$) {
100 my ($name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
101 234
235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
102 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
103 } 239 }
104 240
105 sub process_png { 241 sub process_png {
106 while (@png) { 242 while (@c_png) {
107 my ($path, $delete) = @{pop @png}; 243 my ($path, $delete) = @{pop @c_png};
108 244
109 my $png; 245 my $png;
110 aio_lstat $path; 246 aio_lstat $path;
111 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
112 248
113 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
114 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
115 next; 251 next;
116 } 252 }
117 253
118 my $stem = $path; 254 my $stem = $path;
119 my $T; 255 my $T;
121 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
122 $T = 32; 258 $T = 32;
123 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
124 $T = 64; 260 $T = 64;
125 } else { 261 } else {
126 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
127 next; 263 next;
128 } 264 }
129 265
130 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
131 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
132 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
133 next; 269 next;
134 } 270 }
135 271
136 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
137 273
138 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
139 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
140 next; 276 next;
141 } 277 }
142 278
143 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
144 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
145 next; 281 next;
146 } 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} || { };
147 293
148 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
149 # possibly enlarge 295 # possibly enlarge
150 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
151 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
152 298
153 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
154 my $wrap = 0; # for the time being
155 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
156 system "convert png:\Q$path\E -depth 8 rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
157 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
158 . "| 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~"
159 and die "convert/hq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
160 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
161 die "$other~ has zero size, aborting." unless -s "$other~";
162 rename "$other~", $other; 365 rename "$other~", $other;
163 }; 366 };
164 } 367 };
165 368
166 push @png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
167 } 370 }
168 371
169 # possibly scale down 372 # possibly scale down
170 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
171 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
172 375
173 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
174 fork_sub { 377 fork_exec {
175 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~";
176 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
177 380
178 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
382 # obsolete, no longer required
179 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
180 my $ncolor = 256; 384 my $ncolor = 256;
181 while () { 385 while () {
182 system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
183 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
184 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
185 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
186 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
187 } 391 }
188 392
193 } 397 }
194 398
195 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
196 rename "$other~", $other; 400 rename "$other~", $other;
197 }; 401 };
198 } 402 };
199 403
200 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
201 push @png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
202 } 406 }
203 } 407 }
204 408
205 (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 }
206 460
207 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
208 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
209 # split 463 # split
210 my @tile; 464 my @tile;
215 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
216 } 470 }
217 } 471 }
218 472
219 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
220 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
221 if (@todo) { 475 if (@todo) {
222 fork_sub { 476 fork_exec {
223 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
224 "png:-", 478 "png:-",
225 (map { 479 (map {
226 ( 480 (
227 "(", 481 "(",
240 print $convert $png; 494 print $convert $png;
241 close $convert; 495 close $convert;
242 496
243 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
244 for (@todo) { 498 for (@todo) {
245 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
246 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
247 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
248 } 501 }
249 }; 502 };
250 } 503 }
251 504
255 508
256 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
257 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
258 } 511 }
259 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
260 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 513 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
261 } 514 }
262 } else { 515 } else {
263 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
264 commit_png $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
265 } 518 }
266 519
267 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 }
268 } 562 }
269 } 563 }
270 564
271 sub process_arc { 565 sub process_arc {
272 while (@arc) { 566 while (my ($dir, $file) = @{ $c_arc->get }) {
273 my ($dir, $file) = @{pop @arc};
274
275 my $arc; 567 my $arc;
276 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 :/
277 569
278 my $arc = read_arch "$dir/$file"; 570 my $arc = read_arch "$dir/$file";
279 for my $o (values %$arc) { 571 for my $o (values %$arc) {
280 push @ARC, $o; 572 push @ARC, $o;
281 for (my $m = $o; $m; $m = $m->{more}) { 573 for (my $m = $o; $m; $m = $m->{more}) {
282 $ARC{$m->{_name}} = $m; 574 $ARC{$m->{_name}} = $m;
283 } 575 }
284 576
285 $o->{editor_folder} = $dir; 577 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
286
287 my $visibility = delete $o->{visibility};
288 my $magicmap = delete $o->{magicmap};
289 578
290 # find upper left corner :/ 579 # find upper left corner :/
291 # omg, this is sooo broken 580 # omg, this is sooo broken
292 my ($dx, $dy); 581 my ($dx, $dy);
293 for (my $o = $o; $o; $o = $o->{more}) { 582 for (my $o = $o; $o; $o = $o->{more}) {
300 my $y = $o->{y} - $dy; 589 my $y = $o->{y} - $dy;
301 590
302 my $ext = $x|$y ? "+$x+$y" : ""; 591 my $ext = $x|$y ? "+$x+$y" : "";
303 592
304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 593 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
305
306 my $visibility = delete $o->{visibility} if exists $o->{visibility};
307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
308 594
309 my $anim = delete $o->{anim}; 595 my $anim = delete $o->{anim};
310 596
311 if ($anim) { 597 if ($anim) {
312 # possibly add $ext to the animation name to avoid 598 # possibly add $ext to the animation name to avoid
330 facings => $facings, 616 facings => $facings,
331 frames => \@frames, 617 frames => \@frames,
332 }; 618 };
333 } 619 }
334 620
335 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
336 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
337
338 my $info = $FACEINFO{$face} ||= {};
339
340 $info->{visibility} = $visibility if defined $visibility;
341 $info->{magicmap} = $magicmap if defined $magicmap;
342 } 636 }
343 637
344 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
345 my %kv =split /\s+/, $smooth; 639 my %kv = split /\s+/, $smooth;
346 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 640 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
347 while (my ($face, $smooth) = each %kv) { 641 while (my ($face, $smooth) = each %kv) {
642 $FACEINFO{$smooth}{arc} = $o;
643
348 $FACEINFO{$face}{smooth} = $smooth; 644 $FACEINFO{$face}{smooth} = $smooth;
349 $FACEINFO{$face}{smoothlevel} = $level; 645 $FACEINFO{$face}{smoothlevel} = $level;
350 } 646 }
351 } 647 }
352 } 648 }
353 } 649 }
354 } 650 }
355 } 651 }
356 652
357 sub process_trs { 653 sub process_trs {
358 while (@trs) {
359 my ($dir, $file) = @{pop @trs}; 654 my ($dir, $file) = @_;
360 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
361 656
362 my $trs; 657 my $trs;
363 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
364 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 $@;
365 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~";
366 } 736 };
737 };
367 738
368 $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,
749 }
750 }
751
752 sub process_res {
753 my ($dir, $file, $type) = @_;
754
755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
757
758 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
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 # all these are acceptable for deliantra - if not specified, agpl 3+ is the default.
776 $meta->{license} = ({
777 "pd" => "Public Domain",
778 "gpl" => "GNU General Public License, version 3.0 or any later",
779 "2bsd" => "2-clause BSD/MIT style license",
780 "3bsd" => "3-clause BSD style license",
781 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
782 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
783 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
784 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
785 })->{$meta->{license}}
786 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
787 }
788
789 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
790 ($meta->{author} = $1) =~ s/_/ /g;
791 }
792
793 $file =~ s/\.(res|ogg|wav|jpg|png)$// unless $meta->{keep_suffix};
794
795 if ($file =~ s/\.plt$//) {
796 $data = process_plt "$dir/$file", $data;
797 } elsif (my $filter = delete $meta->{cfutil_filter}) {
798 if ($filter eq "yaml2json") {
799 $data = JSON::XS::encode_json YAML::XS::Load $data;
800 } elsif ($filter eq "json2json") {
801 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
802 } elsif ($filter eq "perl2json") {
803 $data = eval $data; die if $@;
804 $data = JSON::XS::encode_json $data;
805 } else {
806 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
807 }
808 }
809
810 substr $dir, 0, 1 + length $PATH, "";
811
812 my %info = (
813 type => (exists $meta->{type} ? delete $meta->{type} : $type),
814 data => $data,
815 %$meta ? (meta => $meta) : (),
816 );
817
818 $RESOURCE{"$dir/$file"} = \%info;
819 }
820
821 sub process_any {
822 while (my ($func, @args) = @{ $c_any->get }) {
823 $func->(@args);
369 } 824 }
370 } 825 }
371 826
372 sub find_files; 827 sub find_files;
373 sub find_files { 828 sub find_files {
374 my ($path) = @_; 829 my ($path) = @_;
375 830
831 my $grp = IO::AIO::aio_group;
832
833 my $scandir; $scandir = sub {
834 my ($path) = @_;
835
376 IO::AIO::aioreq_pri 4; 836 IO::AIO::aioreq_pri 4;
377 IO::AIO::aio_scandir $path, 4, sub { 837 add $grp IO::AIO::aio_scandir $path, 4, sub {
378 my ($dirs, $nondirs) = @_; 838 my ($dirs, $nondirs) = @_;
379 839
380 find_files "$path/$_" 840 $scandir->("$path/$_")
381 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 841 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
382 842
843 my $dir = $path;
844 substr $dir, 0, 1 + length $PATH, "";
845
383 for my $file (@$nondirs) { 846 for my $file (@$nondirs) {
847 if ($dir =~ /^music(?:\/|$)/) {
848 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
849 if $file =~ /\.(ogg)$/;
850
851 } elsif ($dir =~ /^sound(?:\/|$)/) {
852 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
853 if $file =~ /\.(wav|ogg)$/;
854
855 } elsif ($dir =~ /^res(?:\/|$)/) {
856 if ($file =~ /\.(jpg|png)$/) {
857 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
858 } elsif ($file =~ /\.(res)$/) {
859 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
860 } else {
861 $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
862 }
863
384 if ($file =~ /\.png$/) { 864 } elsif ($file =~ /\.png$/) {
385 push @png, ["$path/$file", 0]; 865 $PNG{$file} = $path;
866
867 } elsif ($file =~ /\.faceinfo$/) {
868 $c_any->put ([\&process_faceinfo, $path, $file]);
869
386 } elsif ($file =~ /\.trs$/) { 870 } elsif ($file =~ /\.trs$/) {
387 push @trs, [$path, $file]; 871 $c_any->put ([\&process_trs, $path, $file]);
872
388 } elsif ($file =~ /\.arc$/) { 873 } elsif ($file =~ /\.arc$/) {
389 push @arc, [$path, $file]; 874 $c_arc->put ([$path, $file]);
875
390 } else { 876 } else {
391 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 877 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
392 } 878 }
879 }
393 } 880 };
394 }; 881 };
882
883 $scandir->($path);
884 aio_wait $grp;
885 }
886
887 sub generate_plurals {
888# use Lingua::EN::Inflect ();
889# Lingua::EN::Inflect::classical;
890# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
891# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
892#
893# for my $a (@ARC) {
894# my $name = $a->{name} || $a->{_name};
895#
896# next unless $a->{name_pl};
897# next if $a->{invisible};
898# next if $a->{is_floor};
899# next if $a->{no_pick};
900#
901# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
902# my $pl = $test =~ /^(?:eq|p:.)$/
903# ? $name
904# : Lingua::EN::Inflect::PL $name;
905#
906# if ($pl ne $a->{name_pl}) {
907# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
908# }
909# }
395 } 910 }
396 911
397 sub inst_arch($) { 912 sub inst_arch($) {
398 my (undef, $path) = @_; 913 my (undef, $path) = @_;
914
915 $PATH = $path;
399 916
400 print "\n", 917 print "\n",
401 "Installing '$path' to '$DATADIR'\n", 918 "Installing '$path' to '$DATADIR'\n",
402 "\n", 919 "\n",
403 "This can take a long time if you run this\n", 920 "This can take a long time if you run this\n",
406 "Unless you run verbosely, all following warning\n", 923 "Unless you run verbosely, all following warning\n",
407 "or error messages indicate serious problems.\n", 924 "or error messages indicate serious problems.\n",
408 "\n"; 925 "\n";
409 926
410 if (!-d "$path/treasures") { 927 if (!-d "$path/treasures") {
411 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 928 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
412 exit 1 unless $FORCE; 929 exit 1 unless $FORCE;
413 } 930 }
414 931
932 print "starting file scan, arc, any processing...\n" if $VERBOSE;
933
934 my @a_arc = map +(async \&process_arc), 1..2;
935 my @a_any = map +(async \&process_any), 1..4;
936
415 find_files $path; 937 find_files $path;
416 IO::AIO::flush;
417 938
418 $_->join for ( 939 $c_arc->shutdown;
940 $c_any->shutdown;
941
942 $_->join for @a_arc; # need to parse all archetypes before png processing
943 print "finished arc processing...\n" if $VERBOSE;
944
945 # fill png queue
946 for (keys %FACEINFO) {
947 # we only expect source pngs to exist for non-derived
948 # faces, i.e. no split tiles (+x+x) and no face derivates
949 # (xxx:)
950 /^[^:]+\....$/
951 or next;
952
953 my $seen;
954
955 if (exists $PNG{"$_.32x32.png"}) {
956 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
957 $seen = 1;
958 }
959 if (exists $PNG{"$_.64x64.png"}) {
960 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
961 $seen = 1;
962 }
963
964 warn "ERROR: $_: face not found, expect problems.\n"
965 unless $seen;
966 }
967
968 print "starting png processing...\n" if $VERBOSE;
969
419 # four png crunchers work fine for my 2x smp machine 970 # eight png crunchers work fine for my 4x smp machine
420 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 971 my @a_png = map +(async \&process_png), 1..8;
421 (async \&process_trs), (async \&process_trs),
422 (async \&process_arc), (async \&process_arc),
423 );
424 972
973 $_->join for @a_any;
974 print "finished any processing...\n" if $VERBOSE;
975
976 $_->join for @a_png;
977 print "finished png processing...\n" if $VERBOSE;
978
979 print "scanning done, processing results...\n" if $VERBOSE;
425 { 980 {
426 # remove path prefix from editor_folder 981 # remove path prefix from editor_folder
982 $_->{editor_folder} =~ /^\x00/
427 substr $_->{editor_folder}, 0, 1 + length $path, "" 983 and substr $_->{editor_folder}, 0, 2 + length $path, ""
428 for values %ARC; 984 for values %ARC;
429 985
986 print "resolving inheritance tree...\n" if $VERBOSE;
430 # resolve inherit 987 # resolve inherit
431 while () { 988 while () {
432 my $progress; 989 my $progress;
433 my $loop; 990 my $loop;
434 991
435 for my $o (values %ARC) { 992 for my $o (values %ARC) {
436 if (my $other = $o->{inherit}) { 993 for my $other (split /,/, $o->{inherit}) {
437 if (my $s = $ARC{$other}) { 994 if (my $s = $ARC{$other}) {
438 if ($s->{inherit}) { 995 if ($s->{inherit}) {
439 $loop = $s; 996 $loop = $s;
440 } else { 997 } else {
441 delete $o->{inherit}; 998 delete $o->{inherit};
443 delete @s{qw(_name more name name_pl)}; 1000 delete @s{qw(_name more name name_pl)};
444 %$o = ( %s, %$o ); 1001 %$o = ( %s, %$o );
445 ++$progress; 1002 ++$progress;
446 } 1003 }
447 } else { 1004 } else {
448 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 1005 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
449 delete $ARC{$o->{_name}}; 1006 delete $ARC{$o->{_name}};
450 } 1007 }
451 } 1008 }
452 } 1009 }
453 1010
457 1014
458 last; 1015 last;
459 } 1016 }
460 } 1017 }
461 1018
1019 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
1020 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
1021
1022 # fix up archetypes without names, where the archanme doesn't work at all
1023 for (@ARC) {
1024 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1025 for ($_->{name} = $_->{_name}) {
1026 s/(?:_\d+)+$//;
1027 s/_[nesw]+$//;
1028 y/_/ /;
1029 }
1030 }
1031 }
1032
1033 #print "generating plurals...\n" if $VERBOSE;
1034 #generate_plurals;
1035
1036 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
462 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1037 open my $fh, ">:utf8", "$DATADIR/archetypes~"
463 or die "$DATADIR/archetypes~: $!"; 1038 or die "$DATADIR/archetypes~: $!";
464 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1039 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
465 } 1040 }
466 1041
467 { 1042 {
1043 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
468 open my $fh, ">:utf8", "$DATADIR/treasures~" 1044 open my $fh, ">:utf8", "$DATADIR/treasures~"
469 or die "$DATADIR/treasures~: $!"; 1045 or die "$DATADIR/treasures~: $!";
470 print $fh $TRS; 1046 print $fh $TRS;
471 } 1047 }
472 1048
473 { 1049 {
474 while (my ($k, $v) = each %FACEINFO) { 1050 print "processing facedata...\n" if $VERBOSE;
475 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
476 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
477
478 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
479 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
480
481 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
482 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
483 } 1051
1052 for my $k (sort keys %FACEINFO) {
1053 my $v = $FACEINFO{$k};
484 1054
1055 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
1056 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
1057
1058 make_hash $k, $v->{data32}, $v->{hash32};
1059 make_hash $k, $v->{data64}, $v->{hash64};
1060
1061 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
1062 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
1063
1064 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
1065 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
1066 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
1067
1068 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
1069 my $id = @TC;
1070 my $n = @{ $TC[-1] };
1071 my $x = $n % TC_W;
1072 my $y = int $n / TC_W;
1073
1074 push @{ $TC[-1] }, [$v, $x, $y];
1075
1076 $v->{tc} = [$id, $x, $y];
1077
1078 push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
1079 }
1080
1081 delete @$v{qw(w h arc stem derive)}; # not used by the server
1082 }
1083
1084if (0) { #d# texture catalogs
1085 print "creating texture catalogs...\n" if $VERBOSE;
1086
1087 for my $id (0 .. $#TC) {
1088 my $tc = $TC[$id];
1089
1090 my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
1091 my $idx = "a";
1092
1093 for (@$tc) {
1094 my $path = "$TMPDIR/tc" . $idx++;
1095
1096 open my $fh, ">:perlio", $path
1097 or die "$path: $!";
1098 syswrite $fh, $_->[0]{data64};
1099
1100 my $x = $_->[1] * 64;
1101 my $y = $_->[2] * 64;
1102
1103 $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
1104 }
1105
1106 system "$cmd png:\Q$TMPDIR/tc$id\E";
1107 optipng "$TMPDIR/tc$id";
1108 }
1109}
1110
1111 print "processing resources...\n" if $VERBOSE;
1112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
1113 for my $k (sort keys %RESOURCE) {
1114 my $v = $RESOURCE{$k};
1115
1116 if ($v->{meta} && $v->{meta}{datadir}) {
1117 delete $RESOURCE{$k};
1118
1119 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
1120
1121 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
1122 open my $fh, ">:raw", "$DATADIR/$k~"
1123 or die "$DATADIR/$k~: $!";
1124 syswrite $fh, $v->{data};
1125 push @COMMIT, $k;
1126
1127 } else {
1128 if ($v->{type} & 1) {
1129 # prepend meta info
1130
1131 my $meta = $enc->encode ({
1132 name => $k,
1133 %{ $v->{meta} || {} },
1134 });
1135
1136 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
1137 }
1138
1139 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
1140 }
1141 }
1142
1143 printf "writing facedata...\n" if $VERBOSE;
1144
1145 {
485 open my $fh, ">:perlio", "$DATADIR/facedata~" 1146 open my $fh, ">:perlio", "$DATADIR/facedata~"
486 or die "$DATADIR/facedata~: $!"; 1147 or die "$DATADIR/facedata~: $!";
487 1148
1149 print $fh "FACEDATA";
1150 my $fofs = 8;
1151
1152 my $put = sub {
1153 my $len = length $_[0];
1154 my $ofs = $fofs;
1155
1156 print $fh $_[0];
1157 $fofs += $len;
1158
1159 ($len, $ofs)
1160 };
1161
1162 for (values %FACEINFO) {
1163 ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
1164 ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
1165 }
1166
1167 for (values %RESOURCE) {
1168 ($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
1169 }
1170
1171 close $fh;
1172 }
1173
1174 printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
1175 scalar keys %FACEINFO,
1176 scalar keys %ANIMINFO,
1177 scalar keys %RESOURCE
1178 if $VERBOSE;
1179
1180 open my $fh, ">:perlio", "$DATADIR/faceinfo~"
1181 or die "$DATADIR/faceinfo~: $!";
1182
488 print $fh freeze { 1183 print $fh nfreeze {
489 version => 2, 1184 version => 2,
490 faceinfo => \%FACEINFO, 1185 faceinfo => \%FACEINFO,
491 animinfo => \%ANIMINFO, 1186 animinfo => \%ANIMINFO,
1187 resource => \%RESOURCE,
492 }; 1188 };
493 } 1189 }
494 1190
1191 print "committing files...\n" if $VERBOSE;
1192
495 for (qw(archetypes facedata treasures)) { 1193 for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
496 chmod 0644, "$DATADIR/$_~"; 1194 chmod 0644, "$DATADIR/$_~";
497 rename "$DATADIR/$_~", "$DATADIR/$_" 1195 rename "$DATADIR/$_~", "$DATADIR/$_"
498 or die "$DATADIR/$_: $!"; 1196 or die "$DATADIR/$_: $!";
499 } 1197 }
500 1198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines