[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.111 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.117 by root, Sat Oct 15 05:06:49 2011 UTC

 #!@PERL@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 #
-# Copyright (©) 2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
 #
 # Deliantra is free software: you can redistribute it and/or modify it under
 # the terms of the Affero GNU General Public License as published by the
 # Free Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
    khaki      => 12,
 );
 END { system "rm", "-rf", $TMPDIR }
-my $s_INT  = EV::signal INT  => sub { exit 1 };
+my $s_INT  = AE::signal INT  => sub { exit 1 };
-my $s_TERM = EV::signal TERM => sub { exit 1 };
+my $s_TERM = AE::signal TERM => sub { exit 1 };
 our %hash;
 # here we could try to avoid collisions and reduce chksum size further
 sub make_hash($\$\$;$) {
    my ($id, $dataref, $hashref, $clen) = @_;
-   my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
+   my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
    if (exists $hash{$hash}) {
       # hash collision, but some files are simply identical
       if (${$hash{$hash}[1]} ne $$dataref)  {
-         warn "hash collision $hash{$hash}[0] vs. $id\n";
+         warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
          exit 1;
       } else {
          print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
       }
    }
    $hash{$hash} = [$id, $dataref, $hashref];
    $$hashref = $hash;
+}
+sub optipng($) {
+   system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
+   die "$_[0] has zero size, aborting." unless -s $_[0];
 }
 mkdir $TMPDIR, 0700
    or die "$TMPDIR: $!";
    my (undef, $path) = @_;
    print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
    if (!-f "$path/regions") {
-      warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
+      warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n";
       exit 1 unless $FORCE;
    }
    system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
           "$path/.", "$DATADIR/maps/.",
    our %FACEINFO;
    our %RESOURCE;
    our @ARC;
    our %ARC;
    our $TRS;
+   our %PNG;
    our $NFILE;
    our $PATH;
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
          my $png;
          aio_lstat $path;
          my ($size, $mtime) = (stat _)[7,9];
          if (0 > aio_load $path, $png) {
-            warn "$path: $!, skipping.\n";
+            warn "ERROR: $path: $!, skipping.\n";
             next;
          }
          my $stem = $path;
          my $T;
          if ($stem =~ s/\.32x32\.png~?$//) {
             $T = 32;
          } elsif ($stem =~ s/\.64x64\.png~?$//) {
             $T = 64;
          } else {
-            warn "$path: weird filename, skipping.\n";
+            warn "ERROR: $path: weird filename, skipping.\n";
             next;
          }
          # quickly extract width and height of the (necessarily PNG) image
          unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
-            warn "$path: not a recognized png file, skipping.\n";
+            warn "ERROR: $path: not a recognized png file, skipping.\n";
             next;
          }
          my ($w, $h) = unpack "NN", $1;
          if ($w < $T || $h < $T) {
-            warn "$path: too small ($w $h), skipping.\n";
+            warn "ERROR: $path: too small ($w $h), skipping.\n";
             next;
          }
          if ($w % $T || $h % $T) {
-            warn "$path: weird png size ($w $h), skipping.\n";
+            warn "ERROR: $path: weird png size ($w $h), skipping.\n";
             next;
          }
          (my $base = $stem) =~ s/^.*\///;
                      system "convert -depth 8 $SRC rgba:-"
                           . "| $exec_prefix/bin/cfhq2xa $w $h 0"
                           . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
                         and die "convert/cfhq2xa pipeline error: status $? ($!)";
-                     system $OPTIPNG, "-i0", "-q", "$other~";
+                     optipng "$other~";
-                     die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
                };
                push @c_png, [$other, !$CACHE];
                my $other = "$stem.32x32.png~";
                make_file $path, $other, sub {
                   fork_exec {
                      system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
-                     system $OPTIPNG, "-i0", "-q", "$other~";
+                     optipng "$other~";
                      # reduce smoothfaces >10000 bytes
                      # obsolete, no longer required
                      if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
                         my $ncolor = 256;
                         while () {
                            system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
-                           system $OPTIPNG, "-i0", "-q", "$other~~";
+                           optipng "$other~~";
                            last if 10000 > -s "$other~~";
                            $ncolor = int $ncolor * 0.9;
                            $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
                         }
                push @c_png, [$other, !$CACHE];
             }
          }
          (my $face = $stem) =~ s/^.*\///;
