[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.65 by root, Thu Dec 27 15:32:41 2007 UTC vs.
Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC

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

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.65 by root, Thu Dec 27 15:32:41 2007 UTC vs. Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.65 by root, Thu Dec 27 15:32:41 2007 UTC vs.
Revision 1.124 by root, Sun Nov 11 05:53:12 2012 UTC