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.110 by root, Thu Jul 19 13:45:18 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
28 smooth_matrix => [
29 0.30, 0.50, 0.30,
30 0.50, 0.50, 0.50,
31 0.30, 0.50, 0.30,
32 ],
33
34 @_ 26 @_
35 ); 27 );
36 28
37 $self->{completer} = new CFPlus::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
38 command => $self->{command}, 30 command => $self->{command},
… …
191 183
192 $x -= CFPlus::floor $::MAP->w * 0.5; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
193 $y -= CFPlus::floor $::MAP->h * 0.5; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
194 186
195 if ($::CONN) { 187 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
199 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
200 }
201 } 189 }
202 190
203 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
204 $self->grab_focus; 192 $self->grab_focus;
205 return unless $::CONN; 193 return unless $::CONN;
… …
308 $self->{need_update} = 1; 296 $self->{need_update} = 1;
309 $self->SUPER::update; 297 $self->SUPER::update;
310} 298}
311 299
312my %DIR = ( 300my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"], 301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
314 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
315 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
316 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
317 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
318 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
319 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
320 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
321 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
322 310
323 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
324 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
325 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
326 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
327); 319);
328 320
329sub invoke_key_down { 321sub invoke_key_down {
330 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
331 323
… …
334 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
335 327
336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
337 329
338 if ($sym == 9) { 330 if ($sym == 9) {
339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
341 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
343 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
374 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
375 $self->{completer}->show; 367 $self->{completer}->show;
376 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
377 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
378 $self->{completer}->show; 370 $self->{completer}->show;
379 } elsif (exists $DIR{$sym}) { 371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
380 if ($mod & CFPlus::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
381 $self->{shft}++; 373 $self->{shft}++;
382 if ($DIR{$sym}[0] != $self->{fire_dir}) { 374 if ($dir->[0] != $self->{fire_dir}) {
383 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $dir->[0]");
384 } 376 }
385 $self->{fire_dir} = $DIR{$sym}[0]; 377 $self->{fire_dir} = $DIR{$sym}[0];
386 } elsif ($mod & CFPlus::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
387 $self->{ctrl}++; 379 $self->{ctrl}++;
388 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $dir->[0]");
389 } else { 381 } else {
390 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$dir->[1]");
391 } 383 }
392 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
393 $self->{completer}->inject_key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
394 $self->{completer}->show; 386 $self->{completer}->show;
395 } else { 387 } else {
… …
452} 444}
453 445
454sub refresh_hook { 446sub refresh_hook {
455 my ($self) = @_; 447 my ($self) = @_;
456 448
457 return unless $::MAP; 449 if ($::MAP && $::CONN) {
458
459 if (delete $self->{need_update}) { 450 if (delete $self->{need_update}) {
460 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
461 452
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464 455
465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
466 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
467 458
468 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
469 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
470 461
471 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;
472 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;
473 464
474 if ($::CFG->{fow_enable}) { 465 if ($::CFG->{fow_enable}) {
475 my ($w, $h, $data) = $::MAP->fow_texture ( 466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
476 $dx, $dy, $sw, $sh,
477 $::CFG->{fow_smooth},
478 pack "f*", @{ $self->{smooth_matrix} },
479 );
480 467
481 $self->{fow_texture} = new CFPlus::Texture 468 $self->{fow_texture} = new CFPlus::Texture
482 w => $w, 469 w => $w,
483 h => $h, 470 h => $h,
484 data => $data, 471 data => $data,
485 internalformat => GL_ALPHA, 472 internalformat => GL_ALPHA,
486 format => GL_ALPHA; 473 format => GL_ALPHA;
487 } else { 474 } else {
488 delete $self->{fow_texture}; 475 delete $self->{fow_texture};
489 } 476 }
490 477
491 glNewList $self->{list}; 478 glNewList ($self->{list} ||= glGenList);
492 479
493 glPushMatrix;
494 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496
497 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
498
499 glScale $self->{tilesize}, $self->{tilesize};
500
501 if (my $tex = $self->{fow_texture}) {
502 glPushMatrix; 480 glPushMatrix;
503 #glScale 1/3, 1/3 if $::CFG->{fow_smooth}; 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;
490 glScale 1/3, 1/3;
504 glEnable GL_TEXTURE_2D; 491 glEnable GL_TEXTURE_2D;
505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
506 493
507 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
508 $self->{fow_texture}->draw_quad_alpha (0, 0); 495 $self->{fow_texture}->draw_quad_alpha (0, 0);
509 496
510 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
511 glPopMatrix; 512 glPopMatrix;
512 }
513
514 if ($self->{magicmap}) {
515 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
516
517 $x += $::MAP->ox + $self->{dx};
518 $y += $::MAP->oy + $self->{dy};
519
520 glTranslate - $x - 1, - $y - 1;
521 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
522 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
523 }
524
525 glPopMatrix;
526 glEndList; 513 glEndList;
514 }
515 } else {
516 glDeleteList delete $self->{list}
517 if $self->{list};
527 } 518 }
528
529} 519}
530 520
531sub draw { 521sub draw {
532 my ($self) = @_; 522 my ($self) = @_;
533 523
… …
575 565
576use Time::HiRes qw(time); 566use Time::HiRes qw(time);
577use CFPlus::OpenGL; 567use CFPlus::OpenGL;
578 568
579sub size_request { 569sub size_request {
580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 570 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
581} 571}
582 572
583sub refresh_hook { 573sub refresh_hook {
584 my ($self) = @_; 574 my ($self) = @_;
585 575

Diff Legend

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