+         for (@{ $fi->{derive} }) {
+            my ($dir, $type) = @$_;
+            my $geom = "${T}x${T}";
+            my $dpath = "$dir/$type:$face.$geom.png~";
+            if ($type eq "buildmaterial") {
+               my $ov = "$PATH/mapbuilding/buildmaterial.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } elsif ($type eq "buildmaterial-box") {
+               my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT \Q$ov\E "
+                            . "\\( \Q$path\E -trim -geometry 34x31\\> "
+                            . "-gravity center -background transparent -extent 37x34 +gravity "
+                            . "-geometry +22+6 \\) -composite "
+                            . "-geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } elsif ($type eq "buildmaterial-sbox") {
+               my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
+               make_file [$path, $ov], $dpath, sub {
+                  fork_exec {
+                     system "$CONVERT \Q$ov\E "
+                            . "\\( \Q$path\E -trim -geometry 16x24\\> "
+                            . "-gravity center -background transparent -extent 18x26 +gravity "
+                            . "-geometry +26+16 \\) -composite "
+                            . "-geometry $geom png:\Q$dpath\E~";
+                     optipng "$dpath~";
+                     rename "$dpath~", $dpath;
+                  };
+               };
+            } else {
+               warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
+            }
+            aio_load $dpath, my $png;
+            IO::AIO::aio_unlink $dpath unless $CACHE;
+            commit_png "$dir/$type:$face", "$type:$face", $png, $T;
+         }
          # split all bigfaces, but avoid smoothfaces (*_S)
          if (($w > $T || $h > $T) && $face !~ /_S\./) {
             # split
             my @tile;
                   push @tile, [$x, $y, $file, (stat _)[9]];
                }
             }
             my $mtime = (lstat $path)[9];
-            my @todo = grep { $_->[3] <= $mtime } @tile;
+            my @todo = grep { $_->[3] < $mtime } @tile;
             if (@todo) {
                fork_exec {
                   open my $convert, "|-", $CONVERT,
                      "png:-",
                      (map {
                   print $convert $png;
                   close $convert;
                   # pass 2, optimise, and rename
                   for (@todo) {
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
+                     optipng "$_->[2]~";
-                     die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
                      rename "$_->[2]~", $_->[2];
                   }
                };
             }
          } else {
             # use as-is (either small, use smooth)
             commit_png $stem, $face, $png, $T;
          }
-         aio_unlink $path if $delete;
+         IO::AIO::aio_unlink $path if $delete;
       }
    }
    sub process_faceinfo {
       my ($dir, $file) = @_;
       my $path = "$dir/$file";
       my $data;
       if (0 > aio_load $path, $data) {
-         warn "$path: $!, skipping.\n";
+         warn "ERROR: $path: $!, skipping.\n";
          return;
       }
       for (split /\n/, $data) {
          chomp;
          $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
          $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
          (my $fgi = $COLOR{$fg})
-            // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
+            // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
          (my $bgi = $COLOR{$bg})
-            // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
+            // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
          my $fi = $FACEINFO{$face} ||= { };
          $fi->{visibility} = $visibility * 1;
          $fi->{magicmap}   = $fgi; # foreground colour becomes magicmap
                   next if /^facings\s/;
                   my $face = $_;
                   $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
-                  my $info = $FACEINFO{$face} ||= { };
+                  # handle derived faces
+                  if ($face =~ /^([^:]+):(.*)/) {
+                     my ($type, $base) = ($1, $2);
+                     push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
+                  }
-                  $info->{arc} = $o;
+                  $FACEINFO{$face}{arc} = $o;
                   next if $face =~ /^blank.x11$|^empty.x11$/;
                }
                if (my $smooth = delete $o->{smoothface}) {
       my ($dir, $file) = @_;
       my $path = "$dir/$file";
       my $trs;
       if (0 > aio_load $path, $trs) {
-         warn "$path: $!, skipping.\n";
+         warn "ERROR: $path: $!, skipping.\n";
          return;
       }
       $TRS .= $trs;
    }
       unless (exists $FILECACHE{$_[0]}) {
          my $data;
          if (0 < aio_load $_[0], $data) {
             if ($_[1]) {
                $data = eval { $_[1]->($data) };
-               warn "$_[0]: $@" if $@;
+               warn "ERROR: $_[0]: $@" if $@;
             }
          }
          $FILECACHE{$_[0]} = $data;
       }
       my @plt;
       my %map;
       for (split /\n/, $plt) {
          next unless /\S/;
+         next if /^\s*#/;
          /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
             or die "unparseable palette entry for $base.plt: $_";
          my ($rgb, $name) = ($1, $2);
             "cc/by/2.0"       => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
             "cc/by/2.1"       => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
             "cc/by/2.5"       => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
             "cc/by/3.0"       => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
          })->{$meta->{license}}
