--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/04/01 15:09:45 1.103
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/12/26 21:03:21 1.126
@@ -1,21 +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::;
-
-sub ::T() { 32 }
+our @ISA = DC::UI::Base::;
my $magicmap_tex =
- new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
+ new_from_file DC::Texture DC::find_rcfile "magicmap.png",
mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
sub new {
@@ -24,25 +22,19 @@
my $self = $class->SUPER::new (
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,
- ],
-
+ tilesize => 32,
@_
);
- $self->{completer} = new CFPlus::MapWidget::Command::
- command => $self->{command},
- tooltip => "#completer_help",
- ;
-
$self
}
+sub set_tilesize {
+ my ($self, $tilesize) = @_;
+
+ $self->{tilesize} = $tilesize;
+}
+
sub add_command {
my ($self, $command, $tooltip, $widget, $cb) = @_;
@@ -52,16 +44,16 @@
$tooltip = "$data\n\n$tooltip";
$tooltip =~ s/\s+$//;
- $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
+ $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
}
sub clr_commands {
my ($self) = @_;
- %{$self->{completer}{command}} = ();
+ %{$::COMPLETER->{command}} = ();
- $self->{completer}->hide
- if $self->{completer};
+ $::COMPLETER->hide
+ if $::COMPLETER;
}
sub server_login {
@@ -76,24 +68,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";
}
@@ -108,14 +100,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,
@@ -130,7 +122,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";
@@ -181,18 +173,14 @@
$self->grab_focus;
return unless $::CONN;
- my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
- my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
+ 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) {
- if ($::IN_BUILD_MODE) {
- $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
- } else {
- $::CONN->lookat ($x, $y)
- }
+ $::CONN->lookat ($x, $y)
}
} elsif ($ev->{button} == 2) {
@@ -231,7 +219,7 @@
if ($::CONN && $::CONN->{editor_support}) {
push @items, [
- "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
+ "Edit this map (" . (DC::asxml $::CONN->{map_info}[0]) . ")",
\&editor_invoke,
];
@@ -242,7 +230,7 @@
or next;
push @items, [
- "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ "Login on $type server (" . (DC::asxml $server) . ")",
sub { server_login $server },
];
}
@@ -260,7 +248,7 @@
],
;
- (new CFPlus::UI::Menu
+ (new DC::UI::Menu
items => \@items,
)->popup ($ev);
}
@@ -289,9 +277,11 @@
}
sub size_request {
+ my ($self) = @_;
+
(
- ::T * CFPlus::ceil $::WIDTH / ::T,
- ::T * CFPlus::ceil $::HEIGHT / ::T,
+ $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
+ $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
)
}
@@ -303,19 +293,24 @@
}
my %DIR = (
- 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"],
- CFPlus::SDLK_RIGHT, [3, "east"],
- CFPlus::SDLK_DOWN, [5, "south"],
- CFPlus::SDLK_LEFT, [7, "west"],
+ ( "," . 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"],
);
sub invoke_key_down {
@@ -325,72 +320,26 @@
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_SHIFT;
- if ($sym == 9) {
- ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
- $::HELP_WINDOW->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
- ::toggle_player_page ($::STATS_PAGE);
- } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
- ::toggle_player_page ($::SKILL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
- ::toggle_player_page ($::SPELL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
- ::toggle_player_page ($::INVENTORY_PAGE);
- } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
- $::SETUP_DIALOG->toggle_visibility;
- } elsif (!$::CONN) {
- return 0; # bindings further down need a valid connection
-
- } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
- $::CONN->user_send ("stay fire");
- } elsif ($uni == ord ",") {
- $::CONN->user_send ("take");
- } elsif ($uni == ord " ") {
- $::CONN->user_send ("apply");
- } elsif ($uni == 13) {
- $::CONN->user_send ("examine");
- } elsif ($uni == ord ".") {
- $::CONN->user_send ($self->{completer}{last_command})
- if exists $self->{completer}{last_command};
- } elsif (my @macros = CFPlus::Macro::match_event $ev) {
- $::CONN->macro_send ($_) for @macros;
- } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
- $::CONN->user_send ("rotateshoottype +");
- } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
- $::CONN->user_send ("rotateshoottype -");
- } elsif ($uni == ord '!') {
- $self->{completer}->set_prefix ("shout ");
- $self->{completer}->show;
- } elsif ($uni == ord '"') {
- $self->{completer}->set_prefix ("$::CFG->{say_command} ");
- $self->{completer}->show;
- } elsif ($uni == ord "'") {
- $self->{completer}->set_prefix ("");
- $self->{completer}->show;
- } elsif (exists $DIR{$sym}) {
- if ($mod & CFPlus::KMOD_SHIFT) {
+ if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
+ if ($mod & DC::KMOD_SHIFT) {
$self->{shft}++;
- if ($DIR{$sym}[0] != $self->{fire_dir}) {
- $::CONN->user_send ("fire $DIR{$sym}[0]");
+ 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{$sym}[0]");
+ $::CONN->user_send ("run $dir->[0]");
} else {
- $::CONN->user_send ("$DIR{$sym}[1]");
+ $::CONN->user_send ("$dir->[1]");
}
- } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
- $self->{completer}->inject_key_down ($ev);
- $self->{completer}->show;
- } else {
- return 0;
+
+ return 1;
}
- 1
+ 0
}
sub invoke_key_up {
@@ -401,24 +350,25 @@
my $sym = $ev->{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}) {
+ if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && 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;
}
@@ -426,6 +376,14 @@
$res
}
+sub invoke_visibility_change {
+ my ($self) = @_;
+
+ $self->refresh_hook;
+
+ 0
+}
+
sub set_magicmap {
my ($self, $w, $h, $x, $y, $data) = @_;
@@ -437,101 +395,101 @@
$self->update;
}
-sub draw {
+sub refresh_hook {
my ($self) = @_;
- return unless $::MAP;
-
- my $focused = $CFPlus::UI::FOCUS == $self
- || $CFPlus::UI::FOCUS == $self->{completer}{entry};
-
- return
- unless $focused || !$::FAST;
-
- if (delete $self->{need_update}) {
- my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
-
- my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+ if ($::MAP && $::CONN) {
+ if (delete $self->{need_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 $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = DC::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 $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);
+
+ $self->{fow_texture} = new DC::Texture
+ w => $w,
+ h => $h,
+ data => $data,
+ internalformat => GL_ALPHA,
+ format => GL_ALPHA;
+ } else {
+ delete $self->{fow_texture};
+ }
- my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+ glNewList ($self->{list} ||= glGenList);
- 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;
-
- if ($::CFG->{fow_enable}) {
- my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
-
- if ($::CFG->{fow_smooth} && $CFPlus::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;
- }
+ glPushMatrix;
+ glTranslate $sx0, $sy0;
+ glScale $::CFG->{map_scale}, $::CFG->{map_scale};
- $self->{fow_texture} = new CFPlus::Texture
- w => $w,
- h => $h,
- data => $data,
- internalformat => GL_ALPHA,
- format => GL_ALPHA;
+ $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
- glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
- } else {
- delete $self->{fow_texture};
- }
+ glScale $self->{tilesize}, $self->{tilesize};
- glNewList $self->{list};
+ if (my $tex = $self->{fow_texture}) {
+ glPushMatrix;
+ glScale 1/3, 1/3;
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
- glPushMatrix;
- glTranslate $sx0, $sy0;
- glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+ glColor +($::CFG->{fow_intensity}) x 3, 0.9;
+ $self->{fow_texture}->draw_quad_alpha (0, 0);
- $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
+ glDisable GL_TEXTURE_2D;
+ glPopMatrix;
+ }
- glScale ::T, ::T;
+ if ($self->{magicmap}) {
+ my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
- if (my $tex = $self->{fow_texture}) {
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+ $x += $::MAP->ox + $self->{dx};
+ $y += $::MAP->oy + $self->{dy};
- glColor +($::CFG->{fow_intensity}) x 3, 0.9;
- $self->{fow_texture}->draw_quad_alpha (0, 0);
+ glTranslate - $x - 1, - $y - 1;
+ glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+ $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+ }
- glDisable GL_TEXTURE_2D;
+ glPopMatrix;
+ glEndList;
}
+ } else {
+ glDeleteList delete $self->{list}
+ if $self->{list};
+ }
+}
- if ($self->{magicmap}) {
- my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+sub draw {
+ my ($self) = @_;
- $x += $::MAP->ox + $self->{dx};
- $y += $::MAP->oy + $self->{dy};
+ $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
- glTranslate - $x - 1, - $y - 1;
- glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
- $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
- }
+ return unless $self->{list};
- glPopMatrix;
- glEndList;
- }
+ my $focused = $DC::UI::FOCUS == $self
+ || $DC::UI::FOCUS == $::COMPLETER->{entry};
+
+ return
+ unless $focused || !$::FAST;
glCallList $self->{list};
# TNT2 emulates logops in software (or worse :)
unless ($focused) {
- glColor 0.4, 0.2, 0.2, 0.6;
+ glColor_premultiply 0, 0, 1, 0.25;
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
glVertex 0, 0;
glVertex 0, $::HEIGHT;
@@ -550,15 +508,63 @@
$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.25, $::HEIGHT * 0.25)
+ ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
+}
+
+sub refresh_hook {
+ my ($self) = @_;
+
+ if ($::MAP && $self->{texture_atime} < time) {
+ my ($w, $h) = @$self{qw(w h)};
+
+ my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+ my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+
+ my $ox = 0.5 * ($w - $sw);
+ my $oy = 0.5 * ($h - $sh);
+
+ my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+ my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
+
+ #TODO: map scale is completely borked
+
+ my $x0 = int $ox - $sx + 0.5;
+ my $y0 = int $oy - $sy + 0.5;
+
+ $self->{sw} = $sw;
+ $self->{sh} = $sh;
+
+ $self->{x0} = $x0;
+ $self->{y0} = $y0;
+
+ $self->{texture_atime} = time + 1/3;
+
+ $self->{texture} =
+ new DC::Texture
+ w => $w,
+ h => $h,
+ data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
+ type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ }
+}
+
+sub invoke_visibility_change {
+ my ($self) = @_;
+
+ $self->refresh_hook;
+
+ 0
}
sub invoke_size_allocate {
@@ -579,64 +585,39 @@
sub _draw {
my ($self) = @_;
- $::MAP or return;
-
- my ($w, $h) = @$self{qw(w h)};
-
- my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
- my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
-
- my $sx = int $::CFG->{map_shift_x} / ::T;
- my $sy = int $::CFG->{map_shift_y} / ::T;
+ $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
- my $ox = 0.5 * ($w - $sw);
- my $oy = 0.5 * ($h - $sh);
+ $self->{texture} or return;
glEnable GL_BLEND;
glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- if ($self->{texture_atime} < time) {
- $self->{texture_atime} = time + 1/3;
-
- $self->{texture} =
- new CFPlus::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;
- }
-
$self->{texture}->draw_quad (0, 0);
glDisable GL_TEXTURE_2D;
glTranslate 0.375, 0.375;
- #TODO: map scale is completely borked
-
- my $x0 = int $ox - $sx + 0.5;
- my $y0 = int $oy - $sy + 0.5;
-
glColor 1, 1, 0, 1;
glBegin GL_LINE_LOOP;
- glVertex $x0 , $y0 ;
- glVertex $x0 , $y0 + $sh;
- glVertex $x0 + $sw, $y0 + $sh;
- glVertex $x0 + $sw, $y0 ;
+ glVertex $self->{x0} , $self->{y0} ;
+ glVertex $self->{x0} , $self->{y0} + $self->{sh};
+ glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
+ glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
glEnd;
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;
@@ -646,11 +627,11 @@
@_,
);
- $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 (
can_hover => 1,
can_events => 1,
tooltip_width => 0.33,
@@ -658,7 +639,7 @@
), (0.8) x 16
];
- $self->{entry} = new CFPlus::UI::Entry
+ $self->{entry} = new DC::UI::Entry
on_changed => sub {
$self->update_labels;
0
@@ -667,10 +648,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;
@@ -695,7 +676,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]);
@@ -707,7 +688,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 {
@@ -875,7 +856,7 @@
my ($self) = @_;
# hack
- local $CFPlus::UI::FOCUS = $self->{entry};
+ local $DC::UI::FOCUS = $self->{entry};
$self->SUPER::_draw;
}