--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/03 21:59:55 1.48 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/08 01:51:32 1.51 @@ -16,6 +16,13 @@ z => -1, can_focus => 1, list => glGenList, + + smooth_matrix => [ + 0.05, 0.13, 0.05, + 0.13, 0.30, 0.13, + 0.05, 0.13, 0.05, + ], + @_ ); @@ -58,7 +65,16 @@ $self->focus_in; - if ($ev->{button} == 2) { + if ($ev->{button} == 1) { + my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; + my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; + + my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; + my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; + + $::CONN->send (sprintf "lookat %d %d", $fx, $fy); + + } elsif ($ev->{button} == 2) { my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); @@ -72,18 +88,6 @@ $self->update; }; - } elsif ($ev->{button} == 1) { - my ($ox, $oy) = ($ev->{x}, $ev->{y}); - - my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); - my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); - $fx += $::MAP->x; - $fy += $::MAP->y; - - $::CONN->send (sprintf "lookat %d %d", $fx, $fy); - - warn "FOOX: $fx (".$::MAP->ox.")\n"; - warn "FOOY: $fy (".$::MAP->oy.")\n"; } 1 @@ -257,10 +261,7 @@ GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT, - pack "f*", - 0.05, 0.13, 0.05, - 0.13, 0.30, 0.13, - 0.05, 0.13, 0.05, + (pack "f*", @{ $self->{smooth_matrix} }), ); glEnable GL_CONVOLUTION_2D; }