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.17 by root, Wed Mar 14 16:23:26 2007 UTC vs.
Revision 1.23 by root, Tue Apr 10 09:35:24 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/\.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) {
… …
257 $info->{visibility} = $visibility if defined $visibility; 307 $info->{visibility} = $visibility if defined $visibility;
258 $info->{magicmap} = $magicmap if defined $magicmap; 308 $info->{magicmap} = $magicmap if defined $magicmap;
259 } 309 }
260 310
261 if (my $smooth = delete $o->{smoothface}) { 311 if (my $smooth = delete $o->{smoothface}) {
262 my ($face, $smooth) = split /\s+/, $smooth; 312 my %kv =split /\s+/, $smooth;
263 # skip empty_S.x11, it seems to server no purpose whatsoever 313 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
264 # but increases bandwidth demands and worse. 314 while (my ($face, $smooth) = each %kv) {
265 unless ($smooth eq "empty_S.x11") {
266 $FACEINFO{$face}{smooth} = $smooth; 315 $FACEINFO{$face}{smooth} = $smooth;
316 $FACEINFO{$face}{smoothlevel} = $level;
267 } 317 }
268 } 318 }
269 } 319 }
270 } 320 }
271 } 321 }
… …
297 find_files "$path/$_" 347 find_files "$path/$_"
298 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 348 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
299 349
300 for my $file (@$nondirs) { 350 for my $file (@$nondirs) {
301 if ($file =~ /\.png$/) { 351 if ($file =~ /\.png$/) {
302 push @png, "$path/$file"; 352 push @png, ["$path/$file", 0];
303 } elsif ($file =~ /\.trs$/) { 353 } elsif ($file =~ /\.trs$/) {
304 push @trs, [$path, $file]; 354 push @trs, [$path, $file];
305 } elsif ($file =~ /\.arc$/) { 355 } elsif ($file =~ /\.arc$/) {
306 push @arc, [$path, $file]; 356 push @arc, [$path, $file];
307 } else { 357 } else {
… …
312 } 362 }
313 363
314 sub inst_arch($) { 364 sub inst_arch($) {
315 my (undef, $path) = @_; 365 my (undef, $path) = @_;
316 366
317 print "installing '$path' to '$DATADIR'\n"; 367 print "installing '$path' to '$DATADIR'\n",
368 "(this can take a long time if you run this\n",
369 "for the first time or do not use --cache).\n";
318 370
319 if (!-d "$path/treasures") { 371 if (!-d "$path/treasures") {
320 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 372 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
321 exit 1 unless $FORCE; 373 exit 1 unless $FORCE;
322 } 374 }
323 375
324 find_files $path; 376 find_files $path;
325 IO::AIO::flush; 377 IO::AIO::flush;
326 378
327 $_->join for ( 379 $_->join for (
328 (async \&process_png), (async \&process_png), 380 # four png crunchers work fine for my 2x smp machine
381 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
329 (async \&process_trs), (async \&process_trs), 382 (async \&process_trs), (async \&process_trs),
330 (async \&process_arc), (async \&process_arc), 383 (async \&process_arc), (async \&process_arc),
331 ); 384 );
332 385
333 { 386 {
… …
349 print $fh $TRS; 402 print $fh $TRS;
350 } 403 }
351 404
352 { 405 {
353 while (my ($k, $v) = each %FACEINFO) { 406 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"; 407 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
408 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
409
410 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
411 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
359 412
360 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 413 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
414 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
361 } 415 }
362 416
363 open my $fh, ">:perlio", "$DATADIR/faces~" 417 open my $fh, ">:perlio", "$DATADIR/facedata~"
364 or die "$DATADIR/faces~: $!"; 418 or die "$DATADIR/facedata~: $!";
365 419
366 $FACEINFO{""} = { version => 1}; 420 $FACEINFO{""} = { version => 1};
367 print $fh Storable::nfreeze \%FACEINFO; 421 print $fh Storable::nfreeze \%FACEINFO;
368 } 422 }
369 423
370 for (qw(archetypes faces animations treasures)) { 424 for (qw(archetypes facedata animations treasures)) {
371 chmod 0644, "$DATADIR/$_~"; 425 chmod 0644, "$DATADIR/$_~";
372 rename "$DATADIR/$_~", "$DATADIR/$_" 426 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!"; 427 or die "$DATADIR/$_: $!";
374 } 428 }
375 429

Diff Legend

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