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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.19 by root, Sun Apr 1 00:36:35 2007 UTC vs.
Revision 1.33 by root, Thu Apr 26 00:50:03 2007 UTC

 my $CONVERT  = "@CONVERT@";
 my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
+my $PNGNQ    = "@PNGNQ@";
 use Getopt::Long;
 use Coro::Event;
 use AnyEvent;
 use IO::AIO ();
 use Crossfire;
 use Coro;
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
-use Storable; $Storable::canonical = 1;
+use Coro::Storable; $Storable::canonical = 1;
 sub usage {
    warn <<EOF;
 Usage: cfutil [-v] [-q] [--force] [--cache]
               [--install-arch path]
 }
 sub inst_maps($) {
    my (undef, $path) = @_;
-   print "installing '$path' to '$DATADIR/maps'\n";
+   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";
       exit 1 unless $FORCE;
    }
    print "maps installed successfully.\n";
 }
 {
+   our %ANIMINFO;
    our %FACEINFO;
    our @ARC;
+   our %ARC;
    our $TRS;
    our $NFILE;
-   our %ANIM;
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
    our (@png, @trs, @arc); # files we are interested in
             # possibly enlarge
             if (0 > aio_stat "$stem.64x64.png") {
                my $other = "$stem.64x64.png~";
                if (0 > aio_lstat $other or (-M _) > (-M $path)) {
-                  warn "rescale $other\n";#d#
                   my $wrap = 0; # for the time being
                   fork_sub {
                      system "convert png:\Q$path\E -depth 8 rgba:-"
                           . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
                           . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
                              and die "convert/hq2xa pipeline error: status $? ($!)";
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
                }
                my $other = "$stem.32x32.png~";
                if (0 > aio_lstat $other or (-M _) > (-M $path)) {
                   fork_sub {
                      system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
+                     # reduce smoothfaces >10000 bytes
+                     if ($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~~";
+                           last if 10000 > -s "$other~~";
+                           $ncolor = int $ncolor * 0.9;
+                           $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
+                        }
+                        printf "reduced %s from %d to %d bytes using %d colours.\n",
+                              $other, -s "$other~", -s "$other~~", $ncolor
+                           if $VERBOSE >= 2;
+                        rename "$other~~", "$other~";
+                     }
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
                }
-               warn "scaled down $path to $other\n";#d#
+               #warn "scaled down $path to $other\n";#d#
                push @png, [$other, !$CACHE];
             }
          }
          (my $face = $stem) =~ s/^.*\///;
+         # split all bigfaces, but avoid smoothfaces (*_S)
          if (($w > $T || $h > $T) && $face !~ /_S\./) {
             # split
             my @tile;
             for my $x (0 .. (int $w / $T) - 1) {
                for my $y (0 .. (int $h / $T) - 1) {
          aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
          my $arc = read_arch "$dir/$file";
          for my $o (values %$arc) {
             push @ARC, $o;
+            for (my $m = $o; $m; $m = $m->{more}) {
+               $ARC{$m->{_name}} = $m;
+            }
             $o->{editor_folder} = $dir;
             my $visibility = delete $o->{visibility};
             my $magicmap   = delete $o->{magicmap};
                my $x = $o->{x} - $dx;
                my $y = $o->{y} - $dy;
                my $ext = $x|$y ? "+$x+$y" : "";
-               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
+               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
                my $visibility = delete $o->{visibility} if exists $o->{visibility};
                my $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
                my $anim = delete $o->{anim};
                if ($anim) {
+                  # possibly add $ext to the animation name to avoid
+                  # the need to specify archnames for all parts
+                  # of a multipart archetype.
                   $o->{animation} = "$o->{_name}";
+                  my $facings = 1;
+                  my @frames;
                   for (@$anim) {
-                     $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
+                     if (/^facings\s+(\d+)/) {
+                        $facings = $1*1;
+                     } elsif (/^blank.x11$|^empty.x11$/) {
+                        push @frames, $_;
+                     } else {
+                        push @frames, "$_$ext";
+                     }
                   }
-                  $ANIM{"$o->{_name}$ext"} =
+                  $ANIMINFO{$o->{animation}} = {
-                     join "", map "$_\n",
+                     facings => $facings,
-                        "anim $o->{_name}",
+                     frames  => \@frames,
-                        @$anim,
+                  };
-                        "mina";
                }
                for my $face ($o->{face} || (), @{$anim || []}) {
                   next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
                   $info->{visibility} = $visibility if defined $visibility;
                   $info->{magicmap}   = $magicmap   if defined $magicmap;
                }
                if (my $smooth = delete $o->{smoothface}) {
-                  my ($face, $smooth) = split /\s+/, $smooth;
+                  my %kv =split /\s+/, $smooth;
-                  # skip empty_S.x11, it seems to server no purpose whatsoever
+                  my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
-                  # but increases bandwidth demands and worse.
+                  while (my ($face, $smooth) = each %kv) {
-                  unless ($smooth eq "empty_S.x11") {
-                     $FACEINFO{$face}{smooth} = $smooth;
+                     $FACEINFO{$face}{smooth}      = $smooth;
+                     $FACEINFO{$face}{smoothlevel} = $level;
                   }
                }
             }
          }
       }
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
             } else {
-               warn "ignoring $path/$file\n" if $VERBOSE >= 2;
+               warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
          }
       };
    }
    sub inst_arch($) {
       my (undef, $path) = @_;
+      print "\n",
-      print "installing '$path' to '$DATADIR'\n",
+            "Installing '$path' to '$DATADIR'\n",
+            "\n",
-            "(this can take a long time if you run this\n",
+            "This can take a long time if you run this\n",
-            "for the first time or do not use --cache).\n";
+            "for the first time or do not use --cache.\n",
+            "\n",
+            "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";
          exit 1 unless $FORCE;
       }
          (async \&process_trs), (async \&process_trs),
          (async \&process_arc), (async \&process_arc),
       );
       {
-         open my $fh, ">:utf8", "$DATADIR/animations~"
+         # remove path prefix from editor_folder
-            or die "$DATADIR/animations~: $!";
+         substr $_->{editor_folder}, 0, 1 + length $path, ""
-         print $fh join "", map $ANIM{$_}, sort keys %ANIM
+            for values %ARC;
+         # resolve inherit
+         while () {
+            my $progress;
+            my $loop;
+            for my $o (values %ARC) {
+               if (my $other = $o->{inherit}) {
+                  if (my $s = $ARC{$other}) {
+                     if ($s->{inherit}) {
+                        $loop = $s;
+                     } else {
+                        delete $o->{inherit};
+                        my %s = %$s;
+                        delete @s{qw(_name more name name_pl)};
+                        %$o = ( %s, %$o );
+                        ++$progress;
+                     }
+                  } else {
+                     warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
+                     delete $ARC{$o->{_name}};
+                  }
+               }
+            }
+            unless ($progress) {
+               die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
+                  if $loop;
+               last;
+            }
-      }
+         }
-      {
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
-         substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
+         print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
-         print $fh Crossfire::archlist_to_string \@ARC;
       }
       {
          open my $fh, ">:utf8", "$DATADIR/treasures~"
             or die "$DATADIR/treasures~: $!";
       {
          while (my ($k, $v) = each %FACEINFO) {
             length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
             length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
+            length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
+            #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
             $v->{chksum64} = Digest::MD5::md5 $v->{data64};
          }
          open my $fh, ">:perlio", "$DATADIR/facedata~"
             or die "$DATADIR/facedata~: $!";
-         $FACEINFO{""} = { version => 1};
+         print $fh freeze {
-         print $fh Storable::nfreeze \%FACEINFO;
+            version => 2,
+            faceinfo => \%FACEINFO,
+            animinfo => \%ANIMINFO,
-      }
+         };
+      }
-      for (qw(archetypes facedata animations treasures)) {
+      for (qw(archetypes facedata treasures)) {
          chmod 0644, "$DATADIR/$_~";
          rename "$DATADIR/$_~", "$DATADIR/$_"
             or die "$DATADIR/$_: $!";
       }

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.19 by root, Sun Apr 1 00:36:35 2007 UTC vs. Revision 1.33 by root, Thu Apr 26 00:50:03 2007 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.19 by root, Sun Apr 1 00:36:35 2007 UTC vs.
Revision 1.33 by root, Thu Apr 26 00:50:03 2007 UTC