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.142 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

11use DC::Macro; 11use DC::Macro;
12 12
13our @ISA = DC::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file DC::Texture DC::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my $class = shift;
21 21
163sub invoke_button_down { 163sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
165 165
166 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
167 $self->grab_focus; 167 $self->grab_focus;
168 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
169 169
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 172
173 $x -= DC::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206 [
207 $::PICKUP_ENABLE->{state}
208 ? "Disable automatic pickup"
209 : "Enable automatic pickup",
210 sub { $::PICKUP_ENABLE->toggle }
211 ],
212 ); 206 );
213 207
214 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 209# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
402} 396}
403 397
404sub scroll { 398sub scroll {
405 my ($self, $dx, $dy) = @_; 399 my ($self, $dx, $dy) = @_;
406 400
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update; 401 $self->movement_update;
410 402
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 403 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize}; 404 $self->{sdy} += $dy * $self->{tilesize};
405
406 # save old fow texture, if applicable
407 $self->{last_fow_texture} = $self->{fow_texture}
408 if $::CFG->{smooth_transitions};
409 $self->{lfdx} = $dx;
410 $self->{lfdy} = $dy;
411 $self->{lmdx} = $self->{dx};
412 $self->{lmdy} = $self->{dy};
413
414 $::MAP->scroll ($dx, $dy);
413} 415}
414 416
415sub set_magicmap { 417sub set_magicmap {
416 my ($self, $w, $h, $x, $y, $data) = @_; 418 my ($self, $w, $h, $x, $y, $data) = @_;
417 419
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 434 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 435
434 # the minimum time for a single tile movement 436 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 437 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436 438
439 $spd *= $self->{tilesize};
440
437 # jump if "impossibly high" speed 441 # jump if "impossibly high" speed
438 if ( 442 if (
439 (max abs $self->{sdx}, abs $self->{sdy}) 443 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1 444 > $spd * $mintime * 2.1
441 ) { 445 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 446 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0; 447 $self->{sdx} = $self->{sdy} = 0;
444 } else { 448 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 449 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446 450
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 451 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 452 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449 453
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 454 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } 455 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 } 456 }
457
458 $self->update;
455 } 459 }
456 } else { 460 } else {
457 $self->{sdx} = $self->{sdy} = 0; 461 $self->{sdx} = $self->{sdy} = 0;
458 } 462 }
459 463
486 490
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 491 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 492 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489 493
490 if ($::CFG->{fow_enable}) { 494 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d#
492 my ($w, $h, $data) = $::MAP->fow_texture ( 495 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
493 $dx + (min 0, $sdx_t),
494 $dy + (min 0, $sdy_t),
495 $sw + abs $sdx_t,
496 $sh + abs $sdy_t
497 );
498 496
499 $self->{fow_texture} = new DC::Texture 497 $self->{fow_texture} = new DC::Texture
500 w => $w, 498 w => $w,
501 h => $h, 499 h => $h,
502 data => $data, 500 data => $data,
509 glNewList ($self->{list} ||= glGenList); 507 glNewList ($self->{list} ||= glGenList);
510 508
511 glPushMatrix; 509 glPushMatrix;
512 glTranslate $sx0, $sy0; 510 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 511 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy}; 512 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
515 513
516 $::MAP->draw ($dx, $dy, $sw, $sh, 514 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize}, 515 $self->{tilesize},
518 $::CONN->{player}{tag}, 516 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy}); 517 -$self->{sdx}, -$self->{sdy});
520 518
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
522 glScale $self->{tilesize}, $self->{tilesize}; 519 glScale $self->{tilesize}, $self->{tilesize};
523 520
524 if (my $tex = $self->{fow_texture}) { 521 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix; 522 if ($DC::OpenGL::GL_MULTITEX && $self->{last_fow_texture}) {#d#
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); 523 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
527 glScale 1/3, 1/3; 524 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530 525
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 526 if ($d1 * $d2) {
532 $self->{fow_texture}->draw_quad_alpha (0, 0); 527 DC::Texture::draw_fow_texture
528 $::CFG->{fow_intensity},
529 @{$self->{fow_texture}}{qw(name s t w h)},
530 (min 1, $d1 / $d2),
531 $self->{lmdx} - $dx - $self->{lfdx},
532 $self->{lmdy} - $dy - $self->{lfdy},
533 @{$self->{last_fow_texture}}{qw(name s t w h)};
534 } else {
535 delete $self->{last_fow_texture};
536 }
537 }
533 538
534 glDisable GL_TEXTURE_2D; 539 unless ($self->{last_fow_texture}) {
535 glPopMatrix; 540 DC::Texture::draw_fow_texture
541 $::CFG->{fow_intensity},
542 @{$self->{fow_texture}}{qw(name s t w h)};
543 }
536 } 544 }
537 545
538 if ($self->{magicmap}) { 546 if ($self->{magicmap}) {
539 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 547 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
540 548
541 $x += $::MAP->ox + $self->{dx}; 549 $x += $::MAP->ox + $self->{dx};
542 $y += $::MAP->oy + $self->{dy}; 550 $y += $::MAP->oy + $self->{dy};
543 551
544 glTranslate - $x - 1, - $y - 1; 552 glTranslate - $x - 1, - $y - 1;
545 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 553 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
546 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 554 $::MAP->draw_magicmap ($w, $h, $data);
547 } 555 }
548 556
549 glPopMatrix; 557 glPopMatrix;
550 glEndList; 558 glEndList;
551 } 559 }
610sub refresh_hook { 618sub refresh_hook {
611 my ($self) = @_; 619 my ($self) = @_;
612 620
613 if ($::MAP && $self->{texture_atime} < time) { 621 if ($::MAP && $self->{texture_atime} < time) {
614 my ($w, $h) = @$self{qw(w h)}; 622 my ($w, $h) = @$self{qw(w h)};
623
624 return unless $w && $h;
615 625
616 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 626 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
617 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 627 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
618 628
619 my $ox = 0.5 * ($w - $sw); 629 my $ox = 0.5 * ($w - $sw);
848 my $text = $self->{entry}->get_text; 858 my $text = $self->{entry}->get_text;
849 859
850 length $text 860 length $text
851 or return $self->hide; 861 or return $self->hide;
852 862
853 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
854
855 if ($text ne $self->{last_search}) { 863 if ($text ne $self->{last_search}) {
856 my @match; 864 my @match;
857 865
858 if ($text =~ /^(.*?)\s+$/) { 866 if ($text =~ /^(.*?)\s+$/) {
867 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
859 @match = [$cmd, "(appended whitespace suppresses completion)"]; 868 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
860 } else { 869 } else {
870 # @match is [command, penalty, command with arguments] until sort
871
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
873
861 my $regexp = do { 874 my $regexp_abbrev = do {
862 my ($beg, @chr) = split //, lc $cmd; 875 my ($beg, @chr) = split //, lc $cmd;
863 876
864 # the following regex is used to match our "completion entry" 877 # the following regex is used to match our "completion entry"
865 # to an actual command - the parentheses match kind of "overhead" 878 # to an actual command - the parentheses match kind of "overhead"
866 # - the more characters the parentheses match, the less attractive 879 # - the more characters the parentheses match, the less attractive
868 my $regexp = "^\Q$beg\E" 881 my $regexp = "^\Q$beg\E"
869 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 882 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
870 qr<$regexp> 883 qr<$regexp>
871 }; 884 };
872 885
873 my @penalty; 886 my $regexp_partial = do {
887 my $regexp = "^\Q$text\E(.*)";
888 qr<$regexp>
889 };
874 890
875 for (keys %{$self->{command}}) { 891 for (keys %{$self->{command}}) {
876 if (@penalty = $_ =~ $regexp) { 892 my @scores;
877 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 893
894 # 1. Complete command [with args]
895 # command is a prefix of the text
896 # score is length of complete command matched
897 # e.g. "invoke summon pet monster bat"
898 # "invoke" "summon pet monster bat" = 6
899 # "invoke summon pet monster" "bat" = 25
900 if ($text =~ /^\Q$_\E(.*)/) {
901 push @scores, [$_, length $_, $text];
878 } 902 }
903
904 # 2. Partial command
905 # text is a prefix of the full command
906 # score is the length of the input text
907 # e.g. "invoke s"
908 # "invoke small fireball" = 8
909 # "invoke summon pet monster" = 8
910
911 if ($_ =~ $regexp_partial) {
912 push @scores, [$_, length $text, $_];
913 }
914
915 # 3. Abbreviation match
916 # attempts to use first word of text as an abbreviated command
917 # score is length of word + 1 - 3 per non-word-initial character
918
919 if (my @penalty = $_ =~ $regexp_abbrev) {
920 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
921 }
922
923 # Pick the best option for this command
924 push @match, (sort {
925 $b->[1] <=> $a->[1]
926 } @scores)[0];
879 } 927 }
880 928
929 # @match is now [command object, command with arguments]
881 @match = map $self->{command}{$_->[0]}, 930 @match = map [$self->{command}{$_->[0]}, $_->[2]],
882 sort { 931 sort {
883 $a->[1] <=> $b->[1] 932 $b->[1] <=> $a->[1]
884 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 933 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
885 or (length $b->[0]) <=> (length $a->[0]) 934 or (length $b->[0]) <=> (length $a->[0])
886 } @match; 935 } @match;
887 } 936 }
888 937
907 $label->{fg} = [1, 1, 1, 1]; 956 $label->{fg} = [1, 1, 1, 1];
908 $label->{bg} = [0, 0, 0, 0]; 957 $label->{bg} = [0, 0, 0, 0];
909 } 958 }
910 959
911 if (@matches) { 960 if (@matches) {
912 $self->{select} = "$matches[0][0]$arg"; 961 $self->{select} = "$matches[0][1]";
913 962
914 $labels[0]->{fg} = [0, 0, 0, 1]; 963 $labels[0]->{fg} = [0, 0, 0, 1];
915 $labels[0]->{bg} = [1, 1, 1, 0.8]; 964 $labels[0]->{bg} = [1, 1, 1, 0.8];
916 } else { 965 } else {
917 $self->{select} = "$cmd$arg"; 966 $self->{select} = "$text";
918 } 967 }
919 968
920 for my $match (@matches) { 969 for my $match (@matches) {
921 my $label = shift @labels; 970 my $label = shift @labels;
922 971
923 if (@labels) { 972 if (@labels) {
924 $label->set_text ("$match->[0]$arg"); 973 $label->set_text ("$match->[1]");
925 $label->set_tooltip ($match->[1]); 974 $label->set_tooltip ("$match->[0][1]");
926 } else { 975 } else {
927 $label->set_text ("..."); 976 $label->set_text ("...");
928 $label->set_tooltip ("Use Cursor-Down to view more matches"); 977 $label->set_tooltip ("Use Cursor-Down to view more matches");
929 last; 978 last;
930 } 979 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines