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.14 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.29 by root, Wed Apr 18 09:38:58 2007 UTC

… …
20use Crossfire; 20use Crossfire;
21use Coro; 21use Coro;
22use Coro::AIO; 22use Coro::AIO;
23use POSIX (); 23use POSIX ();
24use Digest::MD5; 24use Digest::MD5;
25use Coro::Storable; $Storable::canonical = 1;
25 26
26sub usage { 27sub usage {
27 warn <<EOF; 28 warn <<EOF;
28Usage: cfutil [-v] [-q] [--force] [--cache] 29Usage: cfutil [-v] [-q] [--force] [--cache]
29 [--install-arch path] 30 [--install-arch path]
… …
67} 68}
68 69
69sub inst_maps($) { 70sub inst_maps($) {
70 my (undef, $path) = @_; 71 my (undef, $path) = @_;
71 72
72 print "installing '$path' to '$DATADIR/maps'\n"; 73 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
73 74
74 if (!-f "$path/regions") { 75 if (!-f "$path/regions") {
75 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 76 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
76 exit 1 unless $FORCE; 77 exit 1 unless $FORCE;
77 } 78 }
78 79
79 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 80 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
80 or die "map installation failed.\n"; 81 and die "map installation failed.\n";
81 82
82 print "maps installed successfully.\n"; 83 print "maps installed successfully.\n";
83} 84}
84 85
85{ 86{
86 our %PNG32; 87 our %ANIMINFO;
87 our %FACEINFO; 88 our %FACEINFO;
88 our @ARC; 89 our %ARC;
89 our $TRS; 90 our $TRS;
90 our $NFILE; 91 our $NFILE;
91 our %ANIM; 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
92 94
93 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
94 96
95 sub commit_png { 97 sub commit_png($$$) {
96 my ($name, $data) = @_; 98 my ($name, $data, $T) = @_;
97 99
98 $PNG32{$name} = $data; 100 $FACEINFO{$name}{"data$T"} = $data;
99 $FACEINFO{$name} ||= {};
100 } 101 }
101 102
102 sub process_png { 103 sub process_png {
103 while (@png) { 104 while (@png) {
104 my $path = pop @png; 105 my ($path, $delete) = @{pop @png};
105 106
106 my $png; 107 my $png;
107 aio_lstat $path; 108 aio_lstat $path;
108 my ($size, $mtime) = (stat _)[7,9]; 109 my ($size, $mtime) = (stat _)[7,9];
109 110
110 if (0 > aio_load $path, $png) { 111 if (0 > aio_load $path, $png) {
111 warn "$path: $!, skipping.\n"; 112 warn "$path: $!, skipping.\n";
112 next; 113 next;
113 } 114 }
114 115
116 my $stem = $path;
117 my $T;
118
119 if ($stem =~ s/\.32x32\.png~?$//) {
120 $T = 32;
121 } elsif ($stem =~ s/\.64x64\.png~?$//) {
122 $T = 64;
123 } else {
124 warn "$path: weird filename, skipping.\n";
125 next;
126 }
127
115 # quickly extract width and height of the (necessarily PNG) image 128 # quickly extract width and height of the (necessarily PNG) image
116 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 129 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
117 warn "$path: not a recongized png file, skipping.\n"; 130 warn "$path: not a recognized png file, skipping.\n";
118 next; 131 next;
119 } 132 }
120 133
121 my ($w, $h) = unpack "NN", $1; 134 my ($w, $h) = unpack "NN", $1;
122
123 (my $face = $path) =~ s/^.*\///;
124 my $T = 32;
125
126 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
127 warn "$path: weird filename, skipping.\n";
128 next;
129 }
130 135
131 if ($w < $T || $h < $T) { 136 if ($w < $T || $h < $T) {
132 warn "$path: too small ($w $h), skipping.\n"; 137 warn "$path: too small ($w $h), skipping.\n";
133 next; 138 next;
134 } 139 }
… …
136 if ($w % $T || $h % $T) { 141 if ($w % $T || $h % $T) {
137 warn "$path: weird png size ($w $h), skipping.\n"; 142 warn "$path: weird png size ($w $h), skipping.\n";
138 next; 143 next;
139 } 144 }
140 145
146 unless ($path =~ /~$/) {
147 # possibly enlarge
148 if (0 > aio_stat "$stem.64x64.png") {
149 my $other = "$stem.64x64.png~";
150
151 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
152 my $wrap = 0; # for the time being
153 fork_sub {
154 system "convert png:\Q$path\E -depth 8 rgba:-"
155 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
156 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
157 and die "convert/hq2xa pipeline error: status $? ($!)";
158 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
159 die "$other~ has zero size, aborting." unless -s "$other~";
160 rename "$other~", $other;
161 };
162 }
163
164 push @png, [$other, !$CACHE];
165 }
166
167 # possibly scale down
168 if (0 > aio_stat "$stem.32x32.png") {
169 my $other = "$stem.32x32.png~";
170
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 fork_sub {
173 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
174 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
175 die "$other~ has zero size, aborting." unless -s "$other~";
176 rename "$other~", $other;
177 };
178 }
179
180 #warn "scaled down $path to $other\n";#d#
181 push @png, [$other, !$CACHE];
182 }
183 }
184
185 (my $face = $stem) =~ s/^.*\///;
186
187 # split all bigfaces, but avoid smoothfaces (*_S)
141 if (($w > $T || $h > $T) && $face !~ /_S\./) { 188 if (($w > $T || $h > $T) && $face !~ /_S\./) {
142 # split 189 # split
143 my @tile; 190 my @tile;
144 for my $x (0 .. (int $w / $T) - 1) { 191 for my $x (0 .. (int $w / $T) - 1) {
145 for my $y (0 .. (int $h / $T) - 1) { 192 for my $y (0 .. (int $h / $T) - 1) {
… …
159 ( 206 (
160 "(", 207 "(",
161 "+clone", 208 "+clone",
162 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 209 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
163 "+repage", 210 "+repage",
211 -quality => "00",
164 -write => "png:$_->[2]~", 212 -write => "png32:$_->[2]~",
165 "+delete", 213 "+delete",
166 ")", 214 ")",
167 ) 215 )
168 } @todo), 216 } @todo),
169 "null:"; 217 "null:";
… …
173 close $convert; 221 close $convert;
174 222
175 # pass 2, optimise, and rename 223 # pass 2, optimise, and rename
176 for (@todo) { 224 for (@todo) {
177 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 225 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
226 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
178 rename "$_->[2]~", $_->[2]; 227 rename "$_->[2]~", $_->[2];
179 } 228 }
180 }; 229 };
181 } 230 }
182 231
… …
186 235
187 if (0 > aio_load $file, $tile) { 236 if (0 > aio_load $file, $tile) {
188 die "$path: unable to read tile +$x+$y, aborting.\n"; 237 die "$path: unable to read tile +$x+$y, aborting.\n";
189 } 238 }
190 IO::AIO::aio_unlink $file unless $CACHE; 239 IO::AIO::aio_unlink $file unless $CACHE;
191 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 240 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
192 } 241 }
193 } else { 242 } else {
194 # use as-is (either small, use smooth) 243 # use as-is (either small, use smooth)
195 commit_png $face, $png; 244 commit_png $face, $png, $T;
196 } 245 }
246
247 aio_unlink $path if $delete;
197 } 248 }
198 } 249 }
199 250
200 sub process_arc { 251 sub process_arc {
201 while (@arc) { 252 while (@arc) {
… …
204 my $arc; 255 my $arc;
205 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 256 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
206 257
207 my $arc = read_arch "$dir/$file"; 258 my $arc = read_arch "$dir/$file";
208 for my $o (values %$arc) { 259 for my $o (values %$arc) {
209 push @ARC, $o; 260 $ARC{$o->{_name}} = $o;
210 261
211 $o->{editor_folder} = $dir; 262 $o->{editor_folder} = $dir;
212 263
213 my $visibility = delete $o->{visibility}; 264 my $visibility = delete $o->{visibility};
214 my $magicmap = delete $o->{magicmap}; 265 my $magicmap = delete $o->{magicmap};
… …
225 my $x = $o->{x} - $dx; 276 my $x = $o->{x} - $dx;
226 my $y = $o->{y} - $dy; 277 my $y = $o->{y} - $dy;
227 278
228 my $ext = $x|$y ? "+$x+$y" : ""; 279 my $ext = $x|$y ? "+$x+$y" : "";
229 280
230 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; 281 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
231 282
232 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 283 my $visibility = delete $o->{visibility} if exists $o->{visibility};
233 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
234 285
235 my $anim = delete $o->{anim}; 286 my $anim = delete $o->{anim};
236 287
237 if ($anim) { 288 if ($anim) {
289 # possibly add $ext to the animation name to avoid
290 # the need to specify archnames for all parts
291 # of a multipart archetype.
238 $o->{animation} = "$o->{_name}"; 292 $o->{animation} = "$o->{_name}";
293 my $facings = 1;
294 my @frames;
239 295
240 for (@$anim) { 296 for (@$anim) {
241 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 297 if (/^facings\s+(\d+)/) {
298 $facings = $1*1;
299 } elsif (/^blank.x11$|^empty.x11$/) {
300 push @frames, $_;
301 } else {
302 push @frames, "$_$ext";
303 }
242 } 304 }
243 305
244 $ANIM{"$o->{_name}$ext"} = 306 $ANIMINFO{$o->{animation}} = {
245 join "", map "$_\n", 307 facings => $facings,
246 "anim $o->{_name}", 308 frames => \@frames,
247 @$anim, 309 };
248 "mina";
249 } 310 }
250 311
251 for my $face ($o->{face} || (), @{$anim || []}) { 312 for my $face ($o->{face} || (), @{$anim || []}) {
252 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 313 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
253 314
… …
256 $info->{visibility} = $visibility if defined $visibility; 317 $info->{visibility} = $visibility if defined $visibility;
257 $info->{magicmap} = $magicmap if defined $magicmap; 318 $info->{magicmap} = $magicmap if defined $magicmap;
258 } 319 }
259 320
260 if (my $smooth = delete $o->{smoothface}) { 321 if (my $smooth = delete $o->{smoothface}) {
261 my ($face, $smooth) = split /\s+/, $smooth; 322 my %kv =split /\s+/, $smooth;
262 # skip empty_S.x11, it seems to server no purpose whatsoever 323 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
263 # but increases bandwidth demands and worse. 324 while (my ($face, $smooth) = each %kv) {
264 unless ($smooth eq "empty_S.x11") {
265 $FACEINFO{$face}{smooth} = $smooth; 325 $FACEINFO{$face}{smooth} = $smooth;
326 $FACEINFO{$face}{smoothlevel} = $level;
266 } 327 }
267 } 328 }
268 } 329 }
269 } 330 }
270 } 331 }
… …
296 find_files "$path/$_" 357 find_files "$path/$_"
297 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 358 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
298 359
299 for my $file (@$nondirs) { 360 for my $file (@$nondirs) {
300 if ($file =~ /\.png$/) { 361 if ($file =~ /\.png$/) {
301 push @png, "$path/$file"; 362 push @png, ["$path/$file", 0];
302 } elsif ($file =~ /\.trs$/) { 363 } elsif ($file =~ /\.trs$/) {
303 push @trs, [$path, $file]; 364 push @trs, [$path, $file];
304 } elsif ($file =~ /\.arc$/) { 365 } elsif ($file =~ /\.arc$/) {
305 push @arc, [$path, $file]; 366 push @arc, [$path, $file];
306 } else { 367 } else {
… …
311 } 372 }
312 373
313 sub inst_arch($) { 374 sub inst_arch($) {
314 my (undef, $path) = @_; 375 my (undef, $path) = @_;
315 376
377 print "\n",
316 print "installing '$path' to '$DATADIR'\n"; 378 "Installing '$path' to '$DATADIR'\n",
379 "\n",
380 "This can take a long time if you run this\n",
381 "for the first time or do not use --cache.\n",
382 "\n",
383 "Unless you run verbosely, all following warning\n",
384 "or error messages indicate serious problems.\n",
385 "\n";
317 386
318 if (!-d "$path/treasures") { 387 if (!-d "$path/treasures") {
319 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 388 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
320 exit 1 unless $FORCE; 389 exit 1 unless $FORCE;
321 } 390 }
322 391
323 find_files $path; 392 find_files $path;
324 IO::AIO::flush; 393 IO::AIO::flush;
325 394
326 $_->join for ( 395 $_->join for (
327 (async \&process_png), (async \&process_png), 396 # four png crunchers work fine for my 2x smp machine
397 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
328 (async \&process_trs), (async \&process_trs), 398 (async \&process_trs), (async \&process_trs),
329 (async \&process_arc), (async \&process_arc), 399 (async \&process_arc), (async \&process_arc),
330 ); 400 );
331 401
332 { 402 {
333 open my $fh, ">:utf8", "$DATADIR/animations~" 403 # remove path prefix from editor_folder
334 or die "$DATADIR/animations~: $!"; 404 substr $_->{editor_folder}, 0, 1 + length $path, ""
335 print $fh join "", map $ANIM{$_}, sort keys %ANIM 405 for values %ARC;
406
407 # resolve inherit
408 while () {
409 my $progress;
410 my $loop;
411
412 for my $o (values %ARC) {
413 if (my $other = $o->{inherit}) {
414 if (my $s = $ARC{$other}) {
415 if ($s->{inherit}) {
416 $loop = $s;
417 } else {
418 delete $o->{inherit};
419 %$o = ( %$s, %$o );
420 ++$progress;
421 }
422 } else {
423 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
424 delete $ARC{$o->{_name}};
425 }
426 }
427 }
428
429 unless ($progress) {
430 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
431 if $loop;
432
433 last;
434 }
336 } 435 }
337 436
338 {
339 open my $fh, ">:utf8", "$DATADIR/archetypes~" 437 open my $fh, ">:utf8", "$DATADIR/archetypes~"
340 or die "$DATADIR/archetypes~: $!"; 438 or die "$DATADIR/archetypes~: $!";
341 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 439 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } values %ARC];
342 print $fh Crossfire::archlist_to_string \@ARC;
343 } 440 }
344 441
345 { 442 {
346 open my $fh, ">:utf8", "$DATADIR/treasures~" 443 open my $fh, ">:utf8", "$DATADIR/treasures~"
347 or die "$DATADIR/treasures~: $!"; 444 or die "$DATADIR/treasures~: $!";
348 print $fh $TRS; 445 print $fh $TRS;
349 } 446 }
350 447
351 { 448 {
352 while (my ($k, $v) = each %FACEINFO) { 449 while (my ($k, $v) = each %FACEINFO) {
353 $v->{data32} ||= delete $PNG32{$k};
354 }
355
356 while (my ($k, $v) = each %FACEINFO) {
357 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 450 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
451 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
452
453 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
454 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
358 455
359 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 456 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
457 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
360 } 458 }
361 459
362 open my $fh, ">:perlio", "$DATADIR/faces~" 460 open my $fh, ">:perlio", "$DATADIR/facedata~"
363 or die "$DATADIR/faces~: $!"; 461 or die "$DATADIR/facedata~: $!";
364 462
365 print $fh Storable::nfreeze \%FACEINFO; 463 print $fh freeze {
464 version => 2,
465 faceinfo => \%FACEINFO,
466 animinfo => \%ANIMINFO,
366 } 467 };
468 }
367 469
368 for (qw(archetypes faces animations treasures)) { 470 for (qw(archetypes facedata treasures)) {
369 chmod 0644, "$DATADIR/$_~"; 471 chmod 0644, "$DATADIR/$_~";
370 rename "$DATADIR/$_~", "$DATADIR/$_" 472 rename "$DATADIR/$_~", "$DATADIR/$_"
371 or die "$DATADIR/$_: $!"; 473 or die "$DATADIR/$_: $!";
372 } 474 }
373 475

Diff Legend

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