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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.61 by root, Thu Jun 15 15:33:58 2006 UTC

 use List::Util qw(min max);
 use CFClient::OpenGL;
 our @ISA = CFClient::UI::Base::;
+my $magicmap_tex =
+      new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
+         mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
    return unless $::CONN;
    $self->focus_in;
    if ($ev->{button} == 1) {
-      my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
+      my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
-      my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
+      my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
-      $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
-      $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
-      $x -= int 0.5 * $::MAP->w;
+      $x -= int 0.5 * $self->{sw};
-      $y -= int 0.5 * $::MAP->h;
+      $y -= int 0.5 * $self->{sh};
-      $x += 1;
-      $y += 1;
       $::CONN->lookat ($x, $y)
          if $::CONN;
    } elsif ($ev->{button} == 2) {
    }
    $res
 }
+sub set_magicmap {
+   my ($self, $w, $h, $x, $y, $data) = @_;
+   $x += - $::MAP->x - int 0.5 * $::MAP->w;
+   $y += - $::MAP->y - int 0.5 * $::MAP->h;
+   $self->{magicmap} = [$x, $y, $w, $h, $data];
+   $self->update;
+}
 sub draw {
    my ($self) = @_;
+   return unless $::MAP;
    my $focused = $CFClient::UI::FOCUS == $self
                  || $CFClient::UI::FOCUS == $self->{completer}{entry};
    return
-      unless $::CONN && ($focused || !$::FAST);
+      unless $focused || !$::FAST;
    if (delete $self->{need_update}) {
+      my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+      my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
+      my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
+      my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
+      my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+      my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
+      my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
+      if ($::CFG->{fow_enable}) {
+         my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
+         if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
+            glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
+            glConvolutionFilter2D (
+               GL_CONVOLUTION_2D,
+               GL_ALPHA,
+               3, 3,
+               GL_ALPHA, GL_FLOAT,
+               (pack "f*", @{ $self->{smooth_matrix} }),
+            );
+            glEnable GL_CONVOLUTION_2D;
+         }
-      $self->{fow_texture} ||= glGenTexture;
+         $self->{fow_texture} = new CFClient::Texture
+            w              => $w,
+            h              => $h,
+            data           => $data,
+            internalformat => GL_ALPHA,
+            format         => GL_ALPHA;
+         glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
+      } else {
+         delete $self->{fow_texture};
+      }
       glNewList $self->{list};
-      if ($::MAP) {
-         my $sw = $self->{sw} = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-         my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
-         my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
-         my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
-         my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
-         my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
-         glPushMatrix;
+      glPushMatrix;
+      glTranslate $sx0, $sy0;
-         glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+      glScale $::CFG->{map_scale}, $::CFG->{map_scale};
-         glTranslate $sx0, $sy0;
+      $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
-         my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
+      glScale 32, 32;
-         if ($::CFG->{fow_enable}) {
+      if (my $tex = $self->{fow_texture}) {
-            if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
-               glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
-               glConvolutionFilter2D (
-                  GL_CONVOLUTION_2D,
-                  GL_ALPHA,
-                  3, 3,
-                  GL_ALPHA, GL_FLOAT,
-                  (pack "f*", @{ $self->{smooth_matrix} }),
-               );
-               glEnable GL_CONVOLUTION_2D;
-            }
-            $self->{fow_texture_name} ||= glGenTexture;
-            # try to re-use the texture name: TODO improve texture class instead
-            $self->{fow_texture} = new CFClient::Texture
-               w              => $w,
-               h              => $h,
-               data           => $data,
-               name           => $self->{fow_texture_name},
-               internalformat => GL_ALPHA,
-               format         => GL_ALPHA;
-            glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
-            glEnable GL_TEXTURE_2D;
+         glEnable GL_TEXTURE_2D;
-            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-            glColor +($::CFG->{fow_intensity}) x 3, 0.8;
+         glColor +($::CFG->{fow_intensity}) x 3, 0.9;
-            $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
+         $self->{fow_texture}->draw_quad_alpha (0, 0);
-            glDisable GL_TEXTURE_2D;
+         glDisable GL_TEXTURE_2D;
-         }
+      }
+      if ($self->{magicmap}) {
+         my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+         $x += $::MAP->x - $sx + int 0.5 * ($::MAP->w - $sw + 1);
+         $y += $::MAP->y - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+         glTranslate - $x - 1, - $y - 1;
+         glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+         $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+      }
-         glPopMatrix;
+      glPopMatrix;
-      }
       glEndList;
    }
-   glPushMatrix;
    glCallList $self->{list};
-   glPopMatrix;
    # TNT2 emulates logops in software (or worse :)
-   if ($focused) {
+   unless ($focused) {
-      (delete $self->{out_of_focus})->destroy
-         if $self->{out_of_focus};
-   } else {
       glColor 0.4, 0.2, 0.2, 0.6;
       glEnable GL_BLEND;
       glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
       glVertex 0, 0;
       glVertex 0, $::HEIGHT;
       glVertex $::WIDTH, $::HEIGHT;
       glVertex $::WIDTH, 0;
       glEnd;
       glDisable GL_BLEND;
-#      $self->{out_of_focus} ||= do {
-#         my $label = new CFClient::UI::Label
-#            x         => 0,
-#            y         => 0,
-#            z         => 1,
-#            ellipsise => 0,
-#            text      => "map out of focus (click map to play)";
-#
-#         $label->show;
-#         $label->update;
-#
-#         $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
-#            $label->move_abs (
-#               ($::WIDTH  - $label->{w}) * 0.5,
-#               ($::HEIGHT - $label->{h}) * 0.5,
-#            );
-#         });
-#
-#         $label
-#      };
    }
 }
 sub DESTROY {
    my $self = shift;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs. Revision 1.61 by root, Thu Jun 15 15:33:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.61 by root, Thu Jun 15 15:33:58 2006 UTC