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.13 by root, Mon Mar 12 17:33:12 2007 UTC vs.
Revision 1.25 by root, Fri Apr 13 05:08:51 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]
… …
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
92 our $SMOOTH; 93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
93 94
94 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
95 96
96 sub commit_png { 97 sub commit_png($$$) {
97 my ($name, $data) = @_; 98 my ($name, $data, $T) = @_;
98 99
99 $PNG32{$name} = $data; 100 $FACEINFO{$name}{"data$T"} = $data;
100 $FACEINFO{$name} ||= {};
101 } 101 }
102 102
103 sub process_png { 103 sub process_png {
104 while (@png) { 104 while (@png) {
105 my $path = pop @png; 105 my ($path, $delete) = @{pop @png};
106 106
107 my $png; 107 my $png;
108 aio_lstat $path; 108 aio_lstat $path;
109 my ($size, $mtime) = (stat _)[7,9]; 109 my ($size, $mtime) = (stat _)[7,9];
110 110
111 if (0 > aio_load $path, $png) { 111 if (0 > aio_load $path, $png) {
112 warn "$path: $!, skipping.\n"; 112 warn "$path: $!, skipping.\n";
113 next; 113 next;
114 } 114 }
115 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
116 # quickly extract width and height of the (necessarily PNG) image 128 # quickly extract width and height of the (necessarily PNG) image
117 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 129 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
118 warn "$path: not a recongized png file, skipping.\n"; 130 warn "$path: not a recognized png file, skipping.\n";
119 next; 131 next;
120 } 132 }
121 133
122 my ($w, $h) = unpack "NN", $1; 134 my ($w, $h) = unpack "NN", $1;
123
124 (my $face = $path) =~ s/^.*\///;
125 my $T = 32;
126
127 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
128 warn "$path: weird filename, skipping.\n";
129 next;
130 }
131 135
132 if ($w < $T || $h < $T) { 136 if ($w < $T || $h < $T) {
133 warn "$path: too small ($w $h), skipping.\n"; 137 warn "$path: too small ($w $h), skipping.\n";
134 next; 138 next;
135 } 139 }
… …
137 if ($w % $T || $h % $T) { 141 if ($w % $T || $h % $T) {
138 warn "$path: weird png size ($w $h), skipping.\n"; 142 warn "$path: weird png size ($w $h), skipping.\n";
139 next; 143 next;
140 } 144 }
141 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)
142 if (($w > $T || $h > $T) && $face !~ /_S\./) { 188 if (($w > $T || $h > $T) && $face !~ /_S\./) {
143 # split 189 # split
144 my @tile; 190 my @tile;
145 for my $x (0 .. (int $w / $T) - 1) { 191 for my $x (0 .. (int $w / $T) - 1) {
146 for my $y (0 .. (int $h / $T) - 1) { 192 for my $y (0 .. (int $h / $T) - 1) {
… …
160 ( 206 (
161 "(", 207 "(",
162 "+clone", 208 "+clone",
163 -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),
164 "+repage", 210 "+repage",
211 -quality => "00",
165 -write => "png:$_->[2]~", 212 -write => "png32:$_->[2]~",
166 "+delete", 213 "+delete",
167 ")", 214 ")",
168 ) 215 )
169 } @todo), 216 } @todo),
170 "null:"; 217 "null:";
… …
174 close $convert; 221 close $convert;
175 222
176 # pass 2, optimise, and rename 223 # pass 2, optimise, and rename
177 for (@todo) { 224 for (@todo) {
178 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 225 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
226 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
179 rename "$_->[2]~", $_->[2]; 227 rename "$_->[2]~", $_->[2];
180 } 228 }
181 }; 229 };
182 } 230 }
183 231
… …
187 235
188 if (0 > aio_load $file, $tile) { 236 if (0 > aio_load $file, $tile) {
189 die "$path: unable to read tile +$x+$y, aborting.\n"; 237 die "$path: unable to read tile +$x+$y, aborting.\n";
190 } 238 }
191 IO::AIO::aio_unlink $file unless $CACHE; 239 IO::AIO::aio_unlink $file unless $CACHE;
192 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 240 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
193 } 241 }
194 } else { 242 } else {
195 # use as-is (either small, use smooth) 243 # use as-is (either small, use smooth)
196 commit_png $face, $png; 244 commit_png $face, $png, $T;
197 } 245 }
246
247 aio_unlink $path if $delete;
198 } 248 }
199 } 249 }
200 250
201 sub process_arc { 251 sub process_arc {
202 while (@arc) { 252 while (@arc) {
… …
234 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
235 285
236 my $anim = delete $o->{anim}; 286 my $anim = delete $o->{anim};
237 287
238 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.
239 $o->{animation} = "$o->{_name}"; 292 $o->{animation} = "$o->{_name}";
293 my $facings = 1;
294 my @frames;
240 295
241 for (@$anim) { 296 for (@$anim) {
242 $_ .= $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 }
243 } 304 }
244 305
245 $ANIM{"$o->{_name}$ext"} = 306 $ANIMINFO{$o->{animation}} = {
246 join "", map "$_\n", 307 facings => $facings,
247 "anim $o->{_name}", 308 frames => \@frames,
248 @$anim, 309 };
249 "mina";
250 } 310 }
251 311
252 for my $face ($o->{face} || (), @{$anim || []}) { 312 for my $face ($o->{face} || (), @{$anim || []}) {
253 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 313 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
254 314
… …
257 $info->{visibility} = $visibility if defined $visibility; 317 $info->{visibility} = $visibility if defined $visibility;
258 $info->{magicmap} = $magicmap if defined $magicmap; 318 $info->{magicmap} = $magicmap if defined $magicmap;
259 } 319 }
260 320
261 if (my $smooth = delete $o->{smoothface}) { 321 if (my $smooth = delete $o->{smoothface}) {
262 $SMOOTH .= "$smooth\n"; 322 my %kv =split /\s+/, $smooth;
323 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
324 while (my ($face, $smooth) = each %kv) {
325 $FACEINFO{$face}{smooth} = $smooth;
326 $FACEINFO{$face}{smoothlevel} = $level;
327 }
263 } 328 }
264 } 329 }
265 } 330 }
266 } 331 }
267 } 332 }
… …
292 find_files "$path/$_" 357 find_files "$path/$_"
293 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 358 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
294 359
295 for my $file (@$nondirs) { 360 for my $file (@$nondirs) {
296 if ($file =~ /\.png$/) { 361 if ($file =~ /\.png$/) {
297 push @png, "$path/$file"; 362 push @png, ["$path/$file", 0];
298 } elsif ($file =~ /\.trs$/) { 363 } elsif ($file =~ /\.trs$/) {
299 push @trs, [$path, $file]; 364 push @trs, [$path, $file];
300 } elsif ($file =~ /\.arc$/) { 365 } elsif ($file =~ /\.arc$/) {
301 push @arc, [$path, $file]; 366 push @arc, [$path, $file];
302 } else { 367 } else {
… …
307 } 372 }
308 373
309 sub inst_arch($) { 374 sub inst_arch($) {
310 my (undef, $path) = @_; 375 my (undef, $path) = @_;
311 376
312 print "installing '$path' to '$DATADIR'\n"; 377 print "installing '$path' to '$DATADIR'\n",
378 "(this can take a long time if you run this\n",
379 "for the first time or do not use --cache).\n";
313 380
314 if (!-d "$path/treasures") { 381 if (!-d "$path/treasures") {
315 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 382 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
316 exit 1 unless $FORCE; 383 exit 1 unless $FORCE;
317 } 384 }
318 385
319 find_files $path; 386 find_files $path;
320 IO::AIO::flush; 387 IO::AIO::flush;
321 388
322 $_->join for ( 389 $_->join for (
323 (async \&process_png), (async \&process_png), 390 # four png crunchers work fine for my 2x smp machine
391 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
324 (async \&process_trs), (async \&process_trs), 392 (async \&process_trs), (async \&process_trs),
325 (async \&process_arc), (async \&process_arc), 393 (async \&process_arc), (async \&process_arc),
326 ); 394 );
327
328 {
329 open my $fh, ">:utf8", "$DATADIR/animations~"
330 or die "$DATADIR/animations~: $!";
331 print $fh join "", map $ANIM{$_}, sort keys %ANIM
332 }
333 395
334 { 396 {
335 open my $fh, ">:utf8", "$DATADIR/archetypes~" 397 open my $fh, ">:utf8", "$DATADIR/archetypes~"
336 or die "$DATADIR/archetypes~: $!"; 398 or die "$DATADIR/archetypes~: $!";
337 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 399 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
338 print $fh Crossfire::archlist_to_string \@ARC; 400 print $fh Crossfire::archlist_to_string \@ARC;
339 } 401 }
340 402
341 { 403 {
342 open my $fh, ">:utf8", "$DATADIR/smooth~"
343 or die "$DATADIR/smooth~: $!";
344 print $fh $SMOOTH;
345 }
346
347 {
348 open my $fh, ">:utf8", "$DATADIR/treasures~" 404 open my $fh, ">:utf8", "$DATADIR/treasures~"
349 or die "$DATADIR/treasures~: $!"; 405 or die "$DATADIR/treasures~: $!";
350 print $fh $TRS; 406 print $fh $TRS;
351 } 407 }
352 408
353 { 409 {
354 while (my ($k, $v) = each %FACEINFO) { 410 while (my ($k, $v) = each %FACEINFO) {
355 $v->{data32} ||= delete $PNG32{$k};
356 }
357
358 while (my ($k, $v) = each %FACEINFO) {
359 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 411 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
412 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
413
414 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
415 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
360 416
361 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 417 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
418 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
362 } 419 }
363 420
364 open my $fh, ">:perlio", "$DATADIR/faces~" 421 open my $fh, ">:perlio", "$DATADIR/facedata~"
365 or die "$DATADIR/faces~: $!"; 422 or die "$DATADIR/facedata~: $!";
366 423
367 print $fh Storable::nfreeze \%FACEINFO; 424 print $fh freeze {
425 version => 2,
426 faceinfo => \%FACEINFO,
427 animinfo => \%ANIMINFO,
368 } 428 };
429 }
369 430
370 for (qw(archetypes faces animations treasures smooth)) { 431 for (qw(archetypes facedata treasures)) {
371 chmod 0644, "$DATADIR/$_~"; 432 chmod 0644, "$DATADIR/$_~";
372 rename "$DATADIR/$_~", "$DATADIR/$_" 433 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!"; 434 or die "$DATADIR/$_: $!";
374 } 435 }
375 436

Diff Legend

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