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.46 by root, Wed Jul 25 22:30:38 2007 UTC vs.
Revision 1.52 by root, Sat Aug 18 22:25:35 2007 UTC

… …
19use IO::AIO (); 19use IO::AIO ();
20use File::Temp; 20use File::Temp;
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
24use POSIX (); 25use POSIX ();
25use Digest::MD5; 26use Digest::MD5;
26use Carp; 27use Carp;
27use Coro::Storable; $Storable::canonical = 1; 28use Coro::Storable; $Storable::canonical = 1;
28 29
… …
170 # possibly enlarge 171 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 172 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 173 my $other = "$stem.64x64.png~";
173 174
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 175 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 176 fork_sub {
177 my $CROP;
178 my $SRC = "png:\Q$path\E";
179
180 # check if this is a wall. ultra-ugly. ultra-ultra-ugly.
181 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) {
182 my ($pfx, $dir, $sfx) = ($1, hex $2, $3);
183 #check for 0..F images to be sure(?) this is a wall
184 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) {
185 # add a 4px border and add other images around it
186 $CROP = "-shave 8x8 +repage";
187
188 $w += 8;
189 $h += 8;
190
191 $SRC = "-size ${w}x${h} xc:transparent";
192 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
193
194 # 8 surrounding images
195 for (
196 # x y b r0 r1
197 [-1, -1, 0, 6],
198 [ 0, -1, 1, 10, 14],
199 [+1, -1, 0, 12],
200
201 [-1, 0, 8, 5, 7],
202 #
203 [+1, 0, 2, 5, 13],
204
205 [-1, +1, 0, 3],
206 [ 0, +1, 4, 10, 11],
207 [+1, +1, 0, 9],
208 ) {
209 my ($x, $y, $d, $r0, $r1) = @$_;
210 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite",
211 "\Q$pfx",
212 ($dir & $d) ? $r1 : $r0,
213 "\Q$sfx",
214 $x * ($w - 8) + 4,
215 $y * ($h - 8) + 4;
216 }
217 }
218 }
219
177 system "convert png:\Q$path\E -depth 8 rgba:-" 220 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 221 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 222 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)"; 223 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 224 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 225 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 226 rename "$other~", $other;
184 }; 227 };
185 } 228 }
… …
394 437
395 sub load_cached($;$) { 438 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) { 439 unless (exists $FILECACHE{$_[0]}) {
397 my $data; 440 my $data;
398 if (0 < aio_load $_[0], $data) { 441 if (0 < aio_load $_[0], $data) {
442 if ($_[1]) {
399 $data = $_[1]->($data) 443 $data = eval { $_[1]->($data) };
400 if $_[1]; 444 warn "$_[0]: $@" if $@;
445 }
401 } 446 }
402 447
403 $FILECACHE{$_[0]} = $data; 448 $FILECACHE{$_[0]} = $data;
404 } 449 }
405 450
… …
413 my $data; 458 my $data;
414 aio_load "$dir/$file", $data; 459 aio_load "$dir/$file", $data;
415 460
416 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 461 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
417 462
418 $file =~ s/\.res$//; 463 next if $meta && !exists $meta->{$file};
419 $file =~ s/\.(ogg|wav|jpg|png)$//;
420
421 substr $dir, 0, 1 + length $PATH, "";
422 464
423 $meta = { 465 $meta = {
424 %{ $meta->{"" } || {} }, 466 %{ $meta->{"" } || {} },
425 %{ $meta->{$file} || {} }, 467 %{ $meta->{$file} || {} },
426 }; 468 };
469
470 if ($meta->{license} =~ s/^#//) {
471 $meta->{license} = ({
472 "pd" => "Public Domain",
473 "gpl" => "GNU General Public License, version 3.0 or any later",
474 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
475 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/",
476 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
477 })->{$meta->{license}}
478 || warn "$dir/$file: license tag '$meta->{license}' not found.";
479 }
480
481 $file =~ s/\.res$//;
482 $file =~ s/\.(ogg|wav|jpg|png)$//;
483
484 substr $dir, 0, 1 + length $PATH, "";
427 485
428 $RESOURCE{"$dir/$file"} = { 486 $RESOURCE{"$dir/$file"} = {
429 type => (delete $meta->{type}) || $type, 487 type => (delete $meta->{type}) || $type,
430 data => $data, 488 data => $data,
431 chksum => (Digest::MD5::md5 $data), 489 chksum => (Digest::MD5::md5 $data),
… …
451 for my $file (@$nondirs) { 509 for my $file (@$nondirs) {
452 if ($dir =~ /^music(?:\/|$)/) { 510 if ($dir =~ /^music(?:\/|$)/) {
453 push @res, [$path, $file, 3] # FT_MUSIC 511 push @res, [$path, $file, 3] # FT_MUSIC
454 if $file =~ /\.(ogg)$/; 512 if $file =~ /\.(ogg)$/;
455 513
456 } elsif ($dir =~ /^sounds(?:\/|$)/) { 514 } elsif ($dir =~ /^sound(?:\/|$)/) {
457 push @res, [$path, $file, 5] # FT_SOUND 515 push @res, [$path, $file, 5] # FT_SOUND
458 if $file =~ /\.(wav|ogg)$/; 516 if $file =~ /\.(wav|ogg)$/;
459 517
460 } elsif ($dir =~ /^res(?:\/|$)/) { 518 } elsif ($dir =~ /^res(?:\/|$)/) {
461 push @res, [$path, $file, 0] # FT_FACE 519 push @res, [$path, $file, 0] # FT_FACE

Diff Legend

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