--- deliantra/Deliantra-Client/DC/MapWidget.pm 2008/05/05 20:22:03 1.129 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2008/09/03 06:07:39 1.143 @@ -13,7 +13,7 @@ our @ISA = DC::UI::Base::; my $magicmap_tex = - new_from_file DC::Texture DC::find_rcfile "magicmap.png", + new_from_resource DC::Texture "magicmap.png", mipmap => 1, wrap => 0, internalformat => GL_ALPHA; sub new { @@ -29,12 +29,6 @@ $self } -sub set_tilesize { - my ($self, $tilesize) = @_; - - $self->{tilesize} = $tilesize; -} - sub add_command { my ($self, $command, $tooltip, $widget, $cb) = @_; @@ -293,24 +287,29 @@ } my %DIR = ( - ( "," . DC::SDLK_KP5 ), [0, "stay fire"], - ( "," . DC::SDLK_KP8 ), [1, "north"], - ( "," . DC::SDLK_KP9 ), [2, "northeast"], - ( "," . DC::SDLK_KP6 ), [3, "east"], - ( "," . DC::SDLK_KP3 ), [4, "southeast"], - ( "," . DC::SDLK_KP2 ), [5, "south"], - ( "," . DC::SDLK_KP1 ), [6, "southwest"], - ( "," . DC::SDLK_KP4 ), [7, "west"], - ( "," . DC::SDLK_KP7 ), [8, "northwest"], - - ( "," . DC::SDLK_UP ), [1, "north"], - ("1," . DC::SDLK_UP ), [2, "northeast"], - ( "," . DC::SDLK_RIGHT), [3, "east"], - ("1," . DC::SDLK_RIGHT), [4, "southeast"], - ( "," . DC::SDLK_DOWN ), [5, "south"], - ("1," . DC::SDLK_DOWN ), [6, "southwest"], - ( "," . DC::SDLK_LEFT ), [7, "west"], - ("1," . DC::SDLK_LEFT ), [8, "northwest"], + ( "," . DC::SDLK_KP5 ), [0, "stay fire"], + ( "," . DC::SDLK_KP8 ), [1, "north"], + ( "," . DC::SDLK_KP9 ), [2, "northeast"], + ( "," . DC::SDLK_KP6 ), [3, "east"], + ( "," . DC::SDLK_KP3 ), [4, "southeast"], + ( "," . DC::SDLK_KP2 ), [5, "south"], + ( "," . DC::SDLK_KP1 ), [6, "southwest"], + ( "," . DC::SDLK_KP4 ), [7, "west"], + ( "," . DC::SDLK_KP7 ), [8, "northwest"], + + ( "," . DC::SDLK_PAGEUP ), [2, "northeast"], + ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"], + ( "," . DC::SDLK_END ), [6, "southwest"], + ( "," . DC::SDLK_HOME ), [8, "northwest"], + + ( "," . DC::SDLK_UP ), [1, "north"], + ("1," . DC::SDLK_UP ), [2, "northeast"], + ( "," . DC::SDLK_RIGHT ), [3, "east"], + ("1," . DC::SDLK_RIGHT ), [4, "southeast"], + ( "," . DC::SDLK_DOWN ), [5, "south"], + ("1," . DC::SDLK_DOWN ), [6, "southwest"], + ( "," . DC::SDLK_LEFT ), [7, "west"], + ("1," . DC::SDLK_LEFT ), [8, "northwest"], ); sub invoke_key_down { @@ -320,9 +319,16 @@ my $sym = $ev->{sym}; my $uni = $ev->{unicode}; - $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; + $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT; + + # ignore repeated keypresses + return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; + $self->{last_mod} = $mod; + $self->{last_sym} = $sym; - if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { + my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; + + if ($::CONN && $dir) { if ($mod & DC::KMOD_SHIFT) { $self->{shft}++; if ($dir->[0] != $self->{fire_dir}) { @@ -349,6 +355,9 @@ my $mod = $ev->{mod}; my $sym = $ev->{sym}; + delete $self->{last_mod}; + delete $self->{last_sym}; + if ($::CFG->{shift_fire_stop}) { if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); @@ -356,7 +365,9 @@ $res = 1; } } else { - if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { + my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; + + if ($dir && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); delete $self->{fire_dir}; $res = 1; @@ -368,7 +379,7 @@ } } - if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { + if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) { $::CONN->user_send ("run_stop"); $res = 1; } @@ -384,6 +395,23 @@ 0 } +sub set_tilesize { + my ($self, $tilesize) = @_; + + $self->{tilesize} = $tilesize; +} + +sub scroll { + my ($self, $dx, $dy) = @_; + + $::MAP->scroll ($dx, $dy); + + $self->movement_update; + + $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement + $self->{sdy} += $dy * $self->{tilesize}; +} + sub set_magicmap { my ($self, $w, $h, $x, $y, $data) = @_; @@ -395,19 +423,64 @@ $self->update; } +sub movement_update { + my ($self) = @_; + + if ($::CFG->{smooth_movement}) { + if ($self->{sdx} || $self->{sdy}) { + my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); + my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; + + # the minimum time for a single tile movement + my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); + + # jump if "impossibly high" speed + if ( + (max abs $self->{sdx}, abs $self->{sdy}) + > $spd * $self->{tilesize} * $mintime * 1.1 + ) { + #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# + $self->{sdx} = $self->{sdy} = 0; + } else { + $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction + + my $dx = $self->{sdx} < 0 ? -$spd : $spd; + my $dy = $self->{sdy} < 0 ? -$spd : $spd; + + if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } + if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } + + $self->update; + } + } + } else { + $self->{sdx} = $self->{sdy} = 0; + } + + $self->{last_update} = EV::time; +} + sub refresh_hook { my ($self) = @_; if ($::MAP && $::CONN) { if (delete $self->{need_update}) { + $self->movement_update; + my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; - my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; - my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; + my $sdx_t = DC::ceil $self->{sdx} / $tilesize; + my $sdy_t = DC::ceil $self->{sdy} / $tilesize; - my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; - my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; + # width/height of map, in tiles + my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; + my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; + + # the map displacement, in tiles + my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; + my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; + # the upper left "visible" corner, in pixels my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; @@ -415,7 +488,13 @@ my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; if ($::CFG->{fow_enable}) { - my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); + $sdx_t = $sdy_t = 0;#d# + 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 + ); $self->{fow_texture} = new DC::Texture w => $w, @@ -432,13 +511,19 @@ glPushMatrix; glTranslate $sx0, $sy0; glScale $::CFG->{map_scale}, $::CFG->{map_scale}; + glTranslate $self->{sdx}, $self->{sdy}; - $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); + $::MAP->draw ($dx, $dy, $sw, $sh, + $self->{tilesize}, + $::CONN->{player}{tag}, + -$self->{sdx}, -$self->{sdy}); + #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player glScale $self->{tilesize}, $self->{tilesize}; if (my $tex = $self->{fow_texture}) { glPushMatrix; + glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); glScale 1/3, 1/3; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;