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.110 by root, Thu Jul 19 13:45:18 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.30, 0.50, 0.30,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 30 0.50, 0.50, 0.50,
31 0.30, 0.50, 0.30,
30 ], 32 ],
31 33
32 @_ 34 @_
33 ); 35 );
34 36
… …
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 ("");
… …
431 } 430 }
432 431
433 $res 432 $res
434} 433}
435 434
435sub invoke_visibility_change {
436 my ($self) = @_;
437
438 $self->refresh_hook;
439
440 0
441}
442
436sub set_magicmap { 443sub set_magicmap {
437 my ($self, $w, $h, $x, $y, $data) = @_; 444 my ($self, $w, $h, $x, $y, $data) = @_;
438 445
439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 446 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 447 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
442 $self->{magicmap} = [$x, $y, $w, $h, $data]; 449 $self->{magicmap} = [$x, $y, $w, $h, $data];
443 450
444 $self->update; 451 $self->update;
445} 452}
446 453
447sub draw { 454sub refresh_hook {
448 my ($self) = @_; 455 my ($self) = @_;
449 456
450 return unless $::MAP; 457 return unless $::MAP;
451 458
452 my $focused = $CFPlus::UI::FOCUS == $self
453 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
454
455 return
456 unless $focused || !$::FAST;
457
458 if (delete $self->{need_update}) { 459 if (delete $self->{need_update}) {
459 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
460 461
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463 464
464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
469 470
470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 471 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 472 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
472 473
473 if ($::CFG->{fow_enable}) { 474 if ($::CFG->{fow_enable}) {
474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 475 my ($w, $h, $data) = $::MAP->fow_texture (
475 476 $dx, $dy, $sw, $sh,
476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 477 $::CFG->{fow_smooth},
477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
478 glConvolutionFilter2D (
479 GL_CONVOLUTION_2D,
480 GL_ALPHA,
481 3, 3,
482 GL_ALPHA, GL_FLOAT,
483 (pack "f*", @{ $self->{smooth_matrix} }), 478 pack "f*", @{ $self->{smooth_matrix} },
484 ); 479 );
485 glEnable GL_CONVOLUTION_2D;
486 }
487 480
488 $self->{fow_texture} = new CFPlus::Texture 481 $self->{fow_texture} = new CFPlus::Texture
489 w => $w, 482 w => $w,
490 h => $h, 483 h => $h,
491 data => $data, 484 data => $data,
492 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
493 format => GL_ALPHA; 486 format => GL_ALPHA;
494
495 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496 } else { 487 } else {
497 delete $self->{fow_texture}; 488 delete $self->{fow_texture};
498 } 489 }
499 490
500 glNewList $self->{list}; 491 glNewList $self->{list};
501 492
502 glPushMatrix; 493 glPushMatrix;
503 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
504 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505 496
506 $::MAP->draw ($dx, $dy, $sw, $sh); 497 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
507 498
508 glScale 32, 32; 499 glScale $self->{tilesize}, $self->{tilesize};
509 500
510 if (my $tex = $self->{fow_texture}) { 501 if (my $tex = $self->{fow_texture}) {
502 glPushMatrix;
503 #glScale 1/3, 1/3 if $::CFG->{fow_smooth};
511 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513 506
514 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 507 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515 $self->{fow_texture}->draw_quad_alpha (0, 0); 508 $self->{fow_texture}->draw_quad_alpha (0, 0);
516 509
517 glDisable GL_TEXTURE_2D; 510 glDisable GL_TEXTURE_2D;
511 glPopMatrix;
518 } 512 }
519 513
520 if ($self->{magicmap}) { 514 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 515 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522 516
… …
529 } 523 }
530 524
531 glPopMatrix; 525 glPopMatrix;
532 glEndList; 526 glEndList;
533 } 527 }
528
529}
530
531sub draw {
532 my ($self) = @_;
533
534 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
535
536 return unless $self->{list};
537
538 my $focused = $CFPlus::UI::FOCUS == $self
539 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
540
541 return
542 unless $focused || !$::FAST;
534 543
535 glCallList $self->{list}; 544 glCallList $self->{list};
536 545
537 # TNT2 emulates logops in software (or worse :) 546 # TNT2 emulates logops in software (or worse :)
538 unless ($focused) { 547 unless ($focused) {
… …
557 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
558} 567}
559 568
560package CFPlus::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
561 570
571use strict;
572use utf8;
573
562our @ISA = CFPlus::UI::Base::; 574our @ISA = CFPlus::UI::Base::;
563 575
564use Time::HiRes qw(time); 576use Time::HiRes qw(time);
565use CFPlus::OpenGL; 577use CFPlus::OpenGL;
566 578
567sub size_request { 579sub size_request {
568 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
569} 581}
570 582
571sub invoke_size_allocate { 583sub refresh_hook {
572 my ($self, $w, $h) = @_; 584 my ($self) = @_;
573 585
574 $self->update; 586 if ($::MAP && $self->{texture_atime} < time) {
575
576 1
577}
578
579sub update {
580 my ($self) = @_;
581
582 delete $self->{texture_atime};
583 $self->SUPER::update;
584}
585
586sub _draw {
587 my ($self) = @_;
588
589 $::MAP or return;
590
591 my ($w, $h) = @$self{qw(w h)}; 587 my ($w, $h) = @$self{qw(w h)};
592 588
593 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 589 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
594 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 590 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
595 591
596 my $sx = int $::CFG->{map_shift_x} / 32;
597 my $sy = int $::CFG->{map_shift_y} / 32;
598
599 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
600 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
601 594
602 glEnable GL_BLEND; 595 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
604 glEnable GL_TEXTURE_2D;
605 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
606 597
607 if ($self->{texture_atime} < time) { 598 #TODO: map scale is completely borked
599
600 my $x0 = int $ox - $sx + 0.5;
601 my $y0 = int $oy - $sy + 0.5;
602
603 $self->{sw} = $sw;
604 $self->{sh} = $sh;
605
606 $self->{x0} = $x0;
607 $self->{y0} = $y0;
608
608 $self->{texture_atime} = time + 1/3; 609 $self->{texture_atime} = time + 1/3;
609 610
610 $self->{texture} = 611 $self->{texture} =
611 new CFPlus::Texture 612 new CFPlus::Texture
612 w => $w, 613 w => $w,
613 h => $h, 614 h => $h,
614 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 615 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
615 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 616 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
616 } 617 }
618}
619
620sub invoke_visibility_change {
621 my ($self) = @_;
622
623 $self->refresh_hook;
624
625 0
626}
627
628sub invoke_size_allocate {
629 my ($self, $w, $h) = @_;
630
631 $self->update;
632
633 1
634}
635
636sub update {
637 my ($self) = @_;
638
639 delete $self->{texture_atime};
640 $self->SUPER::update;
641}
642
643sub _draw {
644 my ($self) = @_;
645
646 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
647
648 $self->{texture} or return;
649
650 glEnable GL_BLEND;
651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
652 glEnable GL_TEXTURE_2D;
653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
617 654
618 $self->{texture}->draw_quad (0, 0); 655 $self->{texture}->draw_quad (0, 0);
619 656
620 glDisable GL_TEXTURE_2D; 657 glDisable GL_TEXTURE_2D;
621 658
622 glTranslate 0.375, 0.375; 659 glTranslate 0.375, 0.375;
623
624 #TODO: map scale is completely borked
625
626 my $x0 = int $ox - $sx + 0.5;
627 my $y0 = int $oy - $sy + 0.5;
628 660
629 glColor 1, 1, 0, 1; 661 glColor 1, 1, 0, 1;
630 glBegin GL_LINE_LOOP; 662 glBegin GL_LINE_LOOP;
631 glVertex $x0 , $y0 ; 663 glVertex $self->{x0} , $self->{y0} ;
632 glVertex $x0 , $y0 + $sh; 664 glVertex $self->{x0} , $self->{y0} + $self->{sh};
633 glVertex $x0 + $sw, $y0 + $sh; 665 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
634 glVertex $x0 + $sw, $y0 ; 666 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
635 glEnd; 667 glEnd;
636 668
637 glDisable GL_BLEND; 669 glDisable GL_BLEND;
638} 670}
639 671
… …
675 707
676 if ($ev->{button} == 3) { 708 if ($ev->{button} == 3) {
677 (new CFPlus::UI::Menu 709 (new CFPlus::UI::Menu
678 items => [ 710 items => [
679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 711 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
680 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 712 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681 ], 713 ],
682 )->popup ($ev); 714 )->popup ($ev);
683 return 1; 715 return 1;
684 } 716 }
685 0 717 0

Diff Legend

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