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.62 by root, Mon Sep 10 18:30:30 2007 UTC vs.
Revision 1.124 by root, Sun Nov 11 05:53:12 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 Coro::Util; 54use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
28use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
58
59use Deliantra;
29 60
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 62
32sub usage { 63sub usage {
33 warn <<EOF; 64 warn <<EOF;
… …
46my $VERBOSE = 1; 77my $VERBOSE = 1;
47my $CACHE = 0; 78my $CACHE = 0;
48my $FORCE; 79my $FORCE;
49my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
50my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
51 83
52our %COLOR = ( 84our %COLOR = (
85 # original cf colours
53 black => 0, 86 black => 0,
54 white => 1, 87 white => 1,
55 navy => 2, 88 navy => 2, # "dark blue"
56 red => 3, 89 red => 3,
57 orange => 4, 90 orange => 4,
58 blue => 5, 91 blue => 5, # "light blue"
59 darkorange => 6, 92 darkorange => 6,
60 green => 7, 93 green => 7,
61 lightgreen => 8, 94 lightgreen => 8,
62 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
63 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
64 gold => 11, 105 gray => 9,
106 yellow => 11,
65 tan => 12, 107 khaki => 12,
66); 108);
67 109
68END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
69 111
70Event->signal (signal => "INT", cb => sub { exit 1 }); 112my $s_INT = AE::signal INT => sub { exit 1 };
71Event->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}
72 141
73mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
75 144
76sub fork_sub(&) { 145sub fork_exec(&) {
77 my ($cb) = @_; 146 my ($cb) = @_;
78 147
79 if (my $pid = fork) { 148 if (my $pid = fork) {
80 my $current = $Coro::current; 149 my $current = $Coro::current;
81 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
… …
86 warn $@; 155 warn $@;
87 POSIX::_exit 1; 156 POSIX::_exit 1;
88 } 157 }
89} 158}
90 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
91sub inst_maps($) { 189sub inst_maps($) {
92 my (undef, $path) = @_; 190 my (undef, $path) = @_;
93 191
94 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
95 193
96 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
97 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";
98 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
99 } 197 }
100 198
101 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
102 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
… …
112 our %FACEINFO; 210 our %FACEINFO;
113 our %RESOURCE; 211 our %RESOURCE;
114 our @ARC; 212 our @ARC;
115 our %ARC; 213 our %ARC;
116 our $TRS; 214 our $TRS;
215 our %PNG;
117 our $NFILE; 216 our $NFILE;
118 our $PATH; 217 our $PATH;
119 218
120 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
121 220
122 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
123 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
124 our $c_res = new Coro::Channel;
125 223
126 our @c_png; 224 our @c_png;
127 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
128 sub commit_png($$$) { 232 sub commit_png($$$$$$) {
129 my ($name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
130 234
235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
131 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
132 } 239 }
133 240
134 sub process_png { 241 sub process_png {
135 while (@c_png) { 242 while (@c_png) {
136 my ($path, $delete) = @{pop @c_png}; 243 my ($path, $delete) = @{pop @c_png};
… …
138 my $png; 245 my $png;
139 aio_lstat $path; 246 aio_lstat $path;
140 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
141 248
142 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
143 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
144 next; 251 next;
145 } 252 }
146 253
147 my $stem = $path; 254 my $stem = $path;
148 my $T; 255 my $T;
… …
150 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
151 $T = 32; 258 $T = 32;
152 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
153 $T = 64; 260 $T = 64;
154 } else { 261 } else {
155 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
156 next; 263 next;
157 } 264 }
158 265
159 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
160 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
161 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
162 next; 269 next;
163 } 270 }
164 271
165 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
166 273
167 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
168 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
169 next; 276 next;
170 } 277 }
171 278
172 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
173 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
174 next; 281 next;
175 } 282 }
176 283
177 (my $base = $stem) =~ s/^.*\///; 284 (my $base = $stem) =~ s/^.*\///;
178 285
… …
187 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
188 # possibly enlarge 295 # possibly enlarge
189 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
190 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
191 298
192 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
193 fork_sub { 300 fork_exec {
194 my $CROP; 301 my $CROP;
195 my $SRC = "png:\Q$path\E"; 302 my $SRC = "png:\Q$path\E";
196 303
197 my $is_floor = $arc->{is_floor}; 304 my $is_floor = $arc->{is_floor};
198 my $is_wall = 0; 305 my $is_wall = 0;
… …
248 $x * ($w - 8) + 4, 355 $x * ($w - 8) + 4,
249 $y * ($h - 8) + 4; 356 $y * ($h - 8) + 4;
250 } 357 }
251 } 358 }
252 359
253 system "convert -depth 8 $SRC rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
254 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
255 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $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~"
256 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
257 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
258 die "$other~ has zero size, aborting." unless -s "$other~";
259 rename "$other~", $other; 365 rename "$other~", $other;
260 }; 366 };
261 } 367 };
262 368
263 push @c_png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
264 } 370 }
265 371
266 # possibly scale down 372 # possibly scale down
267 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
268 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
269 375
270 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
271 fork_sub { 377 fork_exec {
272 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~";
273 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
274 380
275 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
382 # obsolete, no longer required
276 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
277 my $ncolor = 256; 384 my $ncolor = 256;
278 while () { 385 while () {
279 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
280 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
281 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
282 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
283 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
284 } 391 }
285 392
… …
290 } 397 }
291 398
292 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
293 rename "$other~", $other; 400 rename "$other~", $other;
294 }; 401 };
295 } 402 };
296 403
297 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
298 push @c_png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
299 } 406 }
300 } 407 }
301 408
302 (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 }
303 460
304 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
305 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
306 # split 463 # split
307 my @tile; 464 my @tile;
… …
312 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
313 } 470 }
314 } 471 }
315 472
316 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
317 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
318 if (@todo) { 475 if (@todo) {
319 fork_sub { 476 fork_exec {
320 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
321 "png:-", 478 "png:-",
322 (map { 479 (map {
323 ( 480 (
324 "(", 481 "(",
… …
337 print $convert $png; 494 print $convert $png;
338 close $convert; 495 close $convert;
339 496
340 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
341 for (@todo) { 498 for (@todo) {
342 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
343 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
344 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
345 } 501 }
346 }; 502 };
347 } 503 }
348 504
… …
352 508
353 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
354 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
355 } 511 }
356 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
357 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 513 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
358 } 514 }
359 } else { 515 } else {
360 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
361 commit_png $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
362 } 518 }
363 519
364 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 }
365 } 562 }
366 } 563 }
367 564
368 sub process_arc { 565 sub process_arc {
369 while (my $job = $c_arc->get) { 566 while (my ($dir, $file) = @{ $c_arc->get }) {
370 my ($dir, $file) = @$job;
371
372 my $arc; 567 my $arc;
373 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 :/
374 569
375 my $arc = read_arch "$dir/$file"; 570 my $arc = read_arch "$dir/$file";
376 for my $o (values %$arc) { 571 for my $o (values %$arc) {
377 push @ARC, $o; 572 push @ARC, $o;
378 for (my $m = $o; $m; $m = $m->{more}) { 573 for (my $m = $o; $m; $m = $m->{more}) {
379 $ARC{$m->{_name}} = $m; 574 $ARC{$m->{_name}} = $m;
380 } 575 }
381 576
382 $o->{editor_folder} = $dir; 577 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
383
384 my $visibility = delete $o->{visibility};
385 my $magicmap = delete $o->{magicmap};
386 578
387 # find upper left corner :/ 579 # find upper left corner :/
388 # omg, this is sooo broken 580 # omg, this is sooo broken
389 my ($dx, $dy); 581 my ($dx, $dy);
390 for (my $o = $o; $o; $o = $o->{more}) { 582 for (my $o = $o; $o; $o = $o->{more}) {
… …
397 my $y = $o->{y} - $dy; 589 my $y = $o->{y} - $dy;
398 590
399 my $ext = $x|$y ? "+$x+$y" : ""; 591 my $ext = $x|$y ? "+$x+$y" : "";
400 592
401 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 593 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
402
403 $visibility = delete $o->{visibility} if exists $o->{visibility};
404 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
405 594
406 my $anim = delete $o->{anim}; 595 my $anim = delete $o->{anim};
407 596
408 if ($anim) { 597 if ($anim) {
409 # possibly add $ext to the animation name to avoid 598 # possibly add $ext to the animation name to avoid
… …
433 next if /^facings\s/; 622 next if /^facings\s/;
434 623
435 my $face = $_; 624 my $face = $_;
436 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 625 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
437 626
438 my $info = $FACEINFO{$face} ||= { }; 627 # handle derived faces
628 if ($face =~ /^([^:]+):(.*)/) {
629 my ($type, $base) = ($1, $2);
630 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
631 }
632
439 $info->{arc} = $o; 633 $FACEINFO{$face}{arc} = $o;
440 634
441 next if $face =~ /^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
442
443 $info->{visibility} = $visibility if defined $visibility;
444 $info->{magicmap} = $magicmap if defined $magicmap;
445 } 636 }
446 637
447 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
448 my %kv = split /\s+/, $smooth; 639 my %kv = split /\s+/, $smooth;
449 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 640 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
458 } 649 }
459 } 650 }
460 } 651 }
461 652
462 sub process_trs { 653 sub process_trs {
463 while (my $job = $c_trs->get) {
464 my ($dir, $file) = @$job; 654 my ($dir, $file) = @_;
465 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
466 656
467 my $trs; 657 my $trs;
468 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
469 warn "$path: $!, skipping.\n"; 659 warn "ERROR: $path: $!, skipping.\n";
470 next; 660 return;
471 } 661 }
472 662
473 $TRS .= $trs; 663 $TRS .= $trs;
474 }
475 } 664 }
476 665
477 my %FILECACHE; 666 my %FILECACHE;
478 667
479 sub load_cached($;$) { 668 sub load_cached($;$) {
480 unless (exists $FILECACHE{$_[0]}) { 669 unless (exists $FILECACHE{$_[0]}) {
481 my $data; 670 my $data;
482 if (0 < aio_load $_[0], $data) { 671 if (0 < aio_load $_[0], $data) {
483 if ($_[1]) { 672 if ($_[1]) {
484 $data = eval { $_[1]->($data) }; 673 $data = eval { $_[1]->($data) };
485 warn "$_[0]: $@" if $@; 674 warn "ERROR: $_[0]: $@" if $@;
486 } 675 }
487 } 676 }
488 677
489 $FILECACHE{$_[0]} = $data; 678 $FILECACHE{$_[0]} = $data;
490 } 679 }
491 680
492 $FILECACHE{$_[0]} 681 $FILECACHE{$_[0]}
493 } 682 }
494 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~";
736 };
737 };
738
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
495 sub process_res { 752 sub process_res {
496 while (my $job = $c_res->get) {
497 my ($dir, $file, $type) = @$job; 753 my ($dir, $file, $type) = @_;
498 754
499 my $data;
500 aio_load "$dir/$file", $data; 755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
501 757
502
503 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 758 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
504 759
505 utf8::decode $dir; 760 utf8::decode $dir;
506 utf8::decode $file; 761 utf8::decode $file;
507 762
508 # a meta file for resources is now mandatory 763 # a meta file for resources is now mandatory
509 unless (exists $meta->{$file}) { 764 unless (exists $meta->{$file}) {
510 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 765 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
511 next; 766 return;
512 } 767 }
513 768
514 $meta = { 769 $meta = {
515 %{ $meta->{"" } || {} }, 770 %{ $meta->{"" } || {} },
516 %{ $meta->{$file} || {} }, 771 %{ $meta->{$file} || {} },
517 }; 772 };
518 773
519 if ($meta->{license} =~ s/^#//) { 774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
520 $meta->{license} = ({ 775 $meta->{license} = ({
521 "pd" => "Public Domain", 776 "pd" => "Public Domain",
522 "gpl" => "GNU General Public License, version 3.0 or any later", 777 "gpl" => "GNU General Public License, version 3.0 or any later",
523 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 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/",
524 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 780 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
525 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 781 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
526 })->{$meta->{license}} 782 })->{$meta->{license}}
527 || warn "$dir/$file: license tag '$meta->{license}' not found."; 783 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
528 } 784 }
529 785
786 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
787 ($meta->{author} = $1) =~ s/_/ /g;
788 }
789
530 $file =~ s/\.res$//; 790 $file =~ s/\.res$//;
531 $file =~ s/\.(ogg|wav|jpg|png)$//; 791 $file =~ s/\.(ogg|wav|jpg|png)$//;
532 792
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 }
807
533 substr $dir, 0, 1 + length $PATH, ""; 808 substr $dir, 0, 1 + length $PATH, "";
534 809
535 $RESOURCE{"$dir/$file"} = { 810 my %info = (
536 type => (delete $meta->{type}) || $type, 811 type => (exists $meta->{type} ? delete $meta->{type} : $type),
537 data => $data, 812 data => $data,
538 %$meta ? (meta => $meta) : (), 813 %$meta ? (meta => $meta) : (),
539 }; 814 );
815
816 $RESOURCE{"$dir/$file"} = \%info;
817 }
818
819 sub process_any {
820 while (my ($func, @args) = @{ $c_any->get }) {
821 $func->(@args);
540 } 822 }
541 } 823 }
542 824
543 sub find_files; 825 sub find_files;
544 sub find_files { 826 sub find_files {
545 my ($path) = @_; 827 my ($path) = @_;
546 828
829 my $grp = IO::AIO::aio_group;
830
831 my $scandir; $scandir = sub {
832 my ($path) = @_;
833
547 IO::AIO::aioreq_pri 4; 834 IO::AIO::aioreq_pri 4;
548 IO::AIO::aio_scandir $path, 4, sub { 835 add $grp IO::AIO::aio_scandir $path, 4, sub {
549 my ($dirs, $nondirs) = @_; 836 my ($dirs, $nondirs) = @_;
550 837
551 find_files "$path/$_" 838 $scandir->("$path/$_")
552 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 839 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
553 840
554 my $dir = $path; 841 my $dir = $path;
555 substr $dir, 0, 1 + length $PATH, ""; 842 substr $dir, 0, 1 + length $PATH, "";
556 843
557 for my $file (@$nondirs) { 844 for my $file (@$nondirs) {
558 if ($dir =~ /^music(?:\/|$)/) { 845 if ($dir =~ /^music(?:\/|$)/) {
559 $c_res->put ([$path, $file, 3]) # FT_MUSIC 846 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
560 if $file =~ /\.(ogg)$/; 847 if $file =~ /\.(ogg)$/;
561 848
562 } elsif ($dir =~ /^sound(?:\/|$)/) { 849 } elsif ($dir =~ /^sound(?:\/|$)/) {
563 $c_res->put ([$path, $file, 5]) # FT_SOUND 850 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
564 if $file =~ /\.(wav|ogg)$/; 851 if $file =~ /\.(wav|ogg)$/;
565 852
566 } elsif ($dir =~ /^res(?:\/|$)/) { 853 } elsif ($dir =~ /^res(?:\/|$)/) {
567 $c_res->put ([$path, $file, 0]) # FT_FACE
568 if $file =~ /\.(jpg|png)$/; 854 if ($file =~ /\.(jpg|png)$/) {
569 $c_res->put ([$path, $file, 7]) # FT_RSRC 855 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
570 if $file =~ /\.(res)$/; 856 } elsif ($file =~ /\.(res)$/) {
857 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
858 } else {
859 $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
860 }
571 861
572 } elsif ($file =~ /\.png$/) { 862 } elsif ($file =~ /\.png$/) {
573 push @c_png, ["$path/$file", 0]; 863 $PNG{$file} = $path;
574 864
865 } elsif ($file =~ /\.faceinfo$/) {
866 $c_any->put ([\&process_faceinfo, $path, $file]);
867
575 } elsif ($file =~ /\.trs$/) { 868 } elsif ($file =~ /\.trs$/) {
576 $c_trs->put ([$path, $file]); 869 $c_any->put ([\&process_trs, $path, $file]);
577 870
578 } elsif ($file =~ /\.arc$/) { 871 } elsif ($file =~ /\.arc$/) {
579 $c_arc->put ([$path, $file]); 872 $c_arc->put ([$path, $file]);
580 873
581 } else { 874 } else {
582 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 875 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
583 } 876 }
877 }
584 } 878 };
585 }; 879 };
880
881 $scandir->($path);
882 aio_wait $grp;
883 }
884
885 sub generate_plurals {
886# use Lingua::EN::Inflect ();
887# Lingua::EN::Inflect::classical;
888# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
889# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
890#
891# for my $a (@ARC) {
892# my $name = $a->{name} || $a->{_name};
893#
894# next unless $a->{name_pl};
895# next if $a->{invisible};
896# next if $a->{is_floor};
897# next if $a->{no_pick};
898#
899# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
900# my $pl = $test =~ /^(?:eq|p:.)$/
901# ? $name
902# : Lingua::EN::Inflect::PL $name;
903#
904# if ($pl ne $a->{name_pl}) {
905# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
906# }
907# }
586 } 908 }
587 909
588 sub inst_arch($) { 910 sub inst_arch($) {
589 my (undef, $path) = @_; 911 my (undef, $path) = @_;
590 912
… …
599 "Unless you run verbosely, all following warning\n", 921 "Unless you run verbosely, all following warning\n",
600 "or error messages indicate serious problems.\n", 922 "or error messages indicate serious problems.\n",
601 "\n"; 923 "\n";
602 924
603 if (!-d "$path/treasures") { 925 if (!-d "$path/treasures") {
604 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 926 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
605 exit 1 unless $FORCE; 927 exit 1 unless $FORCE;
606 } 928 }
607 929
608 print "scanning files...\n" if $VERBOSE; 930 print "starting file scan, arc, any processing...\n" if $VERBOSE;
931
932 my @a_arc = map +(async \&process_arc), 1..2;
933 my @a_any = map +(async \&process_any), 1..4;
609 934
610 find_files $path; 935 find_files $path;
611 936
612 my @a_arc = map +(async \&process_arc), 1..2; 937 $c_arc->shutdown;
613 my @a_res = map +(async \&process_res), 1..2; 938 $c_any->shutdown;
614 my @a_trs = map +(async \&process_trs), 1..2;
615
616 IO::AIO::flush;
617
618 $c_res->put (undef) for @a_res;
619 $c_arc->put (undef) for @a_arc;
620 $c_trs->put (undef) for @a_trs;
621
622 print "start file scan, arc, res processing...\n" if $VERBOSE;
623 939
624 $_->join for @a_arc; # need to parse all archetypes before png processing 940 $_->join for @a_arc; # need to parse all archetypes before png processing
941 print "finished arc processing...\n" if $VERBOSE;
625 942
943 # fill png queue
944 for (keys %FACEINFO) {
945 # we only expect source pngs to exist for non-derived
946 # faces, i.e. no split tiles (+x+x) and no face derivates
947 # (xxx:)
948 /^[^:]+\....$/
949 or next;
950
951 my $seen;
952
953 if (exists $PNG{"$_.32x32.png"}) {
954 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
955 $seen = 1;
956 }
957 if (exists $PNG{"$_.64x64.png"}) {
958 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
959 $seen = 1;
960 }
961
962 warn "ERROR: $_: face not found, expect problems.\n"
963 unless $seen;
964 }
965
626 print "end arc, start png processing...\n" if $VERBOSE; 966 print "starting png processing...\n" if $VERBOSE;
627 967
628 # four png crunchers work fine for my 2x smp machine 968 # eight png crunchers work fine for my 4x smp machine
629 my @a_png = map +(async \&process_png), 1..4; 969 my @a_png = map +(async \&process_png), 1..8;
630 970
631 $_->join for (@a_trs, @a_res, @a_png); 971 $_->join for @a_any;
972 print "finished any processing...\n" if $VERBOSE;
973
974 $_->join for @a_png;
975 print "finished png processing...\n" if $VERBOSE;
632 976
633 print "scanning done, processing results...\n" if $VERBOSE; 977 print "scanning done, processing results...\n" if $VERBOSE;
634 { 978 {
635 # remove path prefix from editor_folder 979 # remove path prefix from editor_folder
980 $_->{editor_folder} =~ /^\x00/
636 substr $_->{editor_folder}, 0, 1 + length $path, "" 981 and substr $_->{editor_folder}, 0, 2 + length $path, ""
637 for values %ARC; 982 for values %ARC;
638 983
639 print "resolving inheritance tree...\n" if $VERBOSE; 984 print "resolving inheritance tree...\n" if $VERBOSE;
640 # resolve inherit 985 # resolve inherit
641 while () { 986 while () {
642 my $progress; 987 my $progress;
643 my $loop; 988 my $loop;
644 989
645 for my $o (values %ARC) { 990 for my $o (values %ARC) {
646 if (my $other = $o->{inherit}) { 991 for my $other (split /,/, $o->{inherit}) {
647 if (my $s = $ARC{$other}) { 992 if (my $s = $ARC{$other}) {
648 if ($s->{inherit}) { 993 if ($s->{inherit}) {
649 $loop = $s; 994 $loop = $s;
650 } else { 995 } else {
651 delete $o->{inherit}; 996 delete $o->{inherit};
… …
653 delete @s{qw(_name more name name_pl)}; 998 delete @s{qw(_name more name name_pl)};
654 %$o = ( %s, %$o ); 999 %$o = ( %s, %$o );
655 ++$progress; 1000 ++$progress;
656 } 1001 }
657 } else { 1002 } else {
658 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 1003 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
659 delete $ARC{$o->{_name}}; 1004 delete $ARC{$o->{_name}};
660 } 1005 }
661 } 1006 }
662 } 1007 }
663 1008
… …
670 } 1015 }
671 1016
672 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 1017 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1018 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
674 1019
1020 # fix up archetypes without names, where the archanme doesn't work at all
1021 for (@ARC) {
1022 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1023 for ($_->{name} = $_->{_name}) {
1024 s/(?:_\d+)+$//;
1025 s/_[nesw]+$//;
1026 y/_/ /;
1027 }
1028 }
1029 }
1030
1031 #print "generating plurals...\n" if $VERBOSE;
1032 #generate_plurals;
1033
675 print "writing archetypes...\n" if $VERBOSE; 1034 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
676 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1035 open my $fh, ">:utf8", "$DATADIR/archetypes~"
677 or die "$DATADIR/archetypes~: $!"; 1036 or die "$DATADIR/archetypes~: $!";
678 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1037 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
679 } 1038 }
680 1039
681 { 1040 {
682 print "writing treasures...\n" if $VERBOSE; 1041 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
683 open my $fh, ">:utf8", "$DATADIR/treasures~" 1042 open my $fh, ">:utf8", "$DATADIR/treasures~"
684 or die "$DATADIR/treasures~: $!"; 1043 or die "$DATADIR/treasures~: $!";
685 print $fh $TRS; 1044 print $fh $TRS;
686 } 1045 }
687 1046
688 { 1047 {
689 print "processing facedata...\n" if $VERBOSE; 1048 print "processing facedata...\n" if $VERBOSE;
690 while (my ($k, $v) = each %FACEINFO) {
691 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
692 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
693
694 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
695 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
696
697 if (my $magicmap = $v->{magicmap}) {
698 $magicmap =~ y/A-Z_\-/a-z/d;
699 $v->{magicmap} = $COLOR{$magicmap};
700 }
701
702 delete $v->{arc};
703 } 1049
1050 for my $k (sort keys %FACEINFO) {
1051 my $v = $FACEINFO{$k};
704 1052
1053 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
1054 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
1055
1056 make_hash $k, $v->{data32}, $v->{hash32};
1057 make_hash $k, $v->{data64}, $v->{hash64};
1058
1059 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
1060 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
1061
1062 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
1063 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
1064 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
1065
1066 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
1067 my $id = @TC;
1068 my $n = @{ $TC[-1] };
1069 my $x = $n % TC_W;
1070 my $y = int $n / TC_W;
1071
1072 push @{ $TC[-1] }, [$v, $x, $y];
1073
1074 $v->{tc} = [$id, $x, $y];
1075
1076 push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
1077 }
1078
1079 delete @$v{qw(w h arc stem derive)}; # not used by the server
1080 }
1081
1082if (0) { #d# texture catalogs
1083 print "creating texture catalogs...\n" if $VERBOSE;
1084
1085 for my $id (0 .. $#TC) {
1086 my $tc = $TC[$id];
1087
1088 my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
1089 my $idx = "a";
1090
1091 for (@$tc) {
1092 my $path = "$TMPDIR/tc" . $idx++;
1093
1094 open my $fh, ">:perlio", $path
1095 or die "$path: $!";
1096 syswrite $fh, $_->[0]{data64};
1097
1098 my $x = $_->[1] * 64;
1099 my $y = $_->[2] * 64;
1100
1101 $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
1102 }
1103
1104 system "$cmd png:\Q$TMPDIR/tc$id\E";
1105 optipng "$TMPDIR/tc$id";
1106 }
1107}
1108
1109 print "processing resources...\n" if $VERBOSE;
1110 my $enc = JSON::XS->new->utf8->canonical->relaxed;
1111 for my $k (sort keys %RESOURCE) {
1112 my $v = $RESOURCE{$k};
1113
1114 if ($v->{meta} && $v->{meta}{datadir}) {
1115 delete $RESOURCE{$k};
1116
1117 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
1118
1119 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
1120 open my $fh, ">:raw", "$DATADIR/$k~"
1121 or die "$DATADIR/$k~: $!";
1122 syswrite $fh, $v->{data};
1123 push @COMMIT, $k;
1124
1125 } else {
1126 if ($v->{type} & 1) {
1127 # prepend meta info
1128
1129 my $meta = $enc->encode ({
1130 name => $k,
1131 %{ $v->{meta} || {} },
1132 });
1133
1134 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
1135 }
1136
1137 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
1138 }
1139 }
1140
705 print "writing facedata...\n" if $VERBOSE; 1141 printf "writing facedata...\n" if $VERBOSE;
1142
1143 {
706 open my $fh, ">:perlio", "$DATADIR/facedata~" 1144 open my $fh, ">:perlio", "$DATADIR/facedata~"
707 or die "$DATADIR/facedata~: $!"; 1145 or die "$DATADIR/facedata~: $!";
708 1146
1147 print $fh "FACEDATA";
1148 my $fofs = 8;
1149
1150 my $put = sub {
1151 my $len = length $_[0];
1152 my $ofs = $fofs;
1153
1154 print $fh $_[0];
1155 $fofs += $len;
1156
1157 ($len, $ofs)
1158 };
1159
1160 for (values %FACEINFO) {
1161 ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
1162 ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
1163 }
1164
1165 for (values %RESOURCE) {
1166 ($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
1167 }
1168
1169 close $fh;
1170 }
1171
1172 printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
1173 scalar keys %FACEINFO,
1174 scalar keys %ANIMINFO,
1175 scalar keys %RESOURCE
1176 if $VERBOSE;
1177
1178 open my $fh, ">:perlio", "$DATADIR/faceinfo~"
1179 or die "$DATADIR/faceinfo~: $!";
1180
709 print $fh freeze { 1181 print $fh nfreeze {
710 version => 2, 1182 version => 2,
711 faceinfo => \%FACEINFO, 1183 faceinfo => \%FACEINFO,
712 animinfo => \%ANIMINFO, 1184 animinfo => \%ANIMINFO,
713 resource => \%RESOURCE, 1185 resource => \%RESOURCE,
714 }; 1186 };
715 } 1187 }
716 1188
717 print "committing files...\n" if $VERBOSE; 1189 print "committing files...\n" if $VERBOSE;
718 1190
719 for (qw(archetypes facedata treasures)) { 1191 for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
720 chmod 0644, "$DATADIR/$_~"; 1192 chmod 0644, "$DATADIR/$_~";
721 rename "$DATADIR/$_~", "$DATADIR/$_" 1193 rename "$DATADIR/$_~", "$DATADIR/$_"
722 or die "$DATADIR/$_: $!"; 1194 or die "$DATADIR/$_: $!";
723 } 1195 }
724 1196

Diff Legend

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