-           || warn "$dir/$file: license tag '$meta->{license}' not found.";
+           || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
       }
       if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
          ($meta->{author} = $1) =~ s/_/ /g;
       }
             $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
          } elsif ($filter eq "perl2json") {
             $data = eval $data; die if $@;
             $data = JSON::XS::encode_json $data;
          } else {
-            warn "$dir/$file: unknown filter $filter, skipping\n";
+            warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
          }
       }
       substr $dir, 0, 1 + length $PATH, "";
                   } else {
                      $c_any->put ([\&process_res, $path, $file, undef]);
                   }
                } elsif ($file =~ /\.png$/) {
-                  push @c_png, ["$path/$file", 0];
+                  $PNG{$file} = $path;
                } elsif ($file =~ /\.faceinfo$/) {
                   $c_any->put ([\&process_faceinfo, $path, $file]);
                } elsif ($file =~ /\.trs$/) {
             "Unless you run verbosely, all following warning\n",
             "or error messages indicate serious problems.\n",
             "\n";
       if (!-d "$path/treasures") {
-         warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
+         warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
          exit 1 unless $FORCE;
       }
-      print "start file scan, arc, any processing...\n" if $VERBOSE;
+      print "starting file scan, arc, any processing...\n" if $VERBOSE;
       my @a_arc = map +(async \&process_arc), 1..2;
       my @a_any = map +(async \&process_any), 1..4;
       find_files $path;
       $c_arc->shutdown;
       $c_any->shutdown;
       $_->join for @a_arc; # need to parse all archetypes before png processing
+      print "finished arc processing...\n" if $VERBOSE;
+      # fill png queue
+      for (keys %FACEINFO) {
+         # we only expect source pngs to exist for non-derived
+         # faces, i.e. no split tiles (+x+x) and no face derivates
+         # (xxx:)
+         /^[^:]+\....$/
+            or next;
+         my $seen;
+         if (exists $PNG{"$_.32x32.png"}) {
+            push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
+            $seen = 1;
+         }
+         if (exists $PNG{"$_.64x64.png"}) {
+            push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
+            $seen = 1;
+         }
+         warn "ERROR: $_: face not found, expect problems.\n"
+            unless $seen;
+      }
-      print "end arc, start png processing...\n" if $VERBOSE;
+      print "starting png processing...\n" if $VERBOSE;
       # eight png crunchers work fine for my 4x smp machine
       my @a_png = map +(async \&process_png), 1..8;
-      print "end any processing...\n" if $VERBOSE;
       $_->join for @a_any;
-      print "end png processing...\n" if $VERBOSE;
+      print "finished any processing...\n" if $VERBOSE;
       $_->join for @a_png;
+      print "finished png processing...\n" if $VERBOSE;
       print "scanning done, processing results...\n" if $VERBOSE;
       {
          # remove path prefix from editor_folder
          $_->{editor_folder} =~ /^\x00/
                         delete @s{qw(_name more name name_pl)};
                         %$o = ( %s, %$o );
                         ++$progress;
                      }
                   } else {
-                     warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
+                     warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
                      delete $ARC{$o->{_name}};
                   }
                }
             }
       }
       {
          print "processing facedata...\n" if $VERBOSE;
          while (my ($k, $v) = each %FACEINFO) {
-            length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
+            length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
-            length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
+            length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
             make_hash $k, $v->{data32}, $v->{hash32};
             make_hash $k, $v->{data64}, $v->{hash64};
             #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
             #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
-            $v->{glyph}      // warn "WARNING: face '$k' has glyph.";
+            $v->{glyph}      // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
-            $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
+            $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
-            $v->{magicmap}   // warn "WARNING: face '$k' has foreground colour.";
+            $v->{magicmap}   // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
-            delete @$v{qw(arc stem)}; # not used by the server
+            delete @$v{qw(arc stem derive)}; # not used by the server
          }
          print "processing resources...\n" if $VERBOSE;
          my $enc = JSON::XS->new->utf8->canonical->relaxed;
          while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.111 by root, Fri Apr 22 02:03:12 2011 UTC vs. Revision 1.117 by root, Sat Oct 15 05:06:49 2011 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.111 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.117 by root, Sat Oct 15 05:06:49 2011 UTC