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.156 by root, Sat Dec 19 05:06:57 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>",
… …
403 397
404sub scroll { 398sub scroll {
405 my ($self, $dx, $dy) = @_; 399 my ($self, $dx, $dy) = @_;
406 400
407 $::MAP->scroll ($dx, $dy); 401 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update; 402 $self->movement_update;
410 403
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 404 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize}; 405 $self->{sdy} += $dy * $self->{tilesize};
406
407 $self->{last_fow_texture} = $self->{fow_texture};
408 $self->{ldx} = $self->{sdx};
409 $self->{ldy} = $self->{sdy};
410
413} 411}
414 412
415sub set_magicmap { 413sub set_magicmap {
416 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
417 415
… …
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 431
434 # the minimum time for a single tile movement 432 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436 434
435 $spd *= $self->{tilesize};
436
437 # jump if "impossibly high" speed 437 # jump if "impossibly high" speed
438 if ( 438 if (
439 (max abs $self->{sdx}, abs $self->{sdy}) 439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1 440 > $spd * $mintime * 2.1
441 ) { 441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0; 443 $self->{sdx} = $self->{sdy} = 0;
444 } else { 444 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446 446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449 449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 450 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 } 451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 } 452 }
453
454 $self->update;
455 } 455 }
456 } else { 456 } else {
457 $self->{sdx} = $self->{sdy} = 0; 457 $self->{sdx} = $self->{sdy} = 0;
458 } 458 }
459 459
… …
486 486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 487 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; 488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489 489
490 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d# 491 my ($sdx_t, $sdy_t);#d# do not anchor at player
492
492 my ($w, $h, $data) = $::MAP->fow_texture ( 493 my ($w, $h, $data) = $::MAP->fow_texture (
493 $dx + (min 0, $sdx_t), 494 $dx + (min 0, $sdx_t),
494 $dy + (min 0, $sdy_t), 495 $dy + (min 0, $sdy_t),
495 $sw + abs $sdx_t, 496 $sw + abs $sdx_t,
496 $sh + abs $sdy_t 497 $sh + abs $sdy_t
… …
509 glNewList ($self->{list} ||= glGenList); 510 glNewList ($self->{list} ||= glGenList);
510 511
511 glPushMatrix; 512 glPushMatrix;
512 glTranslate $sx0, $sy0; 513 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 514 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy}; 515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
515 516
516 $::MAP->draw ($dx, $dy, $sw, $sh, 517 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize}, 518 $self->{tilesize},
518 $::CONN->{player}{tag}, 519 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy}); 520 -$self->{sdx}, -$self->{sdy});
520 521
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player 522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
522 glScale $self->{tilesize}, $self->{tilesize}; 523 glScale $self->{tilesize}, $self->{tilesize};
523 524
524 if (my $tex = $self->{fow_texture}) { 525 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix; 526 if ($DC::OpenGL::GL_MULTITEX && $self->{last_fow_texture} && 0) {#d#
527 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
528 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
529
530 if ($d1 * $d2) {
531 DC::Texture::draw_fow_texture
532 $::CFG->{fow_intensity},
533 @{$self->{fow_texture}}{qw(name s t w h)},
534 $d1 / $d2,
535 $sdx_t - $self->{ldx} / $tilesize, $sdy_t - $self->{ldy} / $tilesize,
536 @{$self->{last_fow_texture}}{qw(name s t w h)};
537 } else {
538 delete $self->{last_fow_texture};
539
540 # same as a few lines below :/
541 DC::Texture::draw_fow_texture
542 $::CFG->{fow_intensity},
543 @{$self->{fow_texture}}{qw(name s t w h)};
544 }
545 } else {
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); 546 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
527 glScale 1/3, 1/3; 547 DC::Texture::draw_fow_texture
528 glEnable GL_TEXTURE_2D; 548 $::CFG->{fow_intensity},
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 549 @{$self->{fow_texture}}{qw(name s t w h)};
530 550 }
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0);
533
534 glDisable GL_TEXTURE_2D;
535 glPopMatrix;
536 } 551 }
537 552
538 if ($self->{magicmap}) { 553 if ($self->{magicmap}) {
539 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 554 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
540 555
… …
610sub refresh_hook { 625sub refresh_hook {
611 my ($self) = @_; 626 my ($self) = @_;
612 627
613 if ($::MAP && $self->{texture_atime} < time) { 628 if ($::MAP && $self->{texture_atime} < time) {
614 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
630
631 return unless $w && $h;
615 632
616 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 633 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
617 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 634 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
618 635
619 my $ox = 0.5 * ($w - $sw); 636 my $ox = 0.5 * ($w - $sw);
… …
848 my $text = $self->{entry}->get_text; 865 my $text = $self->{entry}->get_text;
849 866
850 length $text 867 length $text
851 or return $self->hide; 868 or return $self->hide;
852 869
853 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
854
855 if ($text ne $self->{last_search}) { 870 if ($text ne $self->{last_search}) {
856 my @match; 871 my @match;
857 872
858 if ($text =~ /^(.*?)\s+$/) { 873 if ($text =~ /^(.*?)\s+$/) {
874 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
859 @match = [$cmd, "(appended whitespace suppresses completion)"]; 875 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
860 } else { 876 } else {
877 # @match is [command, penalty, command with arguments] until sort
878
879 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
880
861 my $regexp = do { 881 my $regexp_abbrev = do {
862 my ($beg, @chr) = split //, lc $cmd; 882 my ($beg, @chr) = split //, lc $cmd;
863 883
864 # the following regex is used to match our "completion entry" 884 # the following regex is used to match our "completion entry"
865 # to an actual command - the parentheses match kind of "overhead" 885 # to an actual command - the parentheses match kind of "overhead"
866 # - the more characters the parentheses match, the less attractive 886 # - the more characters the parentheses match, the less attractive
… …
868 my $regexp = "^\Q$beg\E" 888 my $regexp = "^\Q$beg\E"
869 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 889 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
870 qr<$regexp> 890 qr<$regexp>
871 }; 891 };
872 892
873 my @penalty; 893 my $regexp_partial = do {
894 my $regexp = "^\Q$text\E(.*)";
895 qr<$regexp>
896 };
874 897
875 for (keys %{$self->{command}}) { 898 for (keys %{$self->{command}}) {
876 if (@penalty = $_ =~ $regexp) { 899 my @scores;
877 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 900
901 # 1. Complete command [with args]
902 # command is a prefix of the text
903 # score is length of complete command matched
904 # e.g. "invoke summon pet monster bat"
905 # "invoke" "summon pet monster bat" = 6
906 # "invoke summon pet monster" "bat" = 25
907 if ($text =~ /^\Q$_\E(.*)/) {
908 push @scores, [$_, length $_, $text];
878 } 909 }
910
911 # 2. Partial command
912 # text is a prefix of the full command
913 # score is the length of the input text
914 # e.g. "invoke s"
915 # "invoke small fireball" = 8
916 # "invoke summon pet monster" = 8
917
918 if ($_ =~ $regexp_partial) {
919 push @scores, [$_, length $text, $_];
920 }
921
922 # 3. Abbreviation match
923 # attempts to use first word of text as an abbreviated command
924 # score is length of word + 1 - 3 per non-word-initial character
925
926 if (my @penalty = $_ =~ $regexp_abbrev) {
927 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
928 }
929
930 # Pick the best option for this command
931 push @match, (sort {
932 $b->[1] <=> $a->[1]
933 } @scores)[0];
879 } 934 }
880 935
936 # @match is now [command object, command with arguments]
881 @match = map $self->{command}{$_->[0]}, 937 @match = map [$self->{command}{$_->[0]}, $_->[2]],
882 sort { 938 sort {
883 $a->[1] <=> $b->[1] 939 $b->[1] <=> $a->[1]
884 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 940 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
885 or (length $b->[0]) <=> (length $a->[0]) 941 or (length $b->[0]) <=> (length $a->[0])
886 } @match; 942 } @match;
887 } 943 }
888 944
… …
907 $label->{fg} = [1, 1, 1, 1]; 963 $label->{fg} = [1, 1, 1, 1];
908 $label->{bg} = [0, 0, 0, 0]; 964 $label->{bg} = [0, 0, 0, 0];
909 } 965 }
910 966
911 if (@matches) { 967 if (@matches) {
912 $self->{select} = "$matches[0][0]$arg"; 968 $self->{select} = "$matches[0][1]";
913 969
914 $labels[0]->{fg} = [0, 0, 0, 1]; 970 $labels[0]->{fg} = [0, 0, 0, 1];
915 $labels[0]->{bg} = [1, 1, 1, 0.8]; 971 $labels[0]->{bg} = [1, 1, 1, 0.8];
916 } else { 972 } else {
917 $self->{select} = "$cmd$arg"; 973 $self->{select} = "$text";
918 } 974 }
919 975
920 for my $match (@matches) { 976 for my $match (@matches) {
921 my $label = shift @labels; 977 my $label = shift @labels;
922 978
923 if (@labels) { 979 if (@labels) {
924 $label->set_text ("$match->[0]$arg"); 980 $label->set_text ("$match->[1]");
925 $label->set_tooltip ($match->[1]); 981 $label->set_tooltip ("$match->[0][1]");
926 } else { 982 } else {
927 $label->set_text ("..."); 983 $label->set_text ("...");
928 $label->set_tooltip ("Use Cursor-Down to view more matches"); 984 $label->set_tooltip ("Use Cursor-Down to view more matches");
929 last; 985 last;
930 } 986 }

Diff Legend

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