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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.74 by root, Wed Oct 28 04:10:46 2009 UTC vs.
Revision 1.123 by root, Sun Nov 11 04:29:11 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 File::Temp;	39	use File::Temp;
18	use POSIX ();	40	use POSIX ();
19	use Carp;	41	use Carp;
20		42
21	use Coro::EV;
22	use AnyEvent;
23	use YAML::XS ();	43	use YAML::XS ();
		44	use Digest::MD5 ();
		45	use Storable ();
24	use JSON::XS ();	46	use JSON::XS ();
25	use IO::AIO ();	47	use IO::AIO ();
		48	use Compress::LZF ();
26		49
		50	use AnyEvent;
27	use Coro 5.12;	51	use Coro 5.12;
		52	use Coro::EV;
28	use Coro::AIO;	53	use Coro::AIO;
29	use Coro::Util;	54	use Coro::Util;
30	use Coro::Channel;	55	use Coro::Channel;
		56	use Coro::AnyEvent;
31	use Coro::Storable; $Storable::canonical = 1;	57	use Coro::Storable; $Storable::canonical = 1;
32		58
33	use Deliantra;	59	use Deliantra;
34		60
35	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	61	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
51	my $VERBOSE = 1;	77	my $VERBOSE = 1;
52	my $CACHE = 0;	78	my $CACHE = 0;
53	my $FORCE;	79	my $FORCE;
54	my $TMPDIR = "/tmp/cfutil$$~";	80	my $TMPDIR = "/tmp/cfutil$$~";
55	my $TMPFILE = "aaaa0";	81	my $TMPFILE = "aaaa0";
		82	my @COMMIT;
