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.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.104 by root, Wed Apr 4 02:43:29 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
23 z => -1, 23 z => -1,
24 can_focus => 1, 24 can_focus => 1,
25 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
26 27
27 smooth_matrix => [ 28 smooth_matrix => [
28 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
29 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
30 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
37 command => $self->{command}, 38 command => $self->{command},
38 tooltip => "#completer_help", 39 tooltip => "#completer_help",
39 ; 40 ;
40 41
41 $self 42 $self
43}
44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
42} 49}
43 50
44sub add_command { 51sub add_command {
45 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
46 53
… …
285 292
286 1 293 1
287} 294}
288 295
289sub size_request { 296sub size_request {
297 my ($self) = @_;
298
290 ( 299 (
291 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
292 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
293 ) 302 )
294} 303}
295 304
296sub update { 305sub update {
297 my ($self) = @_; 306 my ($self) = @_;
… …
323 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
324 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
325 334
326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327 336
328 if ($uni == ord "\t") { 337 if ($sym == 9) {
329 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
352 $::CONN->user_send ("examine"); 361 $::CONN->user_send ("examine");
353 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
354 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
355 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
356 } elsif (my @macros = CFPlus::Macro::match_event $ev) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 warn "<@macros>\n";#d#
358 $::CONN->macro_send ($_) for @macros; 366 $::CONN->macro_send ($_) for @macros;
359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
360 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
362 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
363 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
364 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
365 $self->{completer}->show; 376 $self->{completer}->show;
366 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
367 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
443 454
444 return 455 return
445 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
446 457
447 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{tilesize} = int $self->{tilesize} * $::CFG->{map_scale};
449 460
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452 463
453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
490 501
491 glPushMatrix; 502 glPushMatrix;
492 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
493 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
494 505
495 $::MAP->draw ($dx, $dy, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
496 507
497 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
498 509
499 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
500 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
502 513
… …
577 588
578 $::MAP or return; 589 $::MAP or return;
579 590
580 my ($w, $h) = @$self{qw(w h)}; 591 my ($w, $h) = @$self{qw(w h)};
581 592
582 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 593 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 594 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
584 595
585 my $sx = int $::CFG->{map_shift_x} / 32; 596 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
586 my $sy = int $::CFG->{map_shift_y} / 32; 597 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
587 598
588 my $ox = 0.5 * ($w - $sw); 599 my $ox = 0.5 * ($w - $sw);
589 my $oy = 0.5 * ($h - $sh); 600 my $oy = 0.5 * ($h - $sh);
590 601
591 glEnable GL_BLEND; 602 glEnable GL_BLEND;

Diff Legend

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