[ViewVC] Diff of: cvs/cfmaps/cfmap2png

Comparing cfmaps/cfmap2png (file contents):
Revision 1.8 by root, Sun Nov 20 00:58:57 2005 UTC vs.
Revision 1.12 by root, Tue Nov 22 06:46:43 2005 UTC

 # You should have received a copy of the GNU General Public License
 # along with gvpe; if not, write to the Free Software
 # Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 # tower of stars: missing craters?
+# world_108_123 (8|18), hole below grass but shouldn't?
+our $VERSION = '1.11';
 use strict;
 use Storable;
 use List::Util qw(max);
 use Gtk2;
-our $VERSION = '1.0';
 #init Gtk2::Gdk;
 my $LIB = $ENV{CROSSFIRE_LIBDIR}
    or die "\$CROSSFIRE_LIBDIR must be set\n";
    my %meta;
    my ($mapx, $mapy);
-   my $map = $meta{map} = [];
+   my $map;
    for (@{ $mapa->{arch} }) {
+      my ($x, $y) = ($_->{x}, $_->{y});
       if ($_->{_name} eq "map") {
          $meta{info} = $_;
-         $mapx = $_->{width}  || $_->{x};
+         $mapx = $_->{width}  || $x;
-         $mapy = $_->{height} || $_->{y};
+         $mapy = $_->{height} || $y;
       } else {
-         push @{ $map->[$_->{x}][$_->{y}] }, $_;
+         push @{ $map->[$x][$y] }, $_;
          # arch map is unreliable w.r.t. width and height
-         $mapx = $_->{x} + 1 if $mapx <= $_->{x};
+         $mapx = $x + 1 if $mapx <= $x;
-         $mapy = $_->{y} + 1 if $mapy <= $_->{y};
+         $mapy = $y + 1 if $mapy <= $y;
          #$mapx = $a->{x} + 1, warn "$mapname: arch '$a->{_name}' outside map width at ($a->{x}|$a->{y})\n" if $mapx <= $a->{x};
          #$mapy = $a->{y} + 1, warn "$mapname: arch '$a->{_name}' outside map height at ($a->{x}|$a->{y})\n" if $mapy <= $a->{y};
       }
    }
    $meta{width}  = $mapx;
    $meta{height} = $mapy;
    my %draw_info;
+   my %map_info;
    # first pass, gather face stacking order, border and corner info
    for my $x (0 .. $mapx - 1) {
       my $col = $map->[$x];
       for my $y (0 .. $mapy - 1) {
                or (warn "$mapname: arch '$a->{_name}' not found at ($x|$y)\n"), next;
             my $smoothlevel = exists $a->{smoothlevel} ? $a->{smoothlevel} : $o->{smoothlevel};
             my $is_floor    = exists $a->{is_floor}    ? $a->{is_floor}    : $o->{is_floor};
             my $level       = $smoothlevel ? $smoothlevel
-                            : $is_floor    ? 0
+                            : $is_floor    ? $layer - 1000
-                            :                256 + $layer;
+                            :                $layer + 1000;
             while ($o) {
                my $face = $a->{face} || $o->{face};
                my $pb = tile $face
                last if 0 > $mx || $mx >= $mapx
                     || 0 > $my || $my >= $mapy;
                # this is very ugly (some tiles are 32x33 or worse)
                my $bigface = $pb->get_width >= T*2 || $pb->get_height >= T*2;
+               my $dx = $bigface ? $o->{x} : 0;
+               my $dy = $bigface ? $o->{y} : 0;
+               push @{ $map_info{$level}{$mx, $my} }, $a;
+               $draw_info{$level}{$face}{$mx, $my} |= 0x2000 | (($dx + 128) << 24) | (($dy + 128) << 16);
                if (my $sface = $smooth->{$face}) {
                   $bigface and die "can't handle bigfaces with smoothing ($face)\n";
                   # full tile
                   $draw_info{$smoothlevel}{$sface}{$mx - 1, $my + 1} |= 0x0200;
                   $draw_info{$smoothlevel}{$sface}{$mx - 1, $my - 1} |= 0x0400;
                   $draw_info{$smoothlevel}{$sface}{$mx + 1, $my - 1} |= 0x0800;
                }
-               my $dx = $bigface ? $o->{x} : 0;
-               my $dy = $bigface ? $o->{y} : 0;
-               $draw_info{$level}{$face}{$mx, $my} |= 0x2000 | (($dx + 128) << 24) | (($dy + 128) << 16);
                $o = $o->{more};
             }
          }
       }
    }
    my $map_pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, $mapx * T, $mapy * T
          or die;
    $map_pb->fill (0xffffff00);
-   # second pass, render all the stuff
+   # second pass, render the map
    for my $level (sort { $a <=> $b } keys %draw_info) {
       my $v = $draw_info{$level};
       while (my ($sface, $info) = each %$v) {
          my $pb = tile $sface
             or die "no smooth face $sface\n";
                   255
                ) if $corner;
             }
          }
       }
+   }
+   # third pass, gather meta info
+   for my $level (sort { $a <=> $b } keys %map_info) {
+      my $info = $map_info{$level};
+         while (my ($xy, $as) = each %$info) {
+            my ($x, $y) = split $;, $xy;
+            next if $x < 0 || $x >= $mapx
+                 || $y < 0 || $y >= $mapy;
+            push @{ $meta{map}[$x][$y] }, $_ for @$as;
+         }
    }
    ($map_pb, \%meta)
 }

Diff Legend

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

Comparing cfmaps/cfmap2png (file contents): Revision 1.8 by root, Sun Nov 20 00:58:57 2005 UTC vs. Revision 1.12 by root, Tue Nov 22 06:46:43 2005 UTC

Diff Legend

Comparing cfmaps/cfmap2png (file contents):
Revision 1.8 by root, Sun Nov 20 00:58:57 2005 UTC vs.
Revision 1.12 by root, Tue Nov 22 06:46:43 2005 UTC