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.108 by root, Wed Apr 25 01:12:31 2007 UTC vs.
Revision 1.118 by elmex, Tue Aug 14 13:25:25 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.05, 0.13, 0.05,
30 0.13, 0.30, 0.13,
31 0.05, 0.13, 0.05,
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) {
… …
347 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
349 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
351 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
345 $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
352 } elsif (!$::CONN) { 346 } elsif (!$::CONN) {
353 return 0; # bindings further down need a valid connection 347 return 0; # bindings further down need a valid connection
354 348
355 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
356 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
357 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
358 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
359 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
360 $::CONN->user_send ("examine"); 354 $::MESSAGE_WINDOW->activate_current;
361 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
362 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
363 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
364 } elsif (my @macros = CFPlus::Macro::match_event $ev) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
365 $::CONN->macro_send ($_) for @macros; 359 $::CONN->macro_send ($_) for @macros;
… …
374 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
375 $self->{completer}->show; 369 $self->{completer}->show;
376 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
377 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
378 $self->{completer}->show; 372 $self->{completer}->show;
379 } elsif (exists $DIR{$sym}) { 373 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
380 if ($mod & CFPlus::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
381 $self->{shft}++; 375 $self->{shft}++;
382 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($dir->[0] != $self->{fire_dir}) {
383 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $dir->[0]");
384 } 378 }
385 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
386 } elsif ($mod & CFPlus::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
387 $self->{ctrl}++; 381 $self->{ctrl}++;
388 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $dir->[0]");
389 } else { 383 } else {
390 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$dir->[1]");
391 } 385 }
392 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
393 $self->{completer}->inject_key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
394 $self->{completer}->show; 388 $self->{completer}->show;
395 } else { 389 } else {
… …
430 } 424 }
431 425
432 $res 426 $res
433} 427}
434 428
429sub invoke_visibility_change {
430 my ($self) = @_;
431
432 $self->refresh_hook;
433
434 0
435}
436
435sub set_magicmap { 437sub set_magicmap {
436 my ($self, $w, $h, $x, $y, $data) = @_; 438 my ($self, $w, $h, $x, $y, $data) = @_;
437 439
438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
441 $self->{magicmap} = [$x, $y, $w, $h, $data]; 443 $self->{magicmap} = [$x, $y, $w, $h, $data];
442 444
443 $self->update; 445 $self->update;
444} 446}
445 447
448sub refresh_hook {
449 my ($self) = @_;
450
451 if ($::MAP && $::CONN) {
452 if (delete $self->{need_update}) {
453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
454
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
457
458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
460
461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
463
464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
466
467 if ($::CFG->{fow_enable}) {
468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
469
470 $self->{fow_texture} = new CFPlus::Texture
471 w => $w,
472 h => $h,
473 data => $data,
474 internalformat => GL_ALPHA,
475 format => GL_ALPHA;
476 } else {
477 delete $self->{fow_texture};
478 }
479
480 glNewList ($self->{list} ||= glGenList);
481
482 glPushMatrix;
483 glTranslate $sx0, $sy0;
484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
485
486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
487
488 glScale $self->{tilesize}, $self->{tilesize};
489
490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
493 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
495
496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
497 $self->{fow_texture}->draw_quad_alpha (0, 0);
498
499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
501 }
502
503 if ($self->{magicmap}) {
504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
505
506 $x += $::MAP->ox + $self->{dx};
507 $y += $::MAP->oy + $self->{dy};
508
509 glTranslate - $x - 1, - $y - 1;
510 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
511 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
512 }
513
514 glPopMatrix;
515 glEndList;
516 }
517 } else {
518 glDeleteList delete $self->{list}
519 if $self->{list};
520 }
521}
522
446sub draw { 523sub draw {
447 my ($self) = @_; 524 my ($self) = @_;
448 525
449 return unless $::MAP; 526 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
527
528 return unless $self->{list};
450 529
451 my $focused = $CFPlus::UI::FOCUS == $self 530 my $focused = $CFPlus::UI::FOCUS == $self
452 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 531 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
453 532
454 return 533 return
455 unless $focused || !$::FAST; 534 unless $focused || !$::FAST;
456
457 if (delete $self->{need_update}) {
458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
459
460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
462
463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
464 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
465
466 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
467 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
468
469 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
470 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
471
472 if ($::CFG->{fow_enable}) {
473 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
474
475 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
476 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
477 glConvolutionFilter2D (
478 GL_CONVOLUTION_2D,
479 GL_ALPHA,
480 3, 3,
481 GL_ALPHA, GL_FLOAT,
482 (pack "f*", @{ $self->{smooth_matrix} }),
483 );
484 glEnable GL_CONVOLUTION_2D;
485 }
486
487 $self->{fow_texture} = new CFPlus::Texture
488 w => $w,
489 h => $h,
490 data => $data,
491 internalformat => GL_ALPHA,
492 format => GL_ALPHA;
493
494 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
495 } else {
496 delete $self->{fow_texture};
497 }
498
499 glNewList $self->{list};
500
501 glPushMatrix;
502 glTranslate $sx0, $sy0;
503 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
504
505 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
506
507 glScale $self->{tilesize}, $self->{tilesize};
508
509 if (my $tex = $self->{fow_texture}) {
510 glEnable GL_TEXTURE_2D;
511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
512
513 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
514 $self->{fow_texture}->draw_quad_alpha (0, 0);
515
516 glDisable GL_TEXTURE_2D;
517 }
518
519 if ($self->{magicmap}) {
520 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
521
522 $x += $::MAP->ox + $self->{dx};
523 $y += $::MAP->oy + $self->{dy};
524
525 glTranslate - $x - 1, - $y - 1;
526 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
527 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
528 }
529
530 glPopMatrix;
531 glEndList;
532 }
533 535
534 glCallList $self->{list}; 536 glCallList $self->{list};
535 537
536 # TNT2 emulates logops in software (or worse :) 538 # TNT2 emulates logops in software (or worse :)
537 unless ($focused) { 539 unless ($focused) {
… …
565 567
566use Time::HiRes qw(time); 568use Time::HiRes qw(time);
567use CFPlus::OpenGL; 569use CFPlus::OpenGL;
568 570
569sub size_request { 571sub size_request {
570 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 572 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
571} 573}
572 574
573sub invoke_size_allocate { 575sub refresh_hook {
574 my ($self, $w, $h) = @_; 576 my ($self) = @_;
575 577
576 $self->update; 578 if ($::MAP && $self->{texture_atime} < time) {
577
578 1
579}
580
581sub update {
582 my ($self) = @_;
583
584 delete $self->{texture_atime};
585 $self->SUPER::update;
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 $::MAP or return;
592
593 my ($w, $h) = @$self{qw(w h)}; 579 my ($w, $h) = @$self{qw(w h)};
594 580
595 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 581 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
596 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 582 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
597 583
584 my $ox = 0.5 * ($w - $sw);
585 my $oy = 0.5 * ($h - $sh);
586
598 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; 587 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
599 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; 588 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
600 589
601 my $ox = 0.5 * ($w - $sw); 590 #TODO: map scale is completely borked
602 my $oy = 0.5 * ($h - $sh);
603 591
604 glEnable GL_BLEND; 592 my $x0 = int $ox - $sx + 0.5;
605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 593 my $y0 = int $oy - $sy + 0.5;
606 glEnable GL_TEXTURE_2D;
607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
608 594
609 if ($self->{texture_atime} < time) { 595 $self->{sw} = $sw;
596 $self->{sh} = $sh;
597
598 $self->{x0} = $x0;
599 $self->{y0} = $y0;
600
610 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
611 602
612 $self->{texture} = 603 $self->{texture} =
613 new CFPlus::Texture 604 new CFPlus::Texture
614 w => $w, 605 w => $w,
615 h => $h, 606 h => $h,
616 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
617 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
618 } 609 }
610}
611
612sub invoke_visibility_change {
613 my ($self) = @_;
614
615 $self->refresh_hook;
616
617 0
618}
619
620sub invoke_size_allocate {
621 my ($self, $w, $h) = @_;
622
623 $self->update;
624
625 1
626}
627
628sub update {
629 my ($self) = @_;
630
631 delete $self->{texture_atime};
632 $self->SUPER::update;
633}
634
635sub _draw {
636 my ($self) = @_;
637
638 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
639
640 $self->{texture} or return;
641
642 glEnable GL_BLEND;
643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
644 glEnable GL_TEXTURE_2D;
645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
619 646
620 $self->{texture}->draw_quad (0, 0); 647 $self->{texture}->draw_quad (0, 0);
621 648
622 glDisable GL_TEXTURE_2D; 649 glDisable GL_TEXTURE_2D;
623 650
624 glTranslate 0.375, 0.375; 651 glTranslate 0.375, 0.375;
625
626 #TODO: map scale is completely borked
627
628 my $x0 = int $ox - $sx + 0.5;
629 my $y0 = int $oy - $sy + 0.5;
630 652
631 glColor 1, 1, 0, 1; 653 glColor 1, 1, 0, 1;
632 glBegin GL_LINE_LOOP; 654 glBegin GL_LINE_LOOP;
633 glVertex $x0 , $y0 ; 655 glVertex $self->{x0} , $self->{y0} ;
634 glVertex $x0 , $y0 + $sh; 656 glVertex $self->{x0} , $self->{y0} + $self->{sh};
635 glVertex $x0 + $sw, $y0 + $sh; 657 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
636 glVertex $x0 + $sw, $y0 ; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
637 glEnd; 659 glEnd;
638 660
639 glDisable GL_BLEND; 661 glDisable GL_BLEND;
640} 662}
641 663

Diff Legend

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