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.112 by root, Fri Jul 20 18:42:45 2007 UTC vs.
Revision 1.117 by root, Fri Aug 10 04:02:13 2007 UTC

… …
20 my $class = shift; 20 my $class = shift;
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,
26 tilesize => 32, 25 tilesize => 32,
27 @_ 26 @_
28 ); 27 );
29 28
30 $self->{completer} = new CFPlus::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
… …
184 183
185 $x -= CFPlus::floor $::MAP->w * 0.5; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
187 186
188 if ($::CONN) { 187 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
192 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
193 }
194 } 189 }
195 190
196 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
197 $self->grab_focus; 192 $self->grab_focus;
198 return unless $::CONN; 193 return unless $::CONN;
… …
331 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
332 327
333 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
334 329
335 if ($sym == 9) { 330 if ($sym == 9) {
336 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
337 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
338 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
339 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
340 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
341 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
449} 444}
450 445
451sub refresh_hook { 446sub refresh_hook {
452 my ($self) = @_; 447 my ($self) = @_;
453 448
454 return unless $::MAP; 449 if ($::MAP && $::CONN) {
455
456 if (delete $self->{need_update}) { 450 if (delete $self->{need_update}) {
457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
458 452
459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
460 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
461 455
462 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
463 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
464 458
465 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
466 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
467 461
468 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
469 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
470 464
471 if ($::CFG->{fow_enable}) { 465 if ($::CFG->{fow_enable}) {
472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
473 467
474 $self->{fow_texture} = new CFPlus::Texture 468 $self->{fow_texture} = new CFPlus::Texture
475 w => $w, 469 w => $w,
476 h => $h, 470 h => $h,
477 data => $data, 471 data => $data,
478 internalformat => GL_ALPHA, 472 internalformat => GL_ALPHA,
479 format => GL_ALPHA; 473 format => GL_ALPHA;
480 } else { 474 } else {
481 delete $self->{fow_texture}; 475 delete $self->{fow_texture};
482 } 476 }
483 477
484 glNewList $self->{list}; 478 glNewList ($self->{list} ||= glGenList);
485 479
486 glPushMatrix;
487 glTranslate $sx0, $sy0;
488 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
489
490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
491
492 glScale $self->{tilesize}, $self->{tilesize};
493
494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix; 480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485
486 glScale $self->{tilesize}, $self->{tilesize};
487
488 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix;
496 glScale 1/3, 1/3; 490 glScale 1/3, 1/3;
497 glEnable GL_TEXTURE_2D; 491 glEnable GL_TEXTURE_2D;
498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
499 493
500 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
501 $self->{fow_texture}->draw_quad_alpha (0, 0); 495 $self->{fow_texture}->draw_quad_alpha (0, 0);
502 496
503 glDisable GL_TEXTURE_2D; 497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
499 }
500
501 if ($self->{magicmap}) {
502 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
503
504 $x += $::MAP->ox + $self->{dx};
505 $y += $::MAP->oy + $self->{dy};
506
507 glTranslate - $x - 1, - $y - 1;
508 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
509 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510 }
511
504 glPopMatrix; 512 glPopMatrix;
505 }
506
507 if ($self->{magicmap}) {
508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
509
510 $x += $::MAP->ox + $self->{dx};
511 $y += $::MAP->oy + $self->{dy};
512
513 glTranslate - $x - 1, - $y - 1;
514 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
515 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
516 }
517
518 glPopMatrix;
519 glEndList; 513 glEndList;
514 }
515 } else {
516 glDeleteList delete $self->{list}
517 if $self->{list};
520 } 518 }
521
522} 519}
523 520
524sub draw { 521sub draw {
525 my ($self) = @_; 522 my ($self) = @_;
526 523

Diff Legend

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