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.91 by root, Tue Oct 5 23:52:52 2010 UTC vs.
Revision 1.121 by root, Mon Oct 29 22:50:10 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 # hahs collinion, 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 = (
162 "0" => "⬤",
163 "1_3" => "╸",
164 "1_4" => "╺",
165 "2_1_2" => "━",
166
167 "1_2" => "╹",
168 "2_2_4" => "┛",
169 "2_2_1" => "┗",
170 "3_1" => "┻",
171
172 "1_1" => "╻",
173 "2_2_3" => "┓",
174 "2_2_2" => "┏",
175 "3_3" => "┳",
176
177 "2_1_1" => "┃",
178 "3_4" => "┫",
179 "3_2" => "┣",
180 "4" => "╋",
181);
182
183sub autoglyph {
184 my ($stem, $face) = @_;
185
186 if ($stem =~ /^wall\/|Nimwall/) {
187 while (my ($k, $v) = each %WALL_SUFFIX) {
188 return $v if $stem =~ /_$k.x11/;
189 }
190
191 "+"
192
193 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
194 "."
195
196 } elsif ($stem =~ /^player\//) {
197 "\@"
198
199 } else {
200 substr $stem, 0, 1
201 }
202} 206}
203 207
204{ 208{
205 our %ANIMINFO; 209 our %ANIMINFO;
206 our %FACEINFO; 210 our %FACEINFO;
207 our %RESOURCE; 211 our %RESOURCE;
208 our @ARC; 212 our @ARC;
209 our %ARC; 213 our %ARC;
210 our $TRS; 214 our $TRS;
215 our %PNG;
211 our $NFILE; 216 our $NFILE;
212 our $PATH; 217 our $PATH;
213 218
214 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
215 220
216 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
217 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
218 our $c_res = new Coro::Channel;
219 223
220 our @c_png; 224 our @c_png;
221 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
222 sub commit_png($$$$) { 232 sub commit_png($$$$$$) {
223 my ($stem, $name, $data, $T) = @_; 233 my ($stem, $name, $data, $T, $w, $h) = @_;
224 234
225 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; 235 $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
226 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
237 $FACEINFO{$name}{w} = $w;
238 $FACEINFO{$name}{h} = $h;
227 } 239 }
228 240
229 sub process_png { 241 sub process_png {
230 while (@c_png) { 242 while (@c_png) {
231 my ($path, $delete) = @{pop @c_png}; 243 my ($path, $delete) = @{pop @c_png};
233 my $png; 245 my $png;
234 aio_lstat $path; 246 aio_lstat $path;
235 my ($size, $mtime) = (stat _)[7,9]; 247 my ($size, $mtime) = (stat _)[7,9];
236 248
237 if (0 > aio_load $path, $png) { 249 if (0 > aio_load $path, $png) {
238 warn "$path: $!, skipping.\n"; 250 warn "ERROR: $path: $!, skipping.\n";
239 next; 251 next;
240 } 252 }
241 253
242 my $stem = $path; 254 my $stem = $path;
243 my $T; 255 my $T;
245 if ($stem =~ s/\.32x32\.png~?$//) { 257 if ($stem =~ s/\.32x32\.png~?$//) {
246 $T = 32; 258 $T = 32;
247 } elsif ($stem =~ s/\.64x64\.png~?$//) { 259 } elsif ($stem =~ s/\.64x64\.png~?$//) {
248 $T = 64; 260 $T = 64;
249 } else { 261 } else {
250 warn "$path: weird filename, skipping.\n"; 262 warn "ERROR: $path: weird filename, skipping.\n";
251 next; 263 next;
252 } 264 }
253 265
254 # quickly extract width and height of the (necessarily PNG) image 266 # quickly extract width and height of the (necessarily PNG) image
255 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 267 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
256 warn "$path: not a recognized png file, skipping.\n"; 268 warn "ERROR: $path: not a recognized png file, skipping.\n";
257 next; 269 next;
258 } 270 }
259 271
260 my ($w, $h) = unpack "NN", $1; 272 my ($w, $h) = unpack "NN", $1;
261 273
262 if ($w < $T || $h < $T) { 274 if ($w < $T || $h < $T) {
263 warn "$path: too small ($w $h), skipping.\n"; 275 warn "ERROR: $path: too small ($w $h), skipping.\n";
264 next; 276 next;
265 } 277 }
266 278
267 if ($w % $T || $h % $T) { 279 if ($w % $T || $h % $T) {
268 warn "$path: weird png size ($w $h), skipping.\n"; 280 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
269 next; 281 next;
270 } 282 }
271 283
272 (my $base = $stem) =~ s/^.*\///; 284 (my $base = $stem) =~ s/^.*\///;
273 285
282 unless ($path =~ /~$/) { 294 unless ($path =~ /~$/) {
283 # possibly enlarge 295 # possibly enlarge
284 if (0 > aio_stat "$stem.64x64.png") { 296 if (0 > aio_stat "$stem.64x64.png") {
285 my $other = "$stem.64x64.png~"; 297 my $other = "$stem.64x64.png~";
286 298
287 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 299 make_file $path, $other, sub {
288 fork_sub { 300 fork_exec {
289 my $CROP; 301 my $CROP;
290 my $SRC = "png:\Q$path\E"; 302 my $SRC = "png:\Q$path\E";
291 303
292 my $is_floor = $arc->{is_floor}; 304 my $is_floor = $arc->{is_floor};
293 my $is_wall = 0; 305 my $is_wall = 0;
343 $x * ($w - 8) + 4, 355 $x * ($w - 8) + 4,
344 $y * ($h - 8) + 4; 356 $y * ($h - 8) + 4;
345 } 357 }
346 } 358 }
347 359
348 system "convert -depth 8 $SRC rgba:-" 360 system "$CONVERT -depth 8 $SRC rgba:-"
349 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 361 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
350 . "| 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~"
351 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 363 and die "convert/cfhq2xa pipeline error: status $? ($!)";
352 system $OPTIPNG, "-i0", "-q", "$other~"; 364 optipng "$other~";
353 die "$other~ has zero size, aborting." unless -s "$other~";
354 rename "$other~", $other; 365 rename "$other~", $other;
355 }; 366 };
356 } 367 };
357 368
358 push @c_png, [$other, !$CACHE]; 369 push @c_png, [$other, !$CACHE];
359 } 370 }
360 371
361 # possibly scale down 372 # possibly scale down
362 if (0 > aio_stat "$stem.32x32.png") { 373 if (0 > aio_stat "$stem.32x32.png") {
363 my $other = "$stem.32x32.png~"; 374 my $other = "$stem.32x32.png~";
364 375
365 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 376 make_file $path, $other, sub {
366 fork_sub { 377 fork_exec {
367 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~";
368 system $OPTIPNG, "-i0", "-q", "$other~"; 379 optipng "$other~";
369 380
370 # reduce smoothfaces >10000 bytes 381 # reduce smoothfaces >10000 bytes
371 # obsolete, no longer required 382 # obsolete, no longer required
372 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 383 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
373 my $ncolor = 256; 384 my $ncolor = 256;
374 while () { 385 while () {
375 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 386 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
376 system $OPTIPNG, "-i0", "-q", "$other~~"; 387 optipng "$other~~";
377 last if 10000 > -s "$other~~"; 388 last if 10000 > -s "$other~~";
378 $ncolor = int $ncolor * 0.9; 389 $ncolor = int $ncolor * 0.9;
379 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 390 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
380 } 391 }
381 392
386 } 397 }
387 398
388 die "$other~ has zero size, aborting." unless -s "$other~"; 399 die "$other~ has zero size, aborting." unless -s "$other~";
389 rename "$other~", $other; 400 rename "$other~", $other;
390 }; 401 };
391 } 402 };
392 403
393 #warn "scaled down $path to $other\n";#d# 404 #warn "scaled down $path to $other\n";#d#
394 push @c_png, [$other, !$CACHE]; 405 push @c_png, [$other, !$CACHE];
395 } 406 }
396 } 407 }
397 408
398 (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 }
399 460
400 # split all bigfaces, but avoid smoothfaces (*_S) 461 # split all bigfaces, but avoid smoothfaces (*_S)
401 if (($w > $T || $h > $T) && $face !~ /_S\./) { 462 if (($w > $T || $h > $T) && $face !~ /_S\./) {
402 # split 463 # split
403 my @tile; 464 my @tile;
408 push @tile, [$x, $y, $file, (stat _)[9]]; 469 push @tile, [$x, $y, $file, (stat _)[9]];
409 } 470 }
410 } 471 }
411 472
412 my $mtime = (lstat $path)[9]; 473 my $mtime = (lstat $path)[9];
413 my @todo = grep { $_->[3] <= $mtime } @tile; 474 my @todo = grep { $_->[3] < $mtime } @tile;
414 if (@todo) { 475 if (@todo) {
415 fork_sub { 476 fork_exec {
416 open my $convert, "|-", $CONVERT, 477 open my $convert, "|-", $CONVERT,
417 "png:-", 478 "png:-",
418 (map { 479 (map {
419 ( 480 (
420 "(", 481 "(",
433 print $convert $png; 494 print $convert $png;
434 close $convert; 495 close $convert;
435 496
436 # pass 2, optimise, and rename 497 # pass 2, optimise, and rename
437 for (@todo) { 498 for (@todo) {
438 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 499 optipng "$_->[2]~";
439 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
440 rename "$_->[2]~", $_->[2]; 500 rename "$_->[2]~", $_->[2];
441 } 501 }
442 }; 502 };
443 } 503 }
444 504
448 508
449 if (0 > aio_load $file, $tile) { 509 if (0 > aio_load $file, $tile) {
450 die "$path: unable to read tile +$x+$y, aborting.\n"; 510 die "$path: unable to read tile +$x+$y, aborting.\n";
451 } 511 }
452 IO::AIO::aio_unlink $file unless $CACHE; 512 IO::AIO::aio_unlink $file unless $CACHE;
453 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;
454 } 514 }
455 } else { 515 } else {
456 # use as-is (either small, use smooth) 516 # use as-is (either small, use smooth)
457 commit_png $stem, $face, $png, $T; 517 commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
458 } 518 }
459 519
460 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 }
461 } 562 }
462 } 563 }
463 564
464 sub process_arc { 565 sub process_arc {
465 while (my $job = $c_arc->get) { 566 while (my ($dir, $file) = @{ $c_arc->get }) {
466 my ($dir, $file) = @$job;
467
468 my $arc; 567 my $arc;
469 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 :/
470 569
471 my $arc = read_arch "$dir/$file"; 570 my $arc = read_arch "$dir/$file";
472 for my $o (values %$arc) { 571 for my $o (values %$arc) {
474 for (my $m = $o; $m; $m = $m->{more}) { 573 for (my $m = $o; $m; $m = $m->{more}) {
475 $ARC{$m->{_name}} = $m; 574 $ARC{$m->{_name}} = $m;
476 } 575 }
477 576
478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 577 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
479
480 my $visibility = delete $o->{visibility};
481 my $magicmap = delete $o->{magicmap};
482 my $glyph = delete $o->{glyph};
483 578
484 # find upper left corner :/ 579 # find upper left corner :/
485 # omg, this is sooo broken 580 # omg, this is sooo broken
486 my ($dx, $dy); 581 my ($dx, $dy);
487 for (my $o = $o; $o; $o = $o->{more}) { 582 for (my $o = $o; $o; $o = $o->{more}) {
494 my $y = $o->{y} - $dy; 589 my $y = $o->{y} - $dy;
495 590
496 my $ext = $x|$y ? "+$x+$y" : ""; 591 my $ext = $x|$y ? "+$x+$y" : "";
497 592
498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 593 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
499
500 $visibility = delete $o->{visibility} if exists $o->{visibility};
501 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
502 $glyph = delete $o->{glyph} if exists $o->{glyph};
503 594
504 my $anim = delete $o->{anim}; 595 my $anim = delete $o->{anim};
505 596
506 if ($anim) { 597 if ($anim) {
507 # possibly add $ext to the animation name to avoid 598 # possibly add $ext to the animation name to avoid
531 next if /^facings\s/; 622 next if /^facings\s/;
532 623
533 my $face = $_; 624 my $face = $_;
534 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 625 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
535 626
536 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
537 $info->{arc} = $o; 633 $FACEINFO{$face}{arc} = $o;
538 634
539 next if $face =~ /^blank.x11$|^empty.x11$/; 635 next if $face =~ /^blank.x11$|^empty.x11$/;
540
541 $info->{visibility} = $visibility if defined $visibility;
542 $info->{magicmap} = $magicmap if defined $magicmap;
543 $info->{glyph} = $glyph if defined $glyph;
544 } 636 }
545 637
546 if (my $smooth = delete $o->{smoothface}) { 638 if (my $smooth = delete $o->{smoothface}) {
547 my %kv = split /\s+/, $smooth; 639 my %kv = split /\s+/, $smooth;
548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 640 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
557 } 649 }
558 } 650 }
559 } 651 }
560 652
561 sub process_trs { 653 sub process_trs {
562 while (my $job = $c_trs->get) {
563 my ($dir, $file) = @$job; 654 my ($dir, $file) = @_;
564 my $path = "$dir/$file"; 655 my $path = "$dir/$file";
565 656
566 my $trs; 657 my $trs;
567 if (0 > aio_load $path, $trs) { 658 if (0 > aio_load $path, $trs) {
568 warn "$path: $!, skipping.\n"; 659 warn "ERROR: $path: $!, skipping.\n";
569 next; 660 return;
570 } 661 }
571 662
572 $TRS .= $trs; 663 $TRS .= $trs;
573 }
574 } 664 }
575 665
576 my %FILECACHE; 666 my %FILECACHE;
577 667
578 sub load_cached($;$) { 668 sub load_cached($;$) {
579 unless (exists $FILECACHE{$_[0]}) { 669 unless (exists $FILECACHE{$_[0]}) {
580 my $data; 670 my $data;
581 if (0 < aio_load $_[0], $data) { 671 if (0 < aio_load $_[0], $data) {
582 if ($_[1]) { 672 if ($_[1]) {
583 $data = eval { $_[1]->($data) }; 673 $data = eval { $_[1]->($data) };
584 warn "$_[0]: $@" if $@; 674 warn "ERROR: $_[0]: $@" if $@;
585 } 675 }
586 } 676 }
587 677
588 $FILECACHE{$_[0]} = $data; 678 $FILECACHE{$_[0]} = $data;
589 } 679 }
590 680
591 $FILECACHE{$_[0]} 681 $FILECACHE{$_[0]}
592 } 682 }
593 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
594 sub process_res { 752 sub process_res {
595 while (my $job = $c_res->get) {
596 my ($dir, $file, $type) = @$job; 753 my ($dir, $file, $type) = @_;
597 754
598 my $data;
599 aio_load "$dir/$file", $data; 755 0 <= aio_load "$dir/$file", my $data
756 or die "$dir/$file: $!";
600 757
601 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) };
602 759
603 utf8::decode $dir; 760 utf8::decode $dir;
604 utf8::decode $file; 761 utf8::decode $file;
605 762
606 # a meta file for resources is now mandatory 763 # a meta file for resources is now mandatory
607 unless (exists $meta->{$file}) { 764 unless (exists $meta->{$file}) {
608 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 765 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
609 next; 766 return;
610 } 767 }
611 768
612 $meta = { 769 $meta = {
613 %{ $meta->{"" } || {} }, 770 %{ $meta->{"" } || {} },
614 %{ $meta->{$file} || {} }, 771 %{ $meta->{$file} || {} },
615 }; 772 };
616 773
617 if ($meta->{license} =~ s/^#//) { 774 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
618 $meta->{license} = ({ 775 $meta->{license} = ({
619 "pd" => "Public Domain", 776 "pd" => "Public Domain",
620 "gpl" => "GNU General Public License, version 3.0 or any later", 777 "gpl" => "GNU General Public License, version 3.0 or any later",
621 "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/",
622 "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/",
623 "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/",
624 "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/",
625 })->{$meta->{license}} 782 })->{$meta->{license}}
626 || warn "$dir/$file: license tag '$meta->{license}' not found."; 783 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
627 } 784 }
628 785
629 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/(.*)$%) {
630 ($meta->{author} = $1) =~ s/_/ /g; 787 ($meta->{author} = $1) =~ s/_/ /g;
631 } 788 }
632 789
633 $file =~ s/\.res$//; 790 $file =~ s/\.res$//;
634 $file =~ s/\.(ogg|wav|jpg|png)$//; 791 $file =~ s/\.(ogg|wav|jpg|png)$//;
635 792
636 substr $dir, 0, 1 + length $PATH, ""; 793 if ($file =~ s/\.plt$//) {
637 794 $data = process_plt "$dir/$file", $data;
638 if (my $filter = $meta->{cfutil_filter}) { 795 } elsif (my $filter = delete $meta->{cfutil_filter}) {
639 if ($filter eq "yaml2json") { 796 if ($filter eq "yaml2json") {
640 $data = JSON::XS::encode_json YAML::XS::Load $data; 797 $data = JSON::XS::encode_json YAML::XS::Load $data;
641 } elsif ($filter eq "json2json") { 798 } elsif ($filter eq "json2json") {
642 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 799 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
643 } elsif ($filter eq "perl2json") { 800 } elsif ($filter eq "perl2json") {
644 $data = eval $data; die if $@; 801 $data = eval $data; die if $@;
645 $data = JSON::XS::encode_json $data; 802 $data = JSON::XS::encode_json $data;
646 } else { 803 } else {
647 warn "$dir/$file: unknown filter $filter, skipping\n"; 804 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
648 } 805 }
649 } 806 }
650 807
808 substr $dir, 0, 1 + length $PATH, "";
809
651 $RESOURCE{"$dir/$file"} = { 810 $RESOURCE{"$dir/$file"} = {
652 type => (exists $meta->{type} ? delete $meta->{type} : $type), 811 type => (exists $meta->{type} ? delete $meta->{type} : $type),
653 data => $data, 812 data => $data,
654 %$meta ? (meta => $meta) : (), 813 %$meta ? (meta => $meta) : (),
655 }; 814 };
815 }
816
817 sub process_any {
818 while (my ($func, @args) = @{ $c_any->get }) {
819 $func->(@args);
656 } 820 }
657 } 821 }
658 822
659 sub find_files; 823 sub find_files;
660 sub find_files { 824 sub find_files {
661 my ($path) = @_; 825 my ($path) = @_;
662 826
827 my $grp = IO::AIO::aio_group;
828
829 my $scandir; $scandir = sub {
830 my ($path) = @_;
831
663 IO::AIO::aioreq_pri 4; 832 IO::AIO::aioreq_pri 4;
664 IO::AIO::aio_scandir $path, 4, sub { 833 add $grp IO::AIO::aio_scandir $path, 4, sub {
665 my ($dirs, $nondirs) = @_; 834 my ($dirs, $nondirs) = @_;
666 835
667 find_files "$path/$_" 836 $scandir->("$path/$_")
668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 837 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
669 838
670 my $dir = $path; 839 my $dir = $path;
671 substr $dir, 0, 1 + length $PATH, ""; 840 substr $dir, 0, 1 + length $PATH, "";
672 841
673 for my $file (@$nondirs) { 842 for my $file (@$nondirs) {
674 if ($dir =~ /^music(?:\/|$)/) { 843 if ($dir =~ /^music(?:\/|$)/) {
675 $c_res->put ([$path, $file, 3]) # FT_MUSIC 844 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
676 if $file =~ /\.(ogg)$/; 845 if $file =~ /\.(ogg)$/;
677 846
678 } elsif ($dir =~ /^sound(?:\/|$)/) { 847 } elsif ($dir =~ /^sound(?:\/|$)/) {
679 $c_res->put ([$path, $file, 5]) # FT_SOUND 848 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
680 if $file =~ /\.(wav|ogg)$/; 849 if $file =~ /\.(wav|ogg)$/;
681 850
682 } elsif ($dir =~ /^res(?:\/|$)/) { 851 } elsif ($dir =~ /^res(?:\/|$)/) {
683 if ($file =~ /\.(jpg|png)$/) { 852 if ($file =~ /\.(jpg|png)$/) {
684 $c_res->put ([$path, $file, 0]) # FT_FACE 853 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
685 } elsif ($file =~ /\.(res)$/) { 854 } elsif ($file =~ /\.(res)$/) {
855 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
856 } else {
857 $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose
858 }
859
860 } elsif ($file =~ /\.png$/) {
861 $PNG{$file} = $path;
862
863 } elsif ($file =~ /\.faceinfo$/) {
864 $c_any->put ([\&process_faceinfo, $path, $file]);
865
866 } elsif ($file =~ /\.trs$/) {
867 $c_any->put ([\&process_trs, $path, $file]);
868
869 } elsif ($file =~ /\.arc$/) {
686 $c_res->put ([$path, $file, 6]) # FT_RSRC 870 $c_arc->put ([$path, $file]);
871
687 } else { 872 } else {
688 $c_res->put ([$path, $file, undef]); 873 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
689 } 874 }
690
691 } elsif ($file =~ /\.png$/) {
692 push @c_png, ["$path/$file", 0];
693
694 } elsif ($file =~ /\.trs$/) {
695 $c_trs->put ([$path, $file]);
696
697 } elsif ($file =~ /\.arc$/) {
698 $c_arc->put ([$path, $file]);
699
700 } else { 875 }
701 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
702 }
703 } 876 };
704 }; 877 };
878
879 $scandir->($path);
880 aio_wait $grp;
705 } 881 }
706 882
707 sub generate_plurals { 883 sub generate_plurals {
708# use Lingua::EN::Inflect (); 884# use Lingua::EN::Inflect ();
709# Lingua::EN::Inflect::classical; 885# Lingua::EN::Inflect::classical;
743 "Unless you run verbosely, all following warning\n", 919 "Unless you run verbosely, all following warning\n",
744 "or error messages indicate serious problems.\n", 920 "or error messages indicate serious problems.\n",
745 "\n"; 921 "\n";
746 922
747 if (!-d "$path/treasures") { 923 if (!-d "$path/treasures") {
748 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 924 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
749 exit 1 unless $FORCE; 925 exit 1 unless $FORCE;
750 } 926 }
751 927
752 print "scanning files...\n" if $VERBOSE; 928 print "starting file scan, arc, any processing...\n" if $VERBOSE;
929
930 my @a_arc = map +(async \&process_arc), 1..2;
931 my @a_any = map +(async \&process_any), 1..4;
753 932
754 find_files $path; 933 find_files $path;
755 934
756 my @a_arc = map +(async \&process_arc), 1..2;
757 my @a_res = map +(async \&process_res), 1..2;
758 my @a_trs = map +(async \&process_trs), 1..2;
759
760 IO::AIO::flush;
761
762 $c_res->shutdown;
763 $c_arc->shutdown; 935 $c_arc->shutdown;
764 $c_trs->shutdown; 936 $c_any->shutdown;
765
766 print "start file scan, arc, res processing...\n" if $VERBOSE;
767 937
768 $_->join for @a_arc; # need to parse all archetypes before png processing 938 $_->join for @a_arc; # need to parse all archetypes before png processing
939 print "finished arc processing...\n" if $VERBOSE;
769 940
941 # fill png queue
942 for (keys %FACEINFO) {
943 # we only expect source pngs to exist for non-derived
944 # faces, i.e. no split tiles (+x+x) and no face derivates
945 # (xxx:)
946 /^[^:]+\....$/
947 or next;
948
949 my $seen;
950
951 if (exists $PNG{"$_.32x32.png"}) {
952 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
953 $seen = 1;
954 }
955 if (exists $PNG{"$_.64x64.png"}) {
956 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
957 $seen = 1;
958 }
959
960 warn "ERROR: $_: face not found, expect problems.\n"
961 unless $seen;
962 }
963
770 print "end arc, start png processing...\n" if $VERBOSE; 964 print "starting png processing...\n" if $VERBOSE;
771 965
772 # eight png crunchers work fine for my 4x smp machine 966 # eight png crunchers work fine for my 4x smp machine
773 my @a_png = map +(async \&process_png), 1..8; 967 my @a_png = map +(async \&process_png), 1..8;
774 968
775 $_->join for (@a_trs, @a_res, @a_png); 969 $_->join for @a_any;
970 print "finished any processing...\n" if $VERBOSE;
971
972 $_->join for @a_png;
973 print "finished png processing...\n" if $VERBOSE;
776 974
777 print "scanning done, processing results...\n" if $VERBOSE; 975 print "scanning done, processing results...\n" if $VERBOSE;
778 { 976 {
779 # remove path prefix from editor_folder 977 # remove path prefix from editor_folder
780 $_->{editor_folder} =~ /^\x00/ 978 $_->{editor_folder} =~ /^\x00/
798 delete @s{qw(_name more name name_pl)}; 996 delete @s{qw(_name more name name_pl)};
799 %$o = ( %s, %$o ); 997 %$o = ( %s, %$o );
800 ++$progress; 998 ++$progress;
801 } 999 }
802 } else { 1000 } else {
803 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 1001 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
804 delete $ARC{$o->{_name}}; 1002 delete $ARC{$o->{_name}};
805 } 1003 }
806 } 1004 }
807 } 1005 }
808 1006
815 } 1013 }
816 1014
817 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 1015 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1016 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
819 1017
1018 # fix up archetypes without names, where the archanme doesn't work at all
1019 for (@ARC) {
1020 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1021 for ($_->{name} = $_->{_name}) {
1022 s/(?:_\d+)+$//;
1023 s/_[nesw]+$//;
1024 y/_/ /;
1025 }
1026 }
1027 }
1028
820 print "generating plurals...\n" if $VERBOSE; 1029 #print "generating plurals...\n" if $VERBOSE;
821 generate_plurals; 1030 #generate_plurals;
822 1031
823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 1032 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
824 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1033 open my $fh, ">:utf8", "$DATADIR/archetypes~"
825 or die "$DATADIR/archetypes~: $!"; 1034 or die "$DATADIR/archetypes~: $!";
826 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1035 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
833 print $fh $TRS; 1042 print $fh $TRS;
834 } 1043 }
835 1044
836 { 1045 {
837 print "processing facedata...\n" if $VERBOSE; 1046 print "processing facedata...\n" if $VERBOSE;
838 while (my ($k, $v) = each %FACEINFO) { 1047
1048 for my $k (sort keys %FACEINFO) {
1049 my $v = $FACEINFO{$k};
1050
839 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 1051 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
840 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 1052 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
841 1053
842 make_hash $k, $v->{data32}, $v->{hash32}; 1054 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64}; 1055 make_hash $k, $v->{data64}, $v->{hash64};
844 1056
845 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 1057 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
846 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 1058 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
847 1059
848 if (my $magicmap = $v->{magicmap}) { 1060 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
849 $magicmap =~ y/A-Z_\-/a-z/d; 1061 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
850 $v->{magicmap} = $COLOR{$magicmap}; 1062 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
851 }
852 1063
853 my $stem = delete $v->{stem}; 1064 if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs
854 $v->{glyph} //= autoglyph $stem, $v; 1065 my $id = @TC;
855 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; 1066 my $n = @{ $TC[-1] };
1067 my $x = $n % TC_W;
1068 my $y = int $n / TC_W;
856 1069
857 delete $v->{arc}; 1070 push @{ $TC[-1] }, [$v, $x, $y];
1071
1072 $v->{tc} = [$id, $x, $y];
1073
1074 push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full
858 } 1075 }
1076
1077 delete @$v{qw(w h arc stem derive)}; # not used by the server
1078 }
1079
1080if (0) { #d# texture catalogs
1081 print "creating texture catalogs...\n" if $VERBOSE;
1082
1083 for my $id (0 .. $#TC) {
1084 my $tc = $TC[$id];
1085
1086 my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent";
1087 my $idx = "a";
1088
1089 for (@$tc) {
1090 my $path = "$TMPDIR/tc" . $idx++;
1091
1092 open my $fh, ">:perlio", $path
1093 or die "$path: $!";
1094 syswrite $fh, $_->[0]{data64};
1095
1096 my $x = $_->[1] * 64;
1097 my $y = $_->[2] * 64;
1098
1099 $cmd .= " png:\Q$path\E -geometry +$x+$y -composite";
1100 }
1101
1102 system "$cmd png:\Q$TMPDIR/tc$id\E";
1103 optipng "$TMPDIR/tc$id";
1104 }
1105}
859 1106
860 print "processing resources...\n" if $VERBOSE; 1107 print "processing resources...\n" if $VERBOSE;
861 my $enc = JSON::XS->new->utf8->canonical->relaxed; 1108 my $enc = JSON::XS->new->utf8->canonical->relaxed;
862 while (my ($k, $v) = each %RESOURCE) { 1109 while (my ($k, $v) = each %RESOURCE) {
863 1110
901 version => 2, 1148 version => 2,
902 faceinfo => \%FACEINFO, 1149 faceinfo => \%FACEINFO,
903 animinfo => \%ANIMINFO, 1150 animinfo => \%ANIMINFO,
904 resource => \%RESOURCE, 1151 resource => \%RESOURCE,
905 }; 1152 };
906
907 } 1153 }
908 1154
909 print "committing files...\n" if $VERBOSE; 1155 print "committing files...\n" if $VERBOSE;
910 1156
911 for (qw(archetypes facedata treasures), @COMMIT) { 1157 for (qw(archetypes facedata treasures), @COMMIT) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines