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.18 by root, Sat Mar 17 19:57:02 2007 UTC vs.
Revision 1.19 by root, Sun Apr 1 00:36:35 2007 UTC

… …
82 82
83 print "maps installed successfully.\n"; 83 print "maps installed successfully.\n";
84} 84}
85 85
86{ 86{
87 our %PNG32;
88 our %FACEINFO; 87 our %FACEINFO;
89 our @ARC; 88 our @ARC;
90 our $TRS; 89 our $TRS;
91 our $NFILE; 90 our $NFILE;
92 our %ANIM; 91 our %ANIM;
93 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
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/\.32x32\.png$//) {
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 }
136 140
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 }
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 warn "rescale $other\n";#d#
153 my $wrap = 0; # for the time being
154 fork_sub {
155 system "convert png:\Q$path\E -depth 8 rgba:-"
156 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
157 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
158 and die "convert/hq2xa pipeline error: status $? ($!)";
159 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
160 die "$other~ has zero size, aborting." unless -s "$other~";
161 rename "$other~", $other;
162 };
163 }
164
165 push @png, [$other, !$CACHE];
166 }
167
168 # possibly scale down
169 if (0 > aio_stat "$stem.32x32.png") {
170 my $other = "$stem.32x32.png~";
171
172 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
173 fork_sub {
174 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
175 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
176 die "$other~ has zero size, aborting." unless -s "$other~";
177 rename "$other~", $other;
178 };
179 }
180
181 warn "scaled down $path to $other\n";#d#
182
183 push @png, [$other, !$CACHE];
184 }
185 }
186
187 (my $face = $stem) =~ s/^.*\///;
141 188
142 if (($w > $T || $h > $T) && $face !~ /_S\./) { 189 if (($w > $T || $h > $T) && $face !~ /_S\./) {
143 # split 190 # split
144 my @tile; 191 my @tile;
145 for my $x (0 .. (int $w / $T) - 1) { 192 for my $x (0 .. (int $w / $T) - 1) {
… …
160 ( 207 (
161 "(", 208 "(",
162 "+clone", 209 "+clone",
163 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 210 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
164 "+repage", 211 "+repage",
212 -quality => "00",
165 -write => "png:$_->[2]~", 213 -write => "png32:$_->[2]~",
166 "+delete", 214 "+delete",
167 ")", 215 ")",
168 ) 216 )
169 } @todo), 217 } @todo),
170 "null:"; 218 "null:";
… …
174 close $convert; 222 close $convert;
175 223
176 # pass 2, optimise, and rename 224 # pass 2, optimise, and rename
177 for (@todo) { 225 for (@todo) {
178 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 226 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
227 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
179 rename "$_->[2]~", $_->[2]; 228 rename "$_->[2]~", $_->[2];
180 } 229 }
181 }; 230 };
182 } 231 }
183 232
… …
187 236
188 if (0 > aio_load $file, $tile) { 237 if (0 > aio_load $file, $tile) {
189 die "$path: unable to read tile +$x+$y, aborting.\n"; 238 die "$path: unable to read tile +$x+$y, aborting.\n";
190 } 239 }
191 IO::AIO::aio_unlink $file unless $CACHE; 240 IO::AIO::aio_unlink $file unless $CACHE;
192 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 241 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
193 } 242 }
194 } else { 243 } else {
195 # use as-is (either small, use smooth) 244 # use as-is (either small, use smooth)
196 commit_png $face, $png; 245 commit_png $face, $png, $T;
197 } 246 }
247
248 aio_unlink $path if $delete;
198 } 249 }
199 } 250 }
200 251
201 sub process_arc { 252 sub process_arc {
202 while (@arc) { 253 while (@arc) {
… …
297 find_files "$path/$_" 348 find_files "$path/$_"
298 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 349 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
299 350
300 for my $file (@$nondirs) { 351 for my $file (@$nondirs) {
301 if ($file =~ /\.png$/) { 352 if ($file =~ /\.png$/) {
302 push @png, "$path/$file"; 353 push @png, ["$path/$file", 0];
303 } elsif ($file =~ /\.trs$/) { 354 } elsif ($file =~ /\.trs$/) {
304 push @trs, [$path, $file]; 355 push @trs, [$path, $file];
305 } elsif ($file =~ /\.arc$/) { 356 } elsif ($file =~ /\.arc$/) {
306 push @arc, [$path, $file]; 357 push @arc, [$path, $file];
307 } else { 358 } else {
… …
312 } 363 }
313 364
314 sub inst_arch($) { 365 sub inst_arch($) {
315 my (undef, $path) = @_; 366 my (undef, $path) = @_;
316 367
317 print "installing '$path' to '$DATADIR'\n"; 368 print "installing '$path' to '$DATADIR'\n",
369 "(this can take a long time if you run this\n",
370 "for the first time or do not use --cache).\n";
318 371
319 if (!-d "$path/treasures") { 372 if (!-d "$path/treasures") {
320 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 373 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
321 exit 1 unless $FORCE; 374 exit 1 unless $FORCE;
322 } 375 }
323 376
324 find_files $path; 377 find_files $path;
325 IO::AIO::flush; 378 IO::AIO::flush;
326 379
327 $_->join for ( 380 $_->join for (
328 (async \&process_png), (async \&process_png), 381 # four png crunchers work fine for my 2x smp machine
382 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
329 (async \&process_trs), (async \&process_trs), 383 (async \&process_trs), (async \&process_trs),
330 (async \&process_arc), (async \&process_arc), 384 (async \&process_arc), (async \&process_arc),
331 ); 385 );
332 386
333 { 387 {
… …
349 print $fh $TRS; 403 print $fh $TRS;
350 } 404 }
351 405
352 { 406 {
353 while (my ($k, $v) = each %FACEINFO) { 407 while (my ($k, $v) = each %FACEINFO) {
354 $v->{data32} ||= delete $PNG32{$k};
355 }
356
357 while (my ($k, $v) = each %FACEINFO) {
358 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 408 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
409 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
359 410
360 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 411 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
412 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
361 } 413 }
362 414
363 open my $fh, ">:perlio", "$DATADIR/faces~" 415 open my $fh, ">:perlio", "$DATADIR/facedata~"
364 or die "$DATADIR/faces~: $!"; 416 or die "$DATADIR/facedata~: $!";
365 417
366 $FACEINFO{""} = { version => 1}; 418 $FACEINFO{""} = { version => 1};
367 print $fh Storable::nfreeze \%FACEINFO; 419 print $fh Storable::nfreeze \%FACEINFO;
368 } 420 }
369 421
370 for (qw(archetypes faces animations treasures)) { 422 for (qw(archetypes facedata animations treasures)) {
371 chmod 0644, "$DATADIR/$_~"; 423 chmod 0644, "$DATADIR/$_~";
372 rename "$DATADIR/$_~", "$DATADIR/$_" 424 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!"; 425 or die "$DATADIR/$_: $!";
374 } 426 }
375 427

Diff Legend

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