--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/08/28 16:26:13 1.121
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2008/09/24 01:03:05 1.145
@@ -1,19 +1,19 @@
-package CFPlus::MapWidget;
+package DC::MapWidget;
use strict;
use utf8;
use List::Util qw(min max);
-use CFPlus;
-use CFPlus::OpenGL;
-use CFPlus::UI;
-use CFPlus::Macro;
+use DC;
+use DC::OpenGL;
+use DC::UI;
+use DC::Macro;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
my $magicmap_tex =
- new_from_file CFPlus::Texture CFPlus::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) = @_;
@@ -68,24 +62,24 @@
my $editsup = $::CONN && $::CONN->{editor_support}
or return;
- CFPlus::background {
+ DC::background {
print "preparing editor startup...\n";
my $server = $editsup->{gameserver} || "default";
$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
- local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
- local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
+ local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
+ local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
print "map directory is $mapdir\n";
print "lib directory is $libdir\n";
- my $ua = CFPlus::lwp_useragent;
+ my $ua = DC::lwp_useragent;
for my $file (qw(archetypes crossfire.0)) {
my $url = "$editsup->{lib_root}$file";
print "mirroring $url...\n";
- CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
+ DC::lwp_check $ua->mirror ($url, "$libdir/$file");
printf "%s size %d octets\n", $file, -s "$libdir/$file";
}
@@ -100,14 +94,14 @@
# try to get the most recent head revision, what a hack,
# this should have been returned while downloading *sigh*
- my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
+ my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
if ($log =~ /\?rev=(\d+\.\d+)"/) {
my $rev = $1;
print "downloading revision $rev...\n";
- my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+ my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
my $meta = {
%$editsup,
@@ -122,7 +116,7 @@
File::Path::mkpath (File::Basename::dirname ($mappath));
open my $fh, ">:raw:perlio", "$mappath.meta"
or die "$mappath.meta: $!\n";
- print $fh CFPlus::to_json $meta;
+ print $fh DC::encode_json $meta;
close $fh;
open my $fh, ">:raw:perlio:utf8", $mappath
or die "$mappath: $!\n";
@@ -173,11 +167,11 @@
$self->grab_focus;
return unless $::CONN;
- my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
- my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
+ my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+ my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
- $x -= CFPlus::floor $::MAP->w * 0.5;
- $y -= CFPlus::floor $::MAP->h * 0.5;
+ $x -= DC::floor $::MAP->w * 0.5;
+ $y -= DC::floor $::MAP->h * 0.5;
if ($::CONN) {
$::CONN->lookat ($x, $y)
@@ -208,7 +202,7 @@
["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
- ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
+# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
[
$::PICKUP_ENABLE->{state}
? "Disable automatic pickup"
@@ -218,10 +212,10 @@
);
if ($::CONN && $::CONN->{editor_support}) {
- push @items, [
- "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
- \&editor_invoke,
- ];
+# push @items, [
+# "Edit this map (" . (DC::asxml $::CONN->{map_info}[0]) . ")",
+# \&editor_invoke,
+# ];
for my $type (qw(test name)) {
$::CONN->{editor_support}{type} ne $type
@@ -230,7 +224,7 @@
or next;
push @items, [
- "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ "Login on $type server (" . (DC::asxml $server) . ")",
sub { server_login $server },
];
}
@@ -248,7 +242,7 @@
],
;
- (new CFPlus::UI::Menu
+ (new DC::UI::Menu
items => \@items,
)->popup ($ev);
}
@@ -280,8 +274,8 @@
my ($self) = @_;
(
- $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
- $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
+ $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
+ $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
)
}
@@ -293,24 +287,29 @@
}
my %DIR = (
- ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
- ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
- ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
- ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
- ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
- ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
- ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
- ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
- ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
-
- ( "," . CFPlus::SDLK_UP ), [1, "north"],
- ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
- ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
- ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
- ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
- ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
- ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
- ("1," . CFPlus::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,16 +319,23 @@
my $sym = $ev->{sym};
my $uni = $ev->{unicode};
- $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::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;
+
+ my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
- if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
- if ($mod & CFPlus::KMOD_SHIFT) {
+ if ($::CONN && $dir) {
+ if ($mod & DC::KMOD_SHIFT) {
$self->{shft}++;
if ($dir->[0] != $self->{fire_dir}) {
$::CONN->user_send ("fire $dir->[0]");
}
- $self->{fire_dir} = $DIR{$sym}[0];
- } elsif ($mod & CFPlus::KMOD_CTRL) {
+ $self->{fire_dir} = $dir->[0];
+ } elsif ($mod & DC::KMOD_CTRL) {
$self->{ctrl}++;
$::CONN->user_send ("run $dir->[0]");
} else {
@@ -349,25 +355,31 @@
my $mod = $ev->{mod};
my $sym = $ev->{sym};
+ delete $self->{last_mod};
+ delete $self->{last_sym};
+
if ($::CFG->{shift_fire_stop}) {
- if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
+ if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
} else {
- if (exists $DIR{$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;
- } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+ } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
+ && delete $self->{shft}) { # XXX: is RSHIFT ok?
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
}
- if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
+ if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
$::CONN->user_send ("run_stop");
$res = 1;
}
@@ -383,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) = @_;
@@ -394,29 +423,82 @@
$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);
+
+ $spd *= $self->{tilesize};
+
+ # jump if "impossibly high" speed
+ if (
+ (max abs $self->{sdx}, abs $self->{sdy})
+ > $spd * $mintime * 2.1
+ ) {
+ #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
+ $self->{sdx} = $self->{sdy} = 0;
+ } else {
+ $spd *= $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 + CFPlus::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+ my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
+ my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
- my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = CFPlus::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;
- my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
- my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+ my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
+ 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 CFPlus::Texture
+ $self->{fow_texture} = new DC::Texture
w => $w,
h => $h,
data => $data,
@@ -431,13 +513,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;
@@ -476,8 +564,8 @@
return unless $self->{list};
- my $focused = $CFPlus::UI::FOCUS == $self
- || $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
+ my $focused = $DC::UI::FOCUS == $self
+ || $DC::UI::FOCUS == $::COMPLETER->{entry};
return
unless $focused || !$::FAST;
@@ -507,15 +595,15 @@
$self->SUPER::DESTROY;
}
-package CFPlus::MapWidget::MapMap;
+package DC::MapWidget::MapMap;
use strict;
use utf8;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
use Time::HiRes qw(time);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub size_request {
($::HEIGHT * 0.2, $::HEIGHT * 0.2)
@@ -527,6 +615,8 @@
if ($::MAP && $self->{texture_atime} < time) {
my ($w, $h) = @$self{qw(w h)};
+ return unless $w && $h;
+
my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
@@ -550,11 +640,11 @@
$self->{texture_atime} = time + 1/3;
$self->{texture} =
- new CFPlus::Texture
+ new DC::Texture
w => $w,
h => $h,
data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
- type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
}
}
@@ -610,13 +700,13 @@
glDisable GL_BLEND;
}
-package CFPlus::MapWidget::Command;
+package DC::MapWidget::Command;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::Frame::;
+our @ISA = DC::UI::Frame::;
sub new {
my $class = shift;
@@ -626,11 +716,12 @@
@_,
);
- $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+ $self->add ($self->{vbox} = new DC::UI::VBox);
$self->{label} = [
map
- CFPlus::UI::Label->new (
+ DC::UI::Label->new (
+ align => 0,
can_hover => 1,
can_events => 1,
tooltip_width => 0.33,
@@ -638,7 +729,7 @@
), (0.8) x 16
];
- $self->{entry} = new CFPlus::UI::Entry
+ $self->{entry} = new DC::UI::Entry
on_changed => sub {
$self->update_labels;
0
@@ -647,10 +738,10 @@
my ($entry, $ev, $x, $y) = @_;
if ($ev->{button} == 3) {
- (new CFPlus::UI::Menu
+ (new DC::UI::Menu
items => [
- ["bind " . (CFPlus::asxml $self->{select}) . " to a key"
- => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
+ ["bind " . (DC::asxml $self->{select}) . " to a key"
+ => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
],
)->popup ($ev);
return 1;
@@ -675,7 +766,7 @@
} elsif ($ev->{sym} == 27) {
$self->{hist_ptr} = 0;
$self->hide;
- } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
+ } elsif ($ev->{sym} == DC::SDLK_DOWN) {
if ($self->{hist_ptr} > 1) {
$self->{hist_ptr}--;
$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
@@ -687,7 +778,7 @@
if $self->{select_offset} < $#{ $self->{last_match} || [] };
}
$self->update_labels;
- } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
+ } elsif ($ev->{sym} == DC::SDLK_UP) {
if ($self->{select_offset}) {
--$self->{select_offset}
} else {
@@ -855,7 +946,7 @@
my ($self) = @_;
# hack
- local $CFPlus::UI::FOCUS = $self->{entry};
+ local $DC::UI::FOCUS = $self->{entry};
$self->SUPER::_draw;
}