ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
25 27
26 smooth_matrix => [ 28 smooth_matrix => [
27 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
36 command => $self->{command}, 38 command => $self->{command},
37 tooltip => "#completer_help", 39 tooltip => "#completer_help",
38 ; 40 ;
39 41
40 $self 42 $self
43}
44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
41} 49}
42 50
43sub add_command { 51sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 53
… …
176 184
177 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
178 $self->grab_focus; 186 $self->grab_focus;
179 return unless $::CONN; 187 return unless $::CONN;
180 188
181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183 191
184 $x -= CFPlus::floor $::MAP->w * 0.5; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
186 194
187 if ($::CONN) { 195 if ($::CONN) {
… …
284 292
285 1 293 1
286} 294}
287 295
288sub size_request { 296sub size_request {
297 my ($self) = @_;
298
289 ( 299 (
290 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
291 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
292 ) 302 )
293} 303}
294 304
295sub update { 305sub update {
296 my ($self) = @_; 306 my ($self) = @_;
… …
298 $self->{need_update} = 1; 308 $self->{need_update} = 1;
299 $self->SUPER::update; 309 $self->SUPER::update;
300} 310}
301 311
302my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
303 CFPlus::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
304 CFPlus::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
305 CFPlus::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
306 CFPlus::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
307 CFPlus::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
… …
322 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
323 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
324 335
325 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
326 337
327 if ($uni == ord "\t") { 338 if ($sym == 9) {
328 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
329 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
330 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
331 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
332 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
333 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
336 ::toggle_player_page ($::SPELL_PAGE); 347 ::toggle_player_page ($::SPELL_PAGE);
337 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
338 ::toggle_player_page ($::INVENTORY_PAGE); 349 ::toggle_player_page ($::INVENTORY_PAGE);
339 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
340 $::SETUP_DIALOG->toggle_visibility; 351 $::SETUP_DIALOG->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
342 $::BIND_EDITOR->set_binding (undef, undef, [],
343 sub {
344 my ($mod, $sym, $cmds) = @_;
345 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
346 });
347 $::BIND_EDITOR->start;
348 $::BIND_EDITOR->show;
349#TODO: elmex, what was this supposed to do? it currently crashes the client.
350# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
351# $::BIND_EDITOR->stop;
352# $::BIND_EDITOR->ask_for_bind_and_commit;
353# $::BIND_EDITOR->hide;
354 } elsif (!$::CONN) { 352 } elsif (!$::CONN) {
355 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
356 354
357 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
358 $::CONN->user_send ("stay fire");
359 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
360 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
361 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
362 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
363 } elsif ($uni == 13) { 359 } elsif ($uni == 13) {
364 $::CONN->user_send ("examine"); 360 $::CONN->user_send ("examine");
365 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
366 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
367 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
368 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
369 $::CONN->user_send ($_) for @$bind_cmd; 365 $::CONN->macro_send ($_) for @macros;
370 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
371 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
372 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
373 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
374 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
375 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
376 $self->{completer}->show; 375 $self->{completer}->show;
377 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
378 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
… …
454 453
455 return 454 return
456 unless $focused || !$::FAST; 455 unless $focused || !$::FAST;
457 456
458 if (delete $self->{need_update}) { 457 if (delete $self->{need_update}) {
459 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
460 459
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463 462
464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
501 500
502 glPushMatrix; 501 glPushMatrix;
503 glTranslate $sx0, $sy0; 502 glTranslate $sx0, $sy0;
504 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 503 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505 504
506 $::MAP->draw ($dx, $dy, $sw, $sh); 505 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
507 506
508 glScale 32, 32; 507 glScale $self->{tilesize}, $self->{tilesize};
509 508
510 if (my $tex = $self->{fow_texture}) { 509 if (my $tex = $self->{fow_texture}) {
511 glEnable GL_TEXTURE_2D; 510 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513 512
… …
557 $self->SUPER::DESTROY; 556 $self->SUPER::DESTROY;
558} 557}
559 558
560package CFPlus::MapWidget::MapMap; 559package CFPlus::MapWidget::MapMap;
561 560
561use strict;
562use utf8;
563
562our @ISA = CFPlus::UI::Base::; 564our @ISA = CFPlus::UI::Base::;
563 565
564use Time::HiRes qw(time); 566use Time::HiRes qw(time);
565use CFPlus::OpenGL; 567use CFPlus::OpenGL;
566 568
… …
588 590
589 $::MAP or return; 591 $::MAP or return;
590 592
591 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
592 594
593 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 595 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
594 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
595 597
596 my $sx = int $::CFG->{map_shift_x} / 32; 598 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
597 my $sy = int $::CFG->{map_shift_y} / 32; 599 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
598 600
599 my $ox = 0.5 * ($w - $sw); 601 my $ox = 0.5 * ($w - $sw);
600 my $oy = 0.5 * ($h - $sh); 602 my $oy = 0.5 * ($h - $sh);
601 603
602 glEnable GL_BLEND; 604 glEnable GL_BLEND;
… …
675 677
676 if ($ev->{button} == 3) { 678 if ($ev->{button} == 3) {
677 (new CFPlus::UI::Menu 679 (new CFPlus::UI::Menu
678 items => [ 680 items => [
679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 681 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
680 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 682 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681 ], 683 ],
682 )->popup ($ev); 684 )->popup ($ev);
683 return 1; 685 return 1;
684 } 686 }
685 0 687 0

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines