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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines