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.100 by root, Wed Oct 6 03:44:55 2010 UTC vs.
Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC

1#!@PERL@ 1#!@PERL@
2 2
3# 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG. 4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5# 5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 6# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7# 7#
8# Deliantra is free software: you can redistribute it and/or modify it under 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 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 10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version. 11# option) any later version.
12# 12#
13# This program is distributed in the hope that it will be useful, 13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of 14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details. 16# GNU General Public License for more details.
17# 17#
18# You should have received a copy of the Affero GNU General Public License 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 19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>. 20# <http://www.gnu.org/licenses/>.
21# 21#
22# The authors can be reached via e-mail to <support@deliantra.net> 22# The authors can be reached via e-mail to <support@deliantra.net>
23# 23#
24 24
25use common::sense; 25use common::sense;
26 26
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
31 31
32my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
33#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
34my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
35my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
37 37
38use Getopt::Long; 38use Getopt::Long;
39use File::Temp; 39use File::Temp;
40use POSIX (); 40use POSIX ();
41use Carp; 41use Carp;
42 42
43use Coro::EV;
44use AnyEvent;
45use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 (); 48use Compress::LZF ();
49 49
50use AnyEvent;
50use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
51use Coro::AIO; 53use Coro::AIO;
52use Coro::Util; 54use Coro::Util;
53use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
54use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
55 58
56use Deliantra; 59use Deliantra;
57 60
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
77my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
79my @COMMIT; 82my @COMMIT;
80 83
81our %COLOR = ( 84our %COLOR = (
85 # original cf colours
82 black => 0, 86 black => 0,
83 white => 1, 87 white => 1,
84 navy => 2, 88 navy => 2, # "dark blue"
85 red => 3, 89 red => 3,
86 orange => 4, 90 orange => 4,
87 blue => 5, 91 blue => 5, # "light blue"
88 darkorange => 6, 92 darkorange => 6,
89 green => 7, 93 green => 7,
90 lightgreen => 8, 94 lightgreen => 8,
91 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
92 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
93 gold => 11, 105 gray => 9,
106 yellow => 11,
94 tan => 12, 107 khaki => 12,
95); 108);
96 109
97END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
98 111
99my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = AE::signal INT => sub { exit 1 };
100my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = AE::signal TERM => sub { exit 1 };
101 114
102our %hash; 115our %hash;
103 116
104# here we could try to avoid collisions and reduce chksum size further 117# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) { 118sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_; 119 my ($id, $dataref, $hashref, $clen) = @_;
107 120
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
109 122
110 if (exists $hash{$hash}) { 123 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical 124 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) { 125 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n"; 126 warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
114 exit 1; 127 exit 1;
115 } else { 128 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 } 130 }
118 } 131 }
119 $hash{$hash} = [$id, $dataref, $hashref]; 132 $hash{$hash} = [$id, $dataref, $hashref];
120 133
121 $$hashref = $hash; 134 $$hashref = $hash;
122} 135}
123 136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
141
124mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
125 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
126 144
127sub fork_sub(&) { 145sub fork_exec(&) {
128 my ($cb) = @_; 146 my ($cb) = @_;
129 147
130 if (my $pid = fork) { 148 if (my $pid = fork) {
131 my $current = $Coro::current; 149 my $current = $Coro::current;
132 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
137 warn $@; 155 warn $@;
138 POSIX::_exit 1; 156 POSIX::_exit 1;
139 } 157 }
140} 158}
141 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
142sub inst_maps($) { 189sub inst_maps($) {
143 my (undef, $path) = @_; 190 my (undef, $path) = @_;
144 191
145 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
146 193
147 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
148 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";
149 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
150 } 197 }
151 198
152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed", 201 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded" 202 "--delete", "--delete-excluded"
156 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
157 204
158 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\/shield/) {
177 "Ø"
178
179 } elsif ($stem =~ /^armour\//) {
180 "A"
181
182 } elsif ($stem =~ /^weapon\//) {
183 "†"
184
185 } elsif ($stem =~ /^readable\//) {
186 "✉"
187
188 } elsif ($stem =~ /^river\//) {
189 "~"
190
191 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
192 "·"
193
194 } elsif ($stem =~ /^spells\//) {
195 "!"
196
197 } elsif ($stem =~ /^player\//) {
198 "\@"
199
200 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
201 $1
202
203 } else {
204 substr $stem, 0, 1
205 }
206} 206}
207 207
208{ 208{
209 our %ANIMINFO; 209 our %ANIMINFO;
210 our %FACEINFO; 210 our %FACEINFO;
211 our %RESOURCE; 211 our %RESOURCE;
212 our @ARC; 212 our @ARC;
213 our %ARC; 213 our %ARC;
214 our $TRS; 214 our $TRS;
215 our %PNG;
215 our $NFILE; 216 our $NFILE;
216 our $PATH; 217 our $PATH;
217 218
218 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
219 220
220 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
221 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
222 our $c_res = new Coro::Channel;
223 223
224 our @c_png; 224 our @c_png;
225 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
226 sub commit_png($$$$) { 232 sub commit_png($$$$$$) {
227 my ($stem, $name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
228 234
229 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; 235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
230 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
231 } 239 }
232 240
233 sub process_png { 241 sub process_png {
234 while (@c_png) { 242 while (@c_png) {
235 my ($path, $delete) = @{pop @c_png}; 243 my ($path, $delete) = @{pop @c_png};
237 my $png; 245 my $png;
238 aio_lstat $path; 246 aio_lstat $path;
239 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
240 248
241 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
242 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
243 next; 251 next;
244 } 252 }
245 253
246 my $stem = $path; 254 my $stem = $path;
247 my $T; 255 my $T;
249 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
250 $T = 32; 258 $T = 32;
251 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
252 $T = 64; 260 $T = 64;
253 } else { 261 } else {
254 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
255 next; 263 next;
256 } 264 }
257 265
258 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
259 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
260 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
261 next; 269 next;
262 } 270 }
263 271
264 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
265 273
266 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
267 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
268 next; 276 next;
269 } 277 }
270 278
271 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
272 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
273 next; 281 next;
274 } 282 }
275 283
276 (my $base = $stem) =~ s/^.*\///; 284 (my $base = $stem) =~ s/^.*\///;
277 285
286 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
287 # possibly enlarge 295 # possibly enlarge
288 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
289 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
290 298
291 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
292 fork_sub { 300 fork_exec {
293 my $CROP; 301 my $CROP;
294 my $SRC = "png:\Q$path\E"; 302 my $SRC = "png:\Q$path\E";
295 303
296 my $is_floor = $arc->{is_floor}; 304 my $is_floor = $arc->{is_floor};
297 my $is_wall = 0; 305 my $is_wall = 0;
347 $x * ($w - 8) + 4, 355 $x * ($w - 8) + 4,
348 $y * ($h - 8) + 4; 356 $y * ($h - 8) + 4;
349 } 357 }
350 } 358 }
351 359
352 system "convert -depth 8 $SRC rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
353 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
354 . "| 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~"
355 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
356 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
357 die "$other~ has zero size, aborting." unless -s "$other~";
358 rename "$other~", $other; 365 rename "$other~", $other;
359 }; 366 };
360 } 367 };
361 368
362 push @c_png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
363 } 370 }
364 371
365 # possibly scale down 372 # possibly scale down
366 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
367 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
368 375
369 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
370 fork_sub { 377 fork_exec {
371 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~";
372 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
373 380
374 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
375 # obsolete, no longer required 382 # obsolete, no longer required
376 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
377 my $ncolor = 256; 384 my $ncolor = 256;
378 while () { 385 while () {
379 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
380 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
381 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
382 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
383 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
384 } 391 }
385 392
390 } 397 }
391 398
392 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
393 rename "$other~", $other; 400 rename "$other~", $other;
394 }; 401 };
395 } 402 };
396 403
397 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
398 push @c_png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
399 } 406 }
400 } 407 }
401 408
402 (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 }
403 460
404 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
405 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
406 # split 463 # split
407 my @tile; 464 my @tile;
412 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
413 } 470 }
414 } 471 }
415 472
416 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
417 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
418 if (@todo) { 475 if (@todo) {
419 fork_sub { 476 fork_exec {
420 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
421 "png:-", 478 "png:-",
422 (map { 479 (map {
423 ( 480 (
424 "(", 481 "(",
437 print $convert $png; 494 print $convert $png;
438 close $convert; 495 close $convert;
439 496
440 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
441 for (@todo) { 498 for (@todo) {
442 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
443 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
444 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
445 } 501 }
446 }; 502 };
447 } 503 }
448 504
452 508
453 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
454 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
455 } 511 }
456 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
457 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; 513 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
458 } 514 }
459 } else { 515 } else {
460 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
461 commit_png $stem, $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
462 } 518 }
463 519
464 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 }
465 } 562 }
466 } 563 }
467 564
468 sub process_arc { 565 sub process_arc {
469 while (my $job = $c_arc->get) { 566 while (my ($dir, $file) = @{ $c_arc->get }) {
470 my ($dir, $file) = @$job;
471
472 my $arc; 567 my $arc;
473 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 :/
474 569
475 my $arc = read_arch "$dir/$file"; 570 my $arc = read_arch "$dir/$file";
476 for my $o (values %$arc) { 571 for my $o (values %$arc) {
478 for (my $m = $o; $m; $m = $m->{more}) { 573 for (my $m = $o; $m; $m = $m->{more}) {
479 $ARC{$m->{_name}} = $m; 574 $ARC{$m->{_name}} = $m;
480 } 575 }
481 576
482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 577 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
483
484 my $visibility = delete $o->{visibility};
485 my $magicmap = delete $o->{magicmap};
486 my $glyph = delete $o->{glyph};
487 578
488 # find upper left corner :/ 579 # find upper left corner :/
489 # omg, this is sooo broken 580 # omg, this is sooo broken
490 my ($dx, $dy); 581 my ($dx, $dy);
491 for (my $o = $o; $o; $o = $o->{more}) { 582 for (my $o = $o; $o; $o = $o->{more}) {
498 my $y = $o->{y} - $dy; 589 my $y = $o->{y} - $dy;
499 590
500 my $ext = $x|$y ? "+$x+$y" : ""; 591 my $ext = $x|$y ? "+$x+$y" : "";
501 592
502 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 593 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
503
504 $visibility = delete $o->{visibility} if exists $o->{visibility};
505 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
506 $glyph = delete $o->{glyph} if exists $o->{glyph};
507 594
508 my $anim = delete $o->{anim}; 595 my $anim = delete $o->{anim};
509 596
510 if ($anim) { 597 if ($anim) {
511 # possibly add $ext to the animation name to avoid 598 # possibly add $ext to the animation name to avoid
535 next if /^facings\s/; 622 next if /^facings\s/;
536 623
537 my $face = $_; 624 my $face = $_;
538 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 625 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
539 626
540 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
541 $info->{arc} = $o; 633 $FACEINFO{$face}{arc} = $o;
542 634
543 next if $face =~ /^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
544
545 $info->{visibility} = $visibility if defined $visibility;
546 $info->{magicmap} = $magicmap if defined $magicmap;
547 $info->{glyph} = $glyph if defined $glyph;
548 } 636 }
549 637
550 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
551 my %kv = split /\s+/, $smooth; 639 my %kv = split /\s+/, $smooth;
552 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 640 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
561 } 649 }
562 } 650 }
563 } 651 }
564 652
565 sub process_trs { 653 sub process_trs {
566 while (my $job = $c_trs->get) {
567 my ($dir, $file) = @$job; 654 my ($dir, $file) = @_;
568 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
569 656
570 my $trs; 657 my $trs;
571 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
572 warn "$path: $!, skipping.\n"; 659 warn "ERROR: $path: $!, skipping.\n";
573 next; 660 return;
574 } 661 }
575 662
576 $TRS .= $trs; 663 $TRS .= $trs;
577 }
578 } 664 }
579 665
580 my %FILECACHE; 666 my %FILECACHE;
581 667
582 sub load_cached($;$) { 668 sub load_cached($;$) {
583 unless (exists $FILECACHE{$_[0]}) { 669 unless (exists $FILECACHE{$_[0]}) {
584 my $data; 670 my $data;
585 if (0 < aio_load $_[0], $data) { 671 if (0 < aio_load $_[0], $data) {
586 if ($_[1]) { 672 if ($_[1]) {
587 $data = eval { $_[1]->($data) }; 673 $data = eval { $_[1]->($data) };
588 warn "$_[0]: $@" if $@; 674 warn "ERROR: $_[0]: $@" if $@;
589 } 675 }
590 } 676 }
591 677
592 $FILECACHE{$_[0]} = $data; 678 $FILECACHE{$_[0]} = $data;
593 } 679 }
594 680
595 $FILECACHE{$_[0]} 681 $FILECACHE{$_[0]}
596 } 682 }
597 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
598 sub process_res { 752 sub process_res {
599 while (my $job = $c_res->get) {
600 my ($dir, $file, $type) = @$job; 753 my ($dir, $file, $type) = @_;
601 754
602 my $data;
603 aio_load "$dir/$file", $data; 755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
604 757
605 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) };
606 759
607 utf8::decode $dir; 760 utf8::decode $dir;
608 utf8::decode $file; 761 utf8::decode $file;
609 762
610 # a meta file for resources is now mandatory 763 # a meta file for resources is now mandatory
611 unless (exists $meta->{$file}) { 764 unless (exists $meta->{$file}) {
612 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 765 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
613 next; 766 return;
614 } 767 }
615 768
616 $meta = { 769 $meta = {
617 %{ $meta->{"" } || {} }, 770 %{ $meta->{"" } || {} },
618 %{ $meta->{$file} || {} }, 771 %{ $meta->{$file} || {} },
619 }; 772 };
620 773
621 if ($meta->{license} =~ s/^#//) { 774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
622 $meta->{license} = ({ 775 $meta->{license} = ({
623 "pd" => "Public Domain", 776 "pd" => "Public Domain",
624 "gpl" => "GNU General Public License, version 3.0 or any later", 777 "gpl" => "GNU General Public License, version 3.0 or any later",
625 "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/",
626 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 779 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
627 "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/",
628 "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/",
629 })->{$meta->{license}} 782 })->{$meta->{license}}
630 || warn "$dir/$file: license tag '$meta->{license}' not found."; 783 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
631 } 784 }
632 785
633 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 786 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
634 ($meta->{author} = $1) =~ s/_/ /g; 787 ($meta->{author} = $1) =~ s/_/ /g;
635 } 788 }
636 789
637 $file =~ s/\.res$//; 790 $file =~ s/\.res$//;
638 $file =~ s/\.(ogg|wav|jpg|png)$//; 791 $file =~ s/\.(ogg|wav|jpg|png)$//;
639 792
640 substr $dir, 0, 1 + length $PATH, ""; 793 if ($file =~ s/\.plt$//) {
641 794 $data = process_plt "$dir/$file", $data;
642 if (my $filter = $meta->{cfutil_filter}) { 795 } elsif (my $filter = delete $meta->{cfutil_filter}) {
643 if ($filter eq "yaml2json") { 796 if ($filter eq "yaml2json") {
644 $data = JSON::XS::encode_json YAML::XS::Load $data; 797 $data = JSON::XS::encode_json YAML::XS::Load $data;
645 } elsif ($filter eq "json2json") { 798 } elsif ($filter eq "json2json") {
646 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 799 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
647 } elsif ($filter eq "perl2json") { 800 } elsif ($filter eq "perl2json") {
648 $data = eval $data; die if $@; 801 $data = eval $data; die if $@;
649 $data = JSON::XS::encode_json $data; 802 $data = JSON::XS::encode_json $data;
650 } else { 803 } else {
651 warn "$dir/$file: unknown filter $filter, skipping\n"; 804 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
652 } 805 }
653 } 806 }
654 807
655 $RESOURCE{"$dir/$file"} = { 808 substr $dir, 0, 1 + length $PATH, "";
809
810 my %info = (
656 type => (exists $meta->{type} ? delete $meta->{type} : $type), 811 type => (exists $meta->{type} ? delete $meta->{type} : $type),
657 data => $data, 812 data => $data,
658 %$meta ? (meta => $meta) : (), 813 %$meta ? (meta => $meta) : (),
659 }; 814 );
815
816 $RESOURCE{"$dir/$file"} = \%info;
817 }
818
819 sub process_any {
820 while (my ($func, @args) = @{ $c_any->get }) {
821 $func->(@args);
660 } 822 }
661 } 823 }
662 824
663 sub find_files; 825 sub find_files;
664 sub find_files { 826 sub find_files {
665 my ($path) = @_; 827 my ($path) = @_;
666 828
829 my $grp = IO::AIO::aio_group;
830
831 my $scandir; $scandir = sub {
832 my ($path) = @_;
833
667 IO::AIO::aioreq_pri 4; 834 IO::AIO::aioreq_pri 4;
668 IO::AIO::aio_scandir $path, 4, sub { 835 add $grp IO::AIO::aio_scandir $path, 4, sub {
669 my ($dirs, $nondirs) = @_; 836 my ($dirs, $nondirs) = @_;
670 837
671 find_files "$path/$_" 838 $scandir->("$path/$_")
672 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 839 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
673 840
674 my $dir = $path; 841 my $dir = $path;
675 substr $dir, 0, 1 + length $PATH, ""; 842 substr $dir, 0, 1 + length $PATH, "";
676 843
677 for my $file (@$nondirs) { 844 for my $file (@$nondirs) {
678 if ($dir =~ /^music(?:\/|$)/) { 845 if ($dir =~ /^music(?:\/|$)/) {
679 $c_res->put ([$path, $file, 3]) # FT_MUSIC 846 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
680 if $file =~ /\.(ogg)$/; 847 if $file =~ /\.(ogg)$/;
681 848
682 } elsif ($dir =~ /^sound(?:\/|$)/) { 849 } elsif ($dir =~ /^sound(?:\/|$)/) {
683 $c_res->put ([$path, $file, 5]) # FT_SOUND 850 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
684 if $file =~ /\.(wav|ogg)$/; 851 if $file =~ /\.(wav|ogg)$/;
685 852
686 } elsif ($dir =~ /^res(?:\/|$)/) { 853 } elsif ($dir =~ /^res(?:\/|$)/) {
687 if ($file =~ /\.(jpg|png)$/) { 854 if ($file =~ /\.(jpg|png)$/) {
688 $c_res->put ([$path, $file, 0]) # FT_FACE 855 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
689 } elsif ($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 }
861
862 } elsif ($file =~ /\.png$/) {
863 $PNG{$file} = $path;
864
865 } elsif ($file =~ /\.faceinfo$/) {
866 $c_any->put ([\&process_faceinfo, $path, $file]);
867
868 } elsif ($file =~ /\.trs$/) {
869 $c_any->put ([\&process_trs, $path, $file]);
870
871 } elsif ($file =~ /\.arc$/) {
690 $c_res->put ([$path, $file, 6]) # FT_RSRC 872 $c_arc->put ([$path, $file]);
873
691 } else { 874 } else {
692 $c_res->put ([$path, $file, undef]); 875 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
693 } 876 }
694
695 } elsif ($file =~ /\.png$/) {
696 push @c_png, ["$path/$file", 0];
697
698 } elsif ($file =~ /\.trs$/) {
699 $c_trs->put ([$path, $file]);
700
701 } elsif ($file =~ /\.arc$/) {
702 $c_arc->put ([$path, $file]);
703
704 } else { 877 }
705 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
706 }
707 } 878 };
708 }; 879 };
880
881 $scandir->($path);
882 aio_wait $grp;
709 } 883 }
710 884
711 sub generate_plurals { 885 sub generate_plurals {
712# use Lingua::EN::Inflect (); 886# use Lingua::EN::Inflect ();
713# Lingua::EN::Inflect::classical; 887# Lingua::EN::Inflect::classical;
747 "Unless you run verbosely, all following warning\n", 921 "Unless you run verbosely, all following warning\n",
748 "or error messages indicate serious problems.\n", 922 "or error messages indicate serious problems.\n",
749 "\n"; 923 "\n";
750 924
751 if (!-d "$path/treasures") { 925 if (!-d "$path/treasures") {
752 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";
753 exit 1 unless $FORCE; 927 exit 1 unless $FORCE;
754 } 928 }
755 929
756 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;
757 934
758 find_files $path; 935 find_files $path;
759 936
760 my @a_arc = map +(async \&process_arc), 1..2;
761 my @a_res = map +(async \&process_res), 1..2;
762 my @a_trs = map +(async \&process_trs), 1..2;
763
764 IO::AIO::flush;
765
766 $c_res->shutdown;
767 $c_arc->shutdown; 937 $c_arc->shutdown;
768 $c_trs->shutdown; 938 $c_any->shutdown;
769
770 print "start file scan, arc, res processing...\n" if $VERBOSE;
771 939
772 $_->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;
773 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
774 print "end arc, start png processing...\n" if $VERBOSE; 966 print "starting png processing...\n" if $VERBOSE;
775 967
776 # eight png crunchers work fine for my 4x smp machine 968 # eight png crunchers work fine for my 4x smp machine
777 my @a_png = map +(async \&process_png), 1..8; 969 my @a_png = map +(async \&process_png), 1..8;
778 970
779 $_->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;
780 976
781 print "scanning done, processing results...\n" if $VERBOSE; 977 print "scanning done, processing results...\n" if $VERBOSE;
782 { 978 {
783 # remove path prefix from editor_folder 979 # remove path prefix from editor_folder
784 $_->{editor_folder} =~ /^\x00/ 980 $_->{editor_folder} =~ /^\x00/
802 delete @s{qw(_name more name name_pl)}; 998 delete @s{qw(_name more name name_pl)};
803 %$o = ( %s, %$o ); 999 %$o = ( %s, %$o );
804 ++$progress; 1000 ++$progress;
805 } 1001 }
806 } else { 1002 } else {
807 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";
808 delete $ARC{$o->{_name}}; 1004 delete $ARC{$o->{_name}};
809 } 1005 }
810 } 1006 }
811 } 1007 }
812 1008
819 } 1015 }
820 1016
821 # 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
822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1018 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
823 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
824 print "generating plurals...\n" if $VERBOSE; 1031 #print "generating plurals...\n" if $VERBOSE;
825 generate_plurals; 1032 #generate_plurals;
826 1033
827 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 1034 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
828 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1035 open my $fh, ">:utf8", "$DATADIR/archetypes~"
829 or die "$DATADIR/archetypes~: $!"; 1036 or die "$DATADIR/archetypes~: $!";
830 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1037 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
837 print $fh $TRS; 1044 print $fh $TRS;
838 } 1045 }
839 1046
840 { 1047 {
841 print "processing facedata...\n" if $VERBOSE; 1048 print "processing facedata...\n" if $VERBOSE;
842 while (my ($k, $v) = each %FACEINFO) { 1049
1050 for my $k (sort keys %FACEINFO) {
1051 my $v = $FACEINFO{$k};
1052
843 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 1053 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
844 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 1054 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
845 1055
846 make_hash $k, $v->{data32}, $v->{hash32}; 1056 make_hash $k, $v->{data32}, $v->{hash32};
847 make_hash $k, $v->{data64}, $v->{hash64}; 1057 make_hash $k, $v->{data64}, $v->{hash64};
848 1058
849 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 1059 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
850 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 1060 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
851 1061
852 if (my $magicmap = $v->{magicmap}) { 1062 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
853 $magicmap =~ y/A-Z_\-/a-z/d; 1063 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
854 $v->{magicmap} = $COLOR{$magicmap}; 1064 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
855 }
856 1065
857 my $stem = delete $v->{stem}; 1066 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
858 $v->{glyph} //= autoglyph $stem, $v; 1067 my $id = @TC;
859 utf8::encode $v->{glyph}; 1068 my $n = @{ $TC[-1] };
860 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; 1069 my $x = $n % TC_W;
1070 my $y = int $n / TC_W;
861 1071
862 delete $v->{arc}; 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
863 } 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}
864 1108
865 print "processing resources...\n" if $VERBOSE; 1109 print "processing resources...\n" if $VERBOSE;
866 my $enc = JSON::XS->new->utf8->canonical->relaxed; 1110 my $enc = JSON::XS->new->utf8->canonical->relaxed;
867 while (my ($k, $v) = each %RESOURCE) { 1111 for my $k (sort keys %RESOURCE) {
1112 my $v = $RESOURCE{$k};
868 1113
869 if ($v->{meta} && $v->{meta}{datadir}) { 1114 if ($v->{meta} && $v->{meta}{datadir}) {
870 delete $RESOURCE{$k}; 1115 delete $RESOURCE{$k};
871 1116
872 $k =~ s/^res\/// or die "$k: datadir files must be in res/"; 1117 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
891 1136
892 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients 1137 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
893 } 1138 }
894 } 1139 }
895 1140
1141 printf "writing facedata...\n" if $VERBOSE;
1142
1143 {
1144 open my $fh, ">:perlio", "$DATADIR/facedata~"
1145 or die "$DATADIR/facedata~: $!";
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
896 printf "writing facedata (%d faces, %d anims, %d resources)...\n", 1172 printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
897 scalar keys %FACEINFO, 1173 scalar keys %FACEINFO,
898 scalar keys %ANIMINFO, 1174 scalar keys %ANIMINFO,
899 scalar keys %RESOURCE 1175 scalar keys %RESOURCE
900 if $VERBOSE; 1176 if $VERBOSE;
901 1177
902 open my $fh, ">:perlio", "$DATADIR/facedata~" 1178 open my $fh, ">:perlio", "$DATADIR/faceinfo~"
903 or die "$DATADIR/facedata~: $!"; 1179 or die "$DATADIR/faceinfo~: $!";
904 1180
905 print $fh nfreeze { 1181 print $fh nfreeze {
906 version => 2, 1182 version => 2,
907 faceinfo => \%FACEINFO, 1183 faceinfo => \%FACEINFO,
908 animinfo => \%ANIMINFO, 1184 animinfo => \%ANIMINFO,
909 resource => \%RESOURCE, 1185 resource => \%RESOURCE,
910 }; 1186 };
911
912 } 1187 }
913 1188
914 print "committing files...\n" if $VERBOSE; 1189 print "committing files...\n" if $VERBOSE;
915 1190
916 for (qw(archetypes facedata treasures), @COMMIT) { 1191 for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
917 chmod 0644, "$DATADIR/$_~"; 1192 chmod 0644, "$DATADIR/$_~";
918 rename "$DATADIR/$_~", "$DATADIR/$_" 1193 rename "$DATADIR/$_~", "$DATADIR/$_"
919 or die "$DATADIR/$_: $!"; 1194 or die "$DATADIR/$_: $!";
920 } 1195 }
921 1196

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines