--- deliantra/Deliantra-Client/DC/MapWidget.pm	2009/11/26 07:19:12	1.153
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2010/10/14 00:02:39	1.163
@@ -1,7 +1,6 @@
 package DC::MapWidget;
 
-use strict;
-use utf8;
+use common::sense;
 
 use List::Util qw(min max);
 
@@ -12,6 +11,11 @@
 
 our @ISA = DC::UI::Base::;
 
+our @TEX_HIDDEN = map {
+   new_from_resource DC::Texture # MUST be POT
+        "hidden-$_.png", mipmap => 1, wrap => 1
+   } 0, 1, 2;
+
 my $magicmap_tex =
       new_from_resource DC::Texture "magicmap.png",
          mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
@@ -211,8 +215,8 @@
 #            \&editor_invoke,
 #         ];
 
-         for my $type (qw(test name)) {
-            $::CONN->{editor_support}{type} ne $type
+         for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
+            $::CONN->{editor_support}{servertype} ne $type
                or next;
             my $server = $::CONN->{editor_support}{"${type}server"}
                or next;
@@ -398,16 +402,19 @@
 sub scroll {
    my ($self, $dx, $dy) = @_;
 
-   $::MAP->scroll ($dx, $dy);
-
-   $self->{last_fow_texture} = $self->{fow_texture};
-   $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
-   $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
-
    $self->movement_update;
 
    $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
    $self->{sdy} += $dy * $self->{tilesize};
+
+   # save old fow texture, if applicable
+   $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
+   $self->{lfdx} = $dx;
+   $self->{lfdy} = $dy;
+   $self->{lmdx} = $self->{dx};
+   $self->{lmdy} = $self->{dy};
+
+   $::MAP->scroll ($dx, $dy);
 }
 
 sub set_magicmap {
@@ -488,14 +495,8 @@
          my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
 
          if ($::CFG->{fow_enable}) {
-            my ($sdx_t, $sdy_t);#d# do not anchor at player
-
-            my ($w, $h, $data) = $::MAP->fow_texture (
-               $dx + (min 0, $sdx_t),
-               $dy + (min 0, $sdy_t),
-               $sw + abs $sdx_t,
-               $sh + abs $sdy_t
-            );
+            # draw_fow_texture REQUIRES the fow texture to stay the same size.
+            my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
 
             $self->{fow_texture} = new DC::Texture
                w              => $w,
@@ -515,69 +516,34 @@
          glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
 
          $::MAP->draw ($dx, $dy, $sw, $sh,
-                       $self->{tilesize},
+                       ($self->{tilesize}) x 2,
                        $::CONN->{player}{tag},
                        -$self->{sdx}, -$self->{sdy});
 
-         #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
          glScale $self->{tilesize}, $self->{tilesize};
 
          if (my $tex = $self->{fow_texture}) {
-            glEnable GL_TEXTURE_2D;
-            glEnable GL_BLEND;
-            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-            glBlendEquation GL_FUNC_REVERSE_SUBTRACT;
-            glBlendFunc GL_ONE, GL_ZERO;
-
-            my $a1 = 0.9;
-
-            if (0 && $self->{last_fow_texture}) {
-               my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
-               my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
+            my @prev_fow_params;
 
-               if ($d1 * $d2) {
-                  my $a2 = $d1 / $d2;
-
-                  $a1 = 1 - $a2;
-
-                  #$a1 *= 0.9;
-                  #$a2 *= 0.9;
-
-                  printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
+            if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
+               my $d1 = DC::distance $self->{sdx}, $self->{sdy};
+               my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
 
-                  #$a1 = 1 - (1-$a1) * 0.707;
-                  #$a2 = 1 - (1-$a2) * 0.707;
-
-                  glColor 1,0,0,1;
-                  glBegin GL_QUADS;
-                  glVertex 10 + $sdx_t, 10;
-                  glVertex 11 + $sdx_t, 10;
-                  glVertex 11 + $sdx_t, 11;
-                  glVertex 10 + $sdx_t, 11;
-                  glEnd;
-
-                  glColor +($::CFG->{fow_intensity}) x 3, $a2;
-                  glPushMatrix;
-                  glTranslate $sdx_t, $sdy_t; # anchor at player
-                  glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
-                  glScale 1/3, 1/3;
-                  $self->{last_fow_texture}->draw_quad_alpha (0, 0);
-                  glPopMatrix;
-               } else {
-                  delete $self->{last_fow_texture};
+               if ($d1 * $d2) {
+                  @prev_fow_params = (
+                     (min 1, $d1 / $d2),
+                     $self->{lmdx} - $dx - $self->{lfdx},
+                     $self->{lmdy} - $dy - $self->{lfdy},
+                     @{$self->{prev_fow_texture}}{qw(name data)}
+                  );
                }
             }
 
-            glColor +($::CFG->{fow_intensity}) x 3, $a1;
-            glPushMatrix;
-            #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
-            glScale 1/3, 1/3;
-            $self->{fow_texture}->draw_quad_alpha (0, 0);
-            glPopMatrix;
-
-            glBlendEquation GL_FUNC_ADD;
-            glDisable GL_TEXTURE_2D;
-            glDisable GL_BLEND;
+            DC::Texture::draw_fow_texture
+               $::CFG->{fow_intensity},
+               $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
+               @{$self->{fow_texture}}{qw(name data s t w h)},
+               @prev_fow_params;
          }
 
          if ($self->{magicmap}) {
@@ -588,13 +554,16 @@
 
             glTranslate - $x - 1, - $y - 1;
             glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
-            $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+            $::MAP->draw_magicmap ($w, $h, $data);
          }
 
          glPopMatrix;
          glEndList;
       }
    } else {
+      delete $self->{last_fow_texture};
+      delete $self->{fow_texture};
+
       glDeleteList delete $self->{list}
          if $self->{list};
    }
@@ -640,12 +609,10 @@
 
 package DC::MapWidget::MapMap;
 
-use strict;
-use utf8;
+use common::sense;
 
 our @ISA = DC::UI::Base::;
 
-use Time::HiRes qw(time);
 use DC::OpenGL;
 
 sub size_request {
@@ -655,7 +622,7 @@
 sub refresh_hook {
    my ($self) = @_;
 
-   if ($::MAP && $self->{texture_atime} < time) {
+   if ($::MAP && $self->{texture_atime} < EV::now) {
       my ($w, $h) = @$self{qw(w h)};
 
       return unless $w && $h;
@@ -680,7 +647,7 @@
       $self->{x0} = $x0;
       $self->{y0} = $y0;
 
-      $self->{texture_atime} = time + 1/3;
+      $self->{texture_atime} = EV::now + 1/2;
 
       $self->{texture} =
          new DC::Texture
@@ -745,7 +712,7 @@
 
 package DC::MapWidget::Command;
 
-use strict;
+use common::sense;
 
 use DC::OpenGL;