56		83
57	our %COLOR = (	84	our %COLOR = (
		85	# original cf colours
58	black => 0,	86	black => 0,
59	white => 1,	87	white => 1,
60	navy => 2,	88	navy => 2, # "dark blue"
61	red => 3,	89	red => 3,
62	orange => 4,	90	orange => 4,
63	blue => 5,	91	blue => 5, # "light blue"
64	darkorange => 6,	92	darkorange => 6,
65	green => 7,	93	green => 7,
66	lightgreen => 8,	94	lightgreen => 8,
67	grey => 9,	95	grey => 9,
		96	brown => 10, # "yellow"
		97	gold => 11, # "light yellow"
		98	tan => 12, # yellowish gray
		99
		100	# new for deliantra
68	brown => 10,	101	none => 13,
		102
		103	# compatibility to existing archetypes
		104	lightblue => 5,
69	gold => 11,	105	gray => 9,
		106	yellow => 11,
70	tan => 12,	107	khaki => 12,
71	);	108	);
72		109
73	END { system "rm", "-rf", $TMPDIR }	110	END { system "rm", "-rf", $TMPDIR }
74		111
75	my $s_INT = EV::signal INT => sub { exit 1 };	112	my $s_INT = AE::signal INT => sub { exit 1 };
76	my $s_TERM = EV::signal TERM => 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	}
77		141
78	mkdir $TMPDIR, 0700	142	mkdir $TMPDIR, 0700
79	or die "$TMPDIR: $!";	143	or die "$TMPDIR: $!";
80		144
81	sub fork_sub(&) {	145	sub fork_exec(&) {
82	my ($cb) = @_;	146	my ($cb) = @_;
83		147
84	if (my $pid = fork) {	148	if (my $pid = fork) {
85	my $current = $Coro::current;	149	my $current = $Coro::current;
86	my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });	150	my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
…		…
91	warn $@;	155	warn $@;
92	POSIX::_exit 1;	156	POSIX::_exit 1;
93	}	157	}
94	}	158	}
95		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
96	sub inst_maps($) {	189	sub inst_maps($) {
97	my (undef, $path) = @_;	190	my (undef, $path) = @_;
98		191
99	print "\nInstalling '$path' to '$DATADIR/maps'\n\n";	192	print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
100		193
101	if (!-f "$path/regions") {	194	if (!-f "$path/regions") {
102	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";
103	exit 1 unless $FORCE;	196	exit 1 unless $FORCE;
104	}	197	}
105		198
106	system $RSYNC, "-av", "--chmod=u=rwX,go=rX",	199	system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
107	"$path/.", "$DATADIR/maps/.",	200	"$path/.", "$DATADIR/maps/.",
…		…
117	our %FACEINFO;	210	our %FACEINFO;
118	our %RESOURCE;	211	our %RESOURCE;
119	our @ARC;	212	our @ARC;
120	our %ARC;	213	our %ARC;
121	our $TRS;	214	our $TRS;
		215	our %PNG;
122	our $NFILE;	216	our $NFILE;
123	our $PATH;	217	our $PATH;
124		218
125	our $QUANTIZE = "+dither -colorspace RGB -colors 256";	219	our $QUANTIZE = "+dither -colorspace RGB -colors 256";
126		220
127	our $c_arc = new Coro::Channel;	221	our $c_arc = new Coro::Channel;
128	our $c_trs = new Coro::Channel;	222	our $c_any = new Coro::Channel;
129	our $c_res = new Coro::Channel;
130		223
131	our @c_png;	224	our @c_png;
132		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
133	sub commit_png($$$) {	232	sub commit_png($$$$$$) {
134	my ($name, $data, $T) = @_;	233	my ($stem, $name, $data, $T, $w, $h) = @_;
135		234
		235	$FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH;
136	$FACEINFO{$name}{"data$T"} = $data;	236	$FACEINFO{$name}{"data$T"} = $data;
		237	$FACEINFO{$name}{w} = $w;
		238	$FACEINFO{$name}{h} = $h;
137	}	239	}
138		240
139	sub process_png {	241	sub process_png {
140	while (@c_png) {	242	while (@c_png) {
141	my ($path, $delete) = @{pop @c_png};	243	my ($path, $delete) = @{pop @c_png};
…		…
143	my $png;	245	my $png;
144	aio_lstat $path;	246	aio_lstat $path;
145	my ($size, $mtime) = (stat _)[7,9];	247	my ($size, $mtime) = (stat _)[7,9];
146		248
147	if (0 > aio_load $path, $png) {	249	if (0 > aio_load $path, $png) {
148	warn "$path: $!, skipping.\n";	250	warn "ERROR: $path: $!, skipping.\n";
149	next;	251	next;
150	}	252	}
151		253
152	my $stem = $path;	254	my $stem = $path;
153	my $T;	255	my $T;
…		…
155	if ($stem =~ s/\.32x32\.png~?$//) {	257	if ($stem =~ s/\.32x32\.png~?$//) {
156	$T = 32;	258	$T = 32;
157	} elsif ($stem =~ s/\.64x64\.png~?$//) {	259	} elsif ($stem =~ s/\.64x64\.png~?$//) {
158	$T = 64;	260	$T = 64;
159	} else {	261	} else {
160	warn "$path: weird filename, skipping.\n";	262	warn "ERROR: $path: weird filename, skipping.\n";
161	next;	263	next;
162	}	264	}
163		265
164	# quickly extract width and height of the (necessarily PNG) image	266	# quickly extract width and height of the (necessarily PNG) image
165	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {	267	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
166	warn "$path: not a recognized png file, skipping.\n";	268	warn "ERROR: $path: not a recognized png file, skipping.\n";
167	next;	269	next;
168	}	270	}
169		271
170	my ($w, $h) = unpack "NN", $1;	272	my ($w, $h) = unpack "NN", $1;
171		273
172	if ($w < $T \|\| $h < $T) {	274	if ($w < $T \|\| $h < $T) {
173	warn "$path: too small ($w $h), skipping.\n";	275	warn "ERROR: $path: too small ($w $h), skipping.\n";
174	next;	276	next;
175	}	277	}
176		278
177	if ($w % $T \|\| $h % $T) {	279	if ($w % $T \|\| $h % $T) {
178	warn "$path: weird png size ($w $h), skipping.\n";	280	warn "ERROR: $path: weird png size ($w $h), skipping.\n";
179	next;	281	next;
180	}	282	}
181		283
182	(my $base = $stem) =~ s/^.*\///;	284	(my $base = $stem) =~ s/^.*\///;
183		285
…		…
192	unless ($path =~ /~$/) {	294	unless ($path =~ /~$/) {
193	# possibly enlarge	295	# possibly enlarge
194	if (0 > aio_stat "$stem.64x64.png") {	296	if (0 > aio_stat "$stem.64x64.png") {
195	my $other = "$stem.64x64.png~";	297	my $other = "$stem.64x64.png~";
196		298
197	if (0 > aio_lstat $other or (-M _) > (-M $path)) {	299	make_file $path, $other, sub {
198	fork_sub {	300	fork_exec {
199	my $CROP;	301	my $CROP;
200	my $SRC = "png:\Q$path\E";	302	my $SRC = "png:\Q$path\E";
201		303
202	my $is_floor = $arc->{is_floor};	304	my $is_floor = $arc->{is_floor};
203	my $is_wall = 0;	305	my $is_wall = 0;
…		…
253	$x * ($w - 8) + 4,	355	$x * ($w - 8) + 4,
254	$y * ($h - 8) + 4;	356	$y * ($h - 8) + 4;
255	}	357	}
256	}	358	}
257		359
258	system "convert -depth 8 $SRC rgba:-"	360	system "$CONVERT -depth 8 $SRC rgba:-"
259	. "\| $exec_prefix/bin/cfhq2xa $w $h 0"	361	. "\| $exec_prefix/bin/cfhq2xa $w $h 0"
260	. "\| 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~"
261	and die "convert/cfhq2xa pipeline error: status $? ($!)";	363	and die "convert/cfhq2xa pipeline error: status $? ($!)";
262	system $OPTIPNG, "-i0", "-q", "$other~";	364	optipng "$other~";
263	die "$other~ has zero size, aborting." unless -s "$other~";
264	rename "$other~", $other;	365	rename "$other~", $other;
265	};	366	};
266	}	367	};
267		368
268	push @c_png, [$other, !$CACHE];	369	push @c_png, [$other, !$CACHE];
269	}	370	}
270		371
271	# possibly scale down	372	# possibly scale down
272	if (0 > aio_stat "$stem.32x32.png") {	373	if (0 > aio_stat "$stem.32x32.png") {
273	my $other = "$stem.32x32.png~";	374	my $other = "$stem.32x32.png~";
274		375
275	if (0 > aio_lstat $other or (-M _) > (-M $path)) {	376	make_file $path, $other, sub {
276	fork_sub {	377	fork_exec {
277	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~";
278	system $OPTIPNG, "-i0", "-q", "$other~";	379	optipng "$other~";
279		380
280	# reduce smoothfaces >10000 bytes	381	# reduce smoothfaces >10000 bytes
281	# obsolete, no longer required	382	# obsolete, no longer required
282	if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {	383	if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
283	my $ncolor = 256;	384	my $ncolor = 256;
284	while () {	385	while () {
285	system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";	386	system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
286	system $OPTIPNG, "-i0", "-q", "$other~~";	387	optipng "$other~~";
287	last if 10000 > -s "$other~~";	388	last if 10000 > -s "$other~~";
288	$ncolor = int $ncolor * 0.9;	389	$ncolor = int $ncolor * 0.9;
289	$ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";	390	$ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
290	}	391	}
291		392
…		…
296	}	397	}
297		398
298	die "$other~ has zero size, aborting." unless -s "$other~";	399	die "$other~ has zero size, aborting." unless -s "$other~";
299	rename "$other~", $other;	400	rename "$other~", $other;
300	};	401	};
301	}	402	};
302		403
303	#warn "scaled down $path to $other\n";#d#	404	#warn "scaled down $path to $other\n";#d#
304	push @c_png, [$other, !$CACHE];	405	push @c_png, [$other, !$CACHE];
305	}	406	}
306	}	407	}
307		408
308	(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	}
309		460
310	# split all bigfaces, but avoid smoothfaces (*_S)	461	# split all bigfaces, but avoid smoothfaces (*_S)
311	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {	462	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {
312	# split	463	# split
313	my @tile;	464	my @tile;
…		…
318	push @tile, [$x, $y, $file, (stat _)[9]];	469	push @tile, [$x, $y, $file, (stat _)[9]];
319	}	470	}
320	}	471	}
321		472
322	my $mtime = (lstat $path)[9];	473	my $mtime = (lstat $path)[9];
323	my @todo = grep { $_->[3] <= $mtime } @tile;	474	my @todo = grep { $_->[3] < $mtime } @tile;
324	if (@todo) {	475	if (@todo) {
325	fork_sub {	476	fork_exec {
326	open my $convert, "\|-", $CONVERT,	477	open my $convert, "\|-", $CONVERT,
327	"png:-",	478	"png:-",
328	(map {	479	(map {
329	(	480	(
330	"(",	481	"(",
…		…
343	print $convert $png;	494	print $convert $png;
344	close $convert;	495	close $convert;
345		496
346	# pass 2, optimise, and rename	497	# pass 2, optimise, and rename
347	for (@todo) {	498	for (@todo) {
348	system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";	499	optipng "$_->[2]~";
349	die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
350	rename "$_->[2]~", $_->[2];	500	rename "$_->[2]~", $_->[2];
351	}	501	}
352	};	502	};
353	}	503	}
354		504
…		…
358		508
359	if (0 > aio_load $file, $tile) {	509	if (0 > aio_load $file, $tile) {
360	die "$path: unable to read tile +$x+$y, aborting.\n";	510	die "$path: unable to read tile +$x+$y, aborting.\n";
361	}	511	}
362	IO::AIO::aio_unlink $file unless $CACHE;	512	IO::AIO::aio_unlink $file unless $CACHE;
363	commit_png $x\|$y ? "$face+$x+$y" : $face, $tile, $T;	513	commit_png $stem, $x\|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1;
364	}	514	}
365	} else {	515	} else {
366	# use as-is (either small, use smooth)	516	# use as-is (either small, use smooth)
367	commit_png $face, $png, $T;	517	commit_png $stem, $face, $png, $T, $w / $T, $h / $T;
368	}	518	}
369		519
370	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	}
371	}	562	}
372	}	563	}
373		564
374	sub process_arc {	565	sub process_arc {
375	while (my $job = $c_arc->get) {	566	while (my ($dir, $file) = @{ $c_arc->get }) {
376	my ($dir, $file) = @$job;
377
378	my $arc;	567	my $arc;
379	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 :/
380		569
381	my $arc = read_arch "$dir/$file";	570	my $arc = read_arch "$dir/$file";
382	for my $o (values %$arc) {	571	for my $o (values %$arc) {
383	push @ARC, $o;	572	push @ARC, $o;
384	for (my $m = $o; $m; $m = $m->{more}) {	573	for (my $m = $o; $m; $m = $m->{more}) {
385	$ARC{$m->{_name}} = $m;	574	$ARC{$m->{_name}} = $m;
386	}	575	}
387		576
388	$o->{editor_folder} = $dir;	577	$o->{editor_folder} \|\|= "\x00$dir"; # horrible kludge
389
390	my $visibility = delete $o->{visibility};
391	my $magicmap = delete $o->{magicmap};
392		578
393	# find upper left corner :/	579	# find upper left corner :/
394	# omg, this is sooo broken	580	# omg, this is sooo broken
395	my ($dx, $dy);	581	my ($dx, $dy);
396	for (my $o = $o; $o; $o = $o->{more}) {	582	for (my $o = $o; $o; $o = $o->{more}) {
…		…
403	my $y = $o->{y} - $dy;	589	my $y = $o->{y} - $dy;
404		590
405	my $ext = $x\|$y ? "+$x+$y" : "";	591	my $ext = $x\|$y ? "+$x+$y" : "";
406		592
407	$o->{face} .= $ext unless /^blank.x11$\|^empty.x11$/ \|\| !$o->{face};	593	$o->{face} .= $ext unless /^blank.x11$\|^empty.x11$/ \|\| !$o->{face};
408
409	$visibility = delete $o->{visibility} if exists $o->{visibility};
410	$magicmap = delete $o->{magicmap} if exists $o->{magicmap};
411		594
412	my $anim = delete $o->{anim};	595	my $anim = delete $o->{anim};
413		596
414	if ($anim) {	597	if ($anim) {
415	# possibly add $ext to the animation name to avoid	598	# possibly add $ext to the animation name to avoid
…		…
439	next if /^facings\s/;	622	next if /^facings\s/;
440		623
441	my $face = $_;	624	my $face = $_;
442	$face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates	625	$face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
443		626
444	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
445	$info->{arc} = $o;	633	$FACEINFO{$face}{arc} = $o;
446		634
447	next if $face =~ /^blank.x11$\|^empty.x11$/;	635	next if $face =~ /^blank.x11$\|^empty.x11$/;
448
449	$info->{visibility} = $visibility if defined $visibility;
450	$info->{magicmap} = $magicmap if defined $magicmap;
451	}	636	}
452		637
453	if (my $smooth = delete $o->{smoothface}) {	638	if (my $smooth = delete $o->{smoothface}) {
454	my %kv = split /\s+/, $smooth;	639	my %kv = split /\s+/, $smooth;
455	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support	640	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
…		…
464	}	649	}
465	}	650	}
466	}	651	}
467		652
468	sub process_trs {	653	sub process_trs {
469	while (my $job = $c_trs->get) {
470	my ($dir, $file) = @$job;	654	my ($dir, $file) = @_;
471	my $path = "$dir/$file";	655	my $path = "$dir/$file";
472		656
473	my $trs;	657	my $trs;
474	if (0 > aio_load $path, $trs) {	658	if (0 > aio_load $path, $trs) {
475	warn "$path: $!, skipping.\n";	659	warn "ERROR: $path: $!, skipping.\n";
476	next;	660	return;
477	}	661	}
478		662
479	$TRS .= $trs;	663	$TRS .= $trs;
480	}
481	}	664	}
482		665
483	my %FILECACHE;	666	my %FILECACHE;
484		667
485	sub load_cached($;$) {	668	sub load_cached($;$) {
486	unless (exists $FILECACHE{$_[0]}) {	669	unless (exists $FILECACHE{$_[0]}) {
487	my $data;	670	my $data;
488	if (0 < aio_load $_[0], $data) {	671	if (0 < aio_load $_[0], $data) {
489	if ($_[1]) {	672	if ($_[1]) {
490	$data = eval { $_[1]->($data) };	673	$data = eval { $_[1]->($data) };
491	warn "$_[0]: $@" if $@;	674	warn "ERROR: $_[0]: $@" if $@;
492	}	675	}
493	}	676	}
494		677
495	$FILECACHE{$_[0]} = $data;	678	$FILECACHE{$_[0]} = $data;
496	}	679	}
497		680
498	$FILECACHE{$_[0]}	681	$FILECACHE{$_[0]}
499	}	682	}
500		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
501	sub process_res {	752	sub process_res {
502	while (my $job = $c_res->get) {
503	my ($dir, $file, $type) = @$job;	753	my ($dir, $file, $type) = @_;
504		754
505	my $data;
506	aio_load "$dir/$file", $data;	755	0 <= aio_load "$dir/$file", my $data
		756	or die "$dir/$file: $!";
507		757
508	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) };
509		759
510	utf8::decode $dir;	760	utf8::decode $dir;
511	utf8::decode $file;	761	utf8::decode $file;
512		762
513	# a meta file for resources is now mandatory	763	# a meta file for resources is now mandatory
514	unless (exists $meta->{$file}) {	764	unless (exists $meta->{$file}) {
515	warn "skipping $dir/$file\n" if $VERBOSE >= 3;	765	warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516	next;	766	return;
517	}	767	}
518		768
519	$meta = {	769	$meta = {
520	%{ $meta->{"" } \|\| {} },	770	%{ $meta->{"" } \|\| {} },
521	%{ $meta->{$file} \|\| {} },	771	%{ $meta->{$file} \|\| {} },
522	};	772	};
523		773
524	if ($meta->{license} =~ s/^#//) {	774	if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
525	$meta->{license} = ({	775	$meta->{license} = ({
526	"pd" => "Public Domain",	776	"pd" => "Public Domain",
527	"gpl" => "GNU General Public License, version 3.0 or any later",	777	"gpl" => "GNU General Public License, version 3.0 or any later",
528	"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/",
529	"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/",
530	"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/",
531	})->{$meta->{license}}	782	})->{$meta->{license}}
532	\|\| warn "$dir/$file: license tag '$meta->{license}' not found.";	783	\|\| warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
533	}	784	}
534		785
		786	if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
		787	($meta->{author} = $1) =~ s/_/ /g;
		788	}
		789
535	$file =~ s/\.res$//;	790	$file =~ s/\.res$//;
536	$file =~ s/\.(ogg\|wav\|jpg\|png)$//;	791	$file =~ s/\.(ogg\|wav\|jpg\|png)$//;
537		792
538	substr $dir, 0, 1 + length $PATH, "";	793	if ($file =~ s/\.plt$//) {
539		794	$data = process_plt "$dir/$file", $data;
540	if (my $filter = $meta->{cfutil_filter}) {	795	} elsif (my $filter = delete $meta->{cfutil_filter}) {
541	if ($filter eq "yaml2json") {	796	if ($filter eq "yaml2json") {
542	$data = JSON::XS::encode_json YAML::XS::Load $data;	797	$data = JSON::XS::encode_json YAML::XS::Load $data;
543	} elsif ($filter eq "json2json") {	798	} elsif ($filter eq "json2json") {
544	$data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);	799	$data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545	} elsif ($filter eq "perl2json") {	800	} elsif ($filter eq "perl2json") {
546	$data = eval $data; die if $@;	801	$data = eval $data; die if $@;
547	$data = JSON::XS::encode_json $data;	802	$data = JSON::XS::encode_json $data;
548	} else {	803	} else {
549	warn "$dir/$file: unknown filter $filter, skipping\n";	804	warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
550	}	805	}
551	}	806	}
552		807
553	$RESOURCE{"$dir/$file"} = {	808	substr $dir, 0, 1 + length $PATH, "";
		809
		810	my %info = (
554	type => (exists $meta->{type} ? delete $meta->{type} : $type),	811	type => (exists $meta->{type} ? delete $meta->{type} : $type),
555	data => $data,	812	data => $data,
556	%$meta ? (meta => $meta) : (),	813	%$meta ? (meta => $meta) : (),
557	};	814	);
		815
		816	$RESOURCE{"$dir/$file"} = \%info;
		817	}
		818
		819	sub process_any {
		820	while (my ($func, @args) = @{ $c_any->get }) {
		821	$func->(@args);
558	}	822	}
559	}	823	}
560		824
561	sub find_files;	825	sub find_files;
562	sub find_files {	826	sub find_files {
563	my ($path) = @_;	827	my ($path) = @_;
564		828
		829	my $grp = IO::AIO::aio_group;
		830
		831	my $scandir; $scandir = sub {
		832	my ($path) = @_;
		833
565	IO::AIO::aioreq_pri 4;	834	IO::AIO::aioreq_pri 4;
566	IO::AIO::aio_scandir $path, 4, sub {	835	add $grp IO::AIO::aio_scandir $path, 4, sub {
567	my ($dirs, $nondirs) = @_;	836	my ($dirs, $nondirs) = @_;
568		837
569	find_files "$path/$_"	838	$scandir->("$path/$_")
570	for grep $_ !~ /^(?:CVS\|dev)$/, @$dirs;	839	for grep $_ !~ /^(?:CVS\|dev\|\..*)$/, @$dirs;
571		840
572	my $dir = $path;	841	my $dir = $path;
573	substr $dir, 0, 1 + length $PATH, "";	842	substr $dir, 0, 1 + length $PATH, "";
574		843
575	for my $file (@$nondirs) {	844	for my $file (@$nondirs) {
576	if ($dir =~ /^music(?:\/\|$)/) {	845	if ($dir =~ /^music(?:\/\|$)/) {
577	$c_res->put ([$path, $file, 3]) # FT_MUSIC	846	$c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
578	if $file =~ /\.(ogg)$/;	847	if $file =~ /\.(ogg)$/;
579		848
580	} elsif ($dir =~ /^sound(?:\/\|$)/) {	849	} elsif ($dir =~ /^sound(?:\/\|$)/) {
581	$c_res->put ([$path, $file, 5]) # FT_SOUND	850	$c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
582	if $file =~ /\.(wav\|ogg)$/;	851	if $file =~ /\.(wav\|ogg)$/;
583		852
584	} elsif ($dir =~ /^res(?:\/\|$)/) {	853	} elsif ($dir =~ /^res(?:\/\|$)/) {
585	if ($file =~ /\.(jpg\|png)$/) {	854	if ($file =~ /\.(jpg\|png)$/) {
586	$c_res->put ([$path, $file, 0]) # FT_FACE	855	$c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
587	} 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$/) {
588	$c_res->put ([$path, $file, 6]) # FT_RSRC	872	$c_arc->put ([$path, $file]);
		873
589	} else {	874	} else {
590	$c_res->put ([$path, $file, undef]);	875	warn "ignoring $path/$file\n" if $VERBOSE >= 3;
591	}	876	}
592
593	} elsif ($file =~ /\.png$/) {
594	push @c_png, ["$path/$file", 0];
595
596	} elsif ($file =~ /\.trs$/) {
597	$c_trs->put ([$path, $file]);
598
599	} elsif ($file =~ /\.arc$/) {
600	$c_arc->put ([$path, $file]);
601
602	} else {	877	}
603	warn "ignoring $path/$file\n" if $VERBOSE >= 3;
604	}
605	}	878	};
606	};	879	};
		880
		881	$scandir->($path);
		882	aio_wait $grp;
607	}	883	}
608		884
609	sub generate_plurals {	885	sub generate_plurals {
610	# use Lingua::EN::Inflect ();	886	# use Lingua::EN::Inflect ();
611	# Lingua::EN::Inflect::classical;	887	# Lingua::EN::Inflect::classical;
…		…
645	"Unless you run verbosely, all following warning\n",	921	"Unless you run verbosely, all following warning\n",
646	"or error messages indicate serious problems.\n",	922	"or error messages indicate serious problems.\n",
647	"\n";	923	"\n";
648		924
649	if (!-d "$path/treasures") {	925	if (!-d "$path/treasures") {
650	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";
651	exit 1 unless $FORCE;	927	exit 1 unless $FORCE;
652	}	928	}
653		929
654	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;
655		934
656	find_files $path;	935	find_files $path;
657		936
658	my @a_arc = map +(async \&process_arc), 1..2;
659	my @a_res = map +(async \&process_res), 1..2;
660	my @a_trs = map +(async \&process_trs), 1..2;
661
662	IO::AIO::flush;
663
664	$c_res->shutdown;
665	$c_arc->shutdown;	937	$c_arc->shutdown;
666	$c_trs->shutdown;	938	$c_any->shutdown;
667
668	print "start file scan, arc, res processing...\n" if $VERBOSE;
669		939
670	$_->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;
671		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
672	print "end arc, start png processing...\n" if $VERBOSE;	966	print "starting png processing...\n" if $VERBOSE;
673		967
674	# eight png crunchers work fine for my 4x smp machine	968	# eight png crunchers work fine for my 4x smp machine
675	my @a_png = map +(async \&process_png), 1..8;	969	my @a_png = map +(async \&process_png), 1..8;
676		970
677	$_->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;
678		976
679	print "scanning done, processing results...\n" if $VERBOSE;	977	print "scanning done, processing results...\n" if $VERBOSE;
680	{	978	{
681	# remove path prefix from editor_folder	979	# remove path prefix from editor_folder
		980	$_->{editor_folder} =~ /^\x00/
682	substr $_->{editor_folder}, 0, 1 + length $path, ""	981	and substr $_->{editor_folder}, 0, 2 + length $path, ""
683	for values %ARC;	982	for values %ARC;
684		983
685	print "resolving inheritance tree...\n" if $VERBOSE;	984	print "resolving inheritance tree...\n" if $VERBOSE;
686	# resolve inherit	985	# resolve inherit
687	while () {	986	while () {
688	my $progress;	987	my $progress;
689	my $loop;	988	my $loop;
690		989
691	for my $o (values %ARC) {	990	for my $o (values %ARC) {
692	if (my $other = $o->{inherit}) {	991	for my $other (split /,/, $o->{inherit}) {
693	if (my $s = $ARC{$other}) {	992	if (my $s = $ARC{$other}) {
694	if ($s->{inherit}) {	993	if ($s->{inherit}) {
695	$loop = $s;	994	$loop = $s;
696	} else {	995	} else {
697	delete $o->{inherit};	996	delete $o->{inherit};
…		…
699	delete @s{qw(_name more name name_pl)};	998	delete @s{qw(_name more name name_pl)};
700	%$o = ( %s, %$o );	999	%$o = ( %s, %$o );
701	++$progress;	1000	++$progress;
702	}	1001	}
703	} else {	1002	} else {
704	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";
705	delete $ARC{$o->{_name}};	1004	delete $ARC{$o->{_name}};
706	}	1005	}
707	}	1006	}
708	}	1007	}
709		1008
…		…
716	}	1015	}
717		1016
718	# 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
719	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;	1018	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;
720		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
721	print "generating plurals...\n" if $VERBOSE;	1031	#print "generating plurals...\n" if $VERBOSE;
722	generate_plurals;	1032	#generate_plurals;
723		1033
724	print "writing archetypes...\n" if $VERBOSE;	1034	printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
725	open my $fh, ">:utf8", "$DATADIR/archetypes~"	1035	open my $fh, ">:utf8", "$DATADIR/archetypes~"
726	or die "$DATADIR/archetypes~: $!";	1036	or die "$DATADIR/archetypes~: $!";
727	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];
728	}	1038	}
729		1039
730	{	1040	{
731	print "writing treasures...\n" if $VERBOSE;	1041	printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
732	open my $fh, ">:utf8", "$DATADIR/treasures~"	1042	open my $fh, ">:utf8", "$DATADIR/treasures~"
733	or die "$DATADIR/treasures~: $!";	1043	or die "$DATADIR/treasures~: $!";
734	print $fh $TRS;	1044	print $fh $TRS;
735	}	1045	}
736		1046
737	{	1047	{
738	print "processing facedata...\n" if $VERBOSE;	1048	print "processing facedata...\n" if $VERBOSE;
739	while (my ($k, $v) = each %FACEINFO) {
740	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
741	length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
742
743	#length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
744	#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
745
746	if (my $magicmap = $v->{magicmap}) {
747	$magicmap =~ y/A-Z_\-/a-z/d;
748	$v->{magicmap} = $COLOR{$magicmap};
749	}
750
751	delete $v->{arc};
752	}	1049
		1050	for my $k (sort keys %FACEINFO) {
		1051	my $v = $FACEINFO{$k};
753		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	while (my ($k, $v) = each %RESOURCE) {
		1112	if ($v->{meta} && $v->{meta}{datadir}) {
		1113	delete $RESOURCE{$k};
		1114
		1115	$k =~ s/^res\/// or die "$k: datadir files must be in res/";
		1116
		1117	printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
		1118	open my $fh, ">:raw", "$DATADIR/$k~"
		1119	or die "$DATADIR/$k~: $!";
		1120	syswrite $fh, $v->{data};
		1121	push @COMMIT, $k;
		1122
		1123	} else {
		1124	if ($v->{type} & 1) {
		1125	# prepend meta info
		1126
		1127	my $meta = $enc->encode ({
		1128	name => $k,
		1129	%{ $v->{meta} \|\| {} },
		1130	});
		1131
		1132	$v->{data} = pack "(w/a)", $meta, $v->{data};
		1133	}
		1134
		1135	make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
		1136	}
		1137	}
		1138
754	print "writing facedata...\n" if $VERBOSE;	1139	printf "writing facedata...\n" if $VERBOSE;
		1140
		1141	{
755	open my $fh, ">:perlio", "$DATADIR/facedata~"	1142	open my $fh, ">:perlio", "$DATADIR/facedata~"
756	or die "$DATADIR/facedata~: $!";	1143	or die "$DATADIR/facedata~: $!";
757		1144
		1145	print $fh "FACEDATA";
		1146	my $fofs = 8;
		1147
		1148	my $put = sub {
		1149	my $len = length $_[0];
		1150	my $ofs = $fofs;
		1151
		1152	print $fh $_[0];
		1153	$fofs += $len;
		1154
		1155	($len, $ofs)
		1156	};
		1157
		1158	for (values %FACEINFO) {
		1159	($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32});
		1160	($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64});
		1161	}
		1162
		1163	for (values %RESOURCE) {
		1164	($_->{size}, $_->{fofs}) = $put->(delete $_->{data});
		1165	}
		1166
		1167	close $fh;
		1168	}
		1169
		1170	printf "writing faceinfo (%d faces, %d anims, %d resources)...\n",
		1171	scalar keys %FACEINFO,
		1172	scalar keys %ANIMINFO,
		1173	scalar keys %RESOURCE
		1174	if $VERBOSE;
		1175
		1176	open my $fh, ">:perlio", "$DATADIR/faceinfo~"
		1177	or die "$DATADIR/faceinfo~: $!";
		1178
758	print $fh freeze {	1179	print $fh nfreeze {
759	version => 2,	1180	version => 2,
760	faceinfo => \%FACEINFO,	1181	faceinfo => \%FACEINFO,
761	animinfo => \%ANIMINFO,	1182	animinfo => \%ANIMINFO,
762	resource => \%RESOURCE,	1183	resource => \%RESOURCE,
763	};	1184	};
764	}	1185	}
765		1186
766	print "committing files...\n" if $VERBOSE;	1187	print "committing files...\n" if $VERBOSE;
767		1188
768	for (qw(archetypes facedata treasures)) {	1189	for (qw(archetypes faceinfo facedata treasures), @COMMIT) {
769	chmod 0644, "$DATADIR/$_~";	1190	chmod 0644, "$DATADIR/$_~";
770	rename "$DATADIR/$_~", "$DATADIR/$_"	1191	rename "$DATADIR/$_~", "$DATADIR/$_"
771	or die "$DATADIR/$_: $!";	1192	or die "$DATADIR/$_: $!";
772	}	1193	}
773		1194

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.74 by root, Wed Oct 28 04:10:46 2009 UTC vs. Revision 1.123 by root, Sun Nov 11 04:29:11 2012 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.74 by root, Wed Oct 28 04:10:46 2009 UTC vs.
Revision 1.123 by root, Sun Nov 11 04:29:11 2012 UTC