[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra/MapWidget.pm

Comparing deliantra/Deliantra/Deliantra/MapWidget.pm (file contents):
Revision 1.15 by root, Tue Feb 7 17:46:22 2006 UTC vs.
Revision 1.16 by root, Thu Feb 9 22:02:02 2006 UTC

    $self->{x} =
    $self->{y} = 0;
    delete $self->{face};
+   delete $self->{face_extents};
-   $self->update_map (0, 0, $self->{width}, $self->{height});
+   $self->update_map (0, 0, $map->{width}, $map->{height});
    delete $self->{tipinfo}; $self->update_tooltip;
    $self->invalidate_all;
 }
 sub coord {
 sub update_map {
    my ($self, $x, $y, $w, $h) = @_;
    delete $self->{tipinfo}; $self->update_tooltip;
+   my ($x1, $y1, $x2, $y2) = ($x, $y, $x + $w - 1, $y + $h - 1);
 #   push @{ $self->{queue_draw_areay} }, [$x * TILESIZE - $self->{x},
 #                                         $y * TILESIZE - $self->{y},
 #                                         $w * TILESIZE, $h * TILESIZE];
-   $self->{update_map} ||= add Glib::Idle sub {
+   # we store precomputed tile info into $self->{face}
-      delete $self->{update_map};
+   # and the minimum/maximum extents into $self->{face_extents}
-      my $map = $self->{map}{map};
+   my $map = $self->{map}{map};
-      my $ov  = $self->{face} ||= [];
+   my $ov  = $self->{face} ||= [];
+   my $ext = $self->{face_extents} ||= [];
-      my ($x, $w) = (0, $self->{map}{width});
+   # extend update area as neccessary to include all bigfaces
-      my ($y, $h) = (0, $self->{map}{height});
+   # that overlap the update area
+   for my $x ($x1 .. $x2) {
+      my $col = $ext->[$x] ||= [];
+      for my $y ($y1 .. $y2) {
+         if (my $ext = $col->[$y]) {
+            $x1 = $ext->[0] if $ext->[0] < $x1;
+            $y1 = $ext->[1] if $ext->[1] < $y1;
+            $x2 = $ext->[2] if $ext->[2] > $x2;
+            $y2 = $ext->[3] if $ext->[3] > $y2;
+         }
+         # reset extents
+         $col->[$y] = [$x, $y, $x, $y];
+      }
+   }
-      my @x = ($x .. $x + $w - 1);
-      my @y = ($y .. $y + $h - 1);
-      my $TC = \%Crossfire::Tilecache::TILECACHE;
+   my $TC = \%Crossfire::Tilecache::TILECACHE;
+   $self->queue_draw_area (
+      $x1 * TILESIZE - $self->{x}, $y1 * TILESIZE - $self->{y},
+      ($x2 - $x1 + 1) * TILESIZE , ($y2 - $y1 + 1) * TILESIZE ,
+   );
-      my @ov;
+   my @ov;
-      # update overlay map with bigfaces and chained faces
+   # update overlay map with bigfaces and chained faces
-      my $a;
+   my $a;
-      for my $x (@x) {
+   for my $x ($x1 .. $x2) {
-         my $ass = $self->{map}{map}[$x];
+      my $ass = $self->{map}{map}[$x];
-         my $oss = $ov->[$x] ||= [];
+      my $oss = $ov->[$x] ||= [];
-         for my $y (@y) {
+      for my $y ($y1 .. $y2) {
-            my $os = $oss->[$y] = [];
+         my $os = $oss->[$y] = [];
-            for my $a (@{ $ass->[$y] || [] }) {
+         for my $a (@{ $ass->[$y] || [] }) {
-               my $o = $ARCH->{$a->{_name}}
+            my $o = $ARCH->{$a->{_name}}
-                  or (warn "arch '$a->{_name}' not found at ($x|$y)\n"), next;
+               or (warn "arch '$a->{_name}' not found at ($x|$y)\n"), next;
-               my $tile = $TC->{$a->{face} || $o->{face}}
+            my $tile = $TC->{$a->{face} || $o->{face}}
-                  or (warn "no gfx found for arch '$a->{_name}' at ($x|$y)\n"), next;
+               or (warn "no gfx found for arch '$a->{_name}' at ($x|$y)\n"), next;
-               if ($tile->{w} > 1 || $tile->{h} > 1) {
+            if ($tile->{w} > 1 || $tile->{h} > 1) {
-                  # bigfaces
+               # bigfaces
+               my $maxx = $x + $tile->{w} - 1;
+               my $maxy = $y + $tile->{h} - 1;
-                  for my $ox (0 .. $tile->{w} - 1) {
+               for my $ox (0 .. $tile->{w} - 1) {
-                     for my $oy (0 .. $tile->{h} - 1) {
+                  for my $oy (0 .. $tile->{h} - 1) {
+                     my $ext = $ext->[$x + $ox][$y + $oy];
+                     $ext->[0] = $x    if $ext->[0] > $x;
+                     $ext->[1] = $y    if $ext->[1] > $y;
+                     $ext->[2] = $maxx if $ext->[2] < $maxx;
+                     $ext->[3] = $maxy if $ext->[3] < $maxy;
-                        push @ov, [$x + $ox, $y + $oy,
+                     push @ov, [$x + $ox, $y + $oy,
-                                   $tile->{idx} + $ox + $oy * $tile->{w}];
+                                $tile->{idx} + $ox + $oy * $tile->{w}];
-                     }
                   }
-               } elsif ($o->{more}) {
-                  # linked faces
-                  do {
-                     my $tile = $TC->{$o->{face}}
-                        or (warn "no gfx found for arch '$a->{_name}' at ($x*|$y*)\n"), next;
-                     push @ov, [$x + $o->{x}, $y + $o->{y}, $tile->{idx}];
-                  } while $o = $o->{more};
-               } else {
-                  # single face
-                  push @$os, $tile->{idx};
                }
+            } elsif ($o->{more}) {
+               # linked faces, slowest and mosta nnoying
+               my ($minx, $miny, $maxx, $maxy);
+               for (my $o = $o; $o; $o = $o->{more}) {
+                  $minx = $o->{x} if $minx > $o->{x};
+                  $miny = $o->{y} if $miny > $o->{y};
+                  $maxx = $o->{x} if $maxx < $o->{x};
+                  $maxy = $o->{y} if $maxy < $o->{y};
+               }
+               $minx += $x;
+               $miny += $y;
+               $maxx += $x;
+               $maxy += $y;
+               for (my $o = $o; $o; $o = $o->{more}) {
+                  my $tile = $TC->{$o->{face}}
+                     or (warn "no gfx found for arch '$a->{_name}' at ($x*|$y*)\n"), next;
+                  my $ext = $ext->[$x + $o->{x}][$y + $o->{y}];
+                  $ext->[0] = $minx if $ext->[0] > $minx;
+                  $ext->[1] = $miny if $ext->[1] > $miny;
+                  $ext->[2] = $maxx if $ext->[2] < $maxx;
+                  $ext->[3] = $maxy if $ext->[3] < $maxy;
+                  push @ov, [$x + $o->{x}, $y + $o->{y}, $tile->{idx}];
+               }
+            } else {
+               # single face
+               push @$os, $tile->{idx};
             }
          }
       }
+   }
-      # bigger faces always on top, I don't give a shit to those who think otherwise
+   # bigger faces always on top, I don't give a shit to those who think otherwise
-      for (@ov) {
+   for (@ov) {
-         my ($x, $y, $idx) = @$_;
+      my ($x, $y, $idx) = @$_;
-         push @{ $ov->[$x][$y] }, $idx;
+      push @{ $ov->[$x][$y] }, $idx;
+   }
+   # dump extent info
+#   for my $x ($x1 .. $x2) {
+#      for my $y ($y1 .. $y2) {
+#         my $ext = $ext->[$x][$y];
+#         if ($ext->[0] != $x || $ext->[1] != $y || $ext->[2] != $x || $ext->[3] != $y) {
+#            warn "EXT $x $y (@$ext)\n";#d#
+#         }
-      }
+#      }
-#      $self->queue_draw_area (@$_)
-#         for @{ delete $self->{queue_draw_areay} };
-      $self->invalidate_all;
-      0
-   };
+#   }
 }
 sub expose {
    my ($self, $event) = @_;

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra/MapWidget.pm (file contents): Revision 1.15 by root, Tue Feb 7 17:46:22 2006 UTC vs. Revision 1.16 by root, Thu Feb 9 22:02:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra/MapWidget.pm (file contents):
Revision 1.15 by root, Tue Feb 7 17:46:22 2006 UTC vs.
Revision 1.16 by root, Thu Feb 9 22:02:02 2006 UTC