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.145 by root, Wed Sep 24 01:03:05 2008 UTC vs.
Revision 1.164 by root, Sat Aug 13 23:18:19 2011 UTC

1package DC::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use common::sense;
4use utf8;
5 4
6use List::Util qw(min max); 5use List::Util qw(min max);
6
7use AnyEvent ();
7 8
8use DC; 9use DC;
9use DC::OpenGL; 10use DC::OpenGL;
10use DC::UI; 11use DC::UI;
11use DC::Macro; 12use DC::Macro;
12 13
13our @ISA = DC::UI::Base::; 14our @ISA = DC::UI::Base::;
15
16our @TEX_HIDDEN = map {
17 new_from_resource DC::Texture # MUST be POT
18 "hidden-$_.png", mipmap => 1, wrap => 1
19 } 0, 1, 2;
14 20
15my $magicmap_tex = 21my $magicmap_tex =
16 new_from_resource DC::Texture "magicmap.png", 22 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 23 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 24
… …
163sub invoke_button_down { 169sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 170 my ($self, $ev, $x, $y) = @_;
165 171
166 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
167 $self->grab_focus; 173 $self->grab_focus;
168 return unless $::CONN; 174 return unless $::CONN && $self->{ctilesize};
169 175
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 176 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}; 177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 178
173 $x -= DC::floor $::MAP->w * 0.5; 179 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 211# ["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 ); 212 );
213 213
214 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 215# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 217# \&editor_invoke,
218# ]; 218# ];
219 219
220 for my $type (qw(test name)) { 220 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{servertype} ne $type
222 or next; 222 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 224 or next;
225 225
226 push @items, [ 226 push @items, [
… …
402} 402}
403 403
404sub scroll { 404sub scroll {
405 my ($self, $dx, $dy) = @_; 405 my ($self, $dx, $dy) = @_;
406 406
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update; 407 $self->movement_update;
410 408
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize}; 410 $self->{sdy} += $dy * $self->{tilesize};
411
412 # save old fow texture, if applicable
413 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
414 $self->{lfdx} = $dx;
415 $self->{lfdy} = $dy;
416 $self->{lmdx} = $self->{dx};
417 $self->{lmdy} = $self->{dy};
418
419 $::MAP->scroll ($dx, $dy);
413} 420}
414 421
415sub set_magicmap { 422sub set_magicmap {
416 my ($self, $w, $h, $x, $y, $data) = @_; 423 my ($self, $w, $h, $x, $y, $data) = @_;
417 424
… …
426sub movement_update { 433sub movement_update {
427 my ($self) = @_; 434 my ($self) = @_;
428 435
429 if ($::CFG->{smooth_movement}) { 436 if ($::CFG->{smooth_movement}) {
430 if ($self->{sdx} || $self->{sdy}) { 437 if ($self->{sdx} || $self->{sdy}) {
431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 438 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 439 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 440
434 # the minimum time for a single tile movement 441 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 442 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436 443
… …
457 } 464 }
458 } else { 465 } else {
459 $self->{sdx} = $self->{sdy} = 0; 466 $self->{sdx} = $self->{sdy} = 0;
460 } 467 }
461 468
462 $self->{last_update} = EV::time; 469 $self->{last_update} = AE::time;
463} 470}
464 471
465sub refresh_hook { 472sub refresh_hook {
466 my ($self) = @_; 473 my ($self) = @_;
467 474
… …
488 495
489 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 496 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
490 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 497 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
491 498
492 if ($::CFG->{fow_enable}) { 499 if ($::CFG->{fow_enable}) {
493 $sdx_t = $sdy_t = 0;#d# 500 # draw_fow_texture REQUIRES the fow texture to stay the same size.
494 my ($w, $h, $data) = $::MAP->fow_texture ( 501 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
495 $dx + (min 0, $sdx_t),
496 $dy + (min 0, $sdy_t),
497 $sw + abs $sdx_t,
498 $sh + abs $sdy_t
499 );
500 502
501 $self->{fow_texture} = new DC::Texture 503 $self->{fow_texture} = new DC::Texture
502 w => $w, 504 w => $w,
503 h => $h, 505 h => $h,
504 data => $data, 506 data => $data,
… …
511 glNewList ($self->{list} ||= glGenList); 513 glNewList ($self->{list} ||= glGenList);
512 514
513 glPushMatrix; 515 glPushMatrix;
514 glTranslate $sx0, $sy0; 516 glTranslate $sx0, $sy0;
515 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 517 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
516 glTranslate $self->{sdx}, $self->{sdy}; 518 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
517 519
518 $::MAP->draw ($dx, $dy, $sw, $sh, 520 $::MAP->draw ($dx, $dy, $sw, $sh,
519 $self->{tilesize}, 521 ($self->{tilesize}) x 2,
520 $::CONN->{player}{tag}, 522 $::CONN->{player}{tag},
521 -$self->{sdx}, -$self->{sdy}); 523 -$self->{sdx}, -$self->{sdy});
522 524
523 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
524 glScale $self->{tilesize}, $self->{tilesize}; 525 glScale $self->{tilesize}, $self->{tilesize};
525 526
526 if (my $tex = $self->{fow_texture}) { 527 if (my $tex = $self->{fow_texture}) {
527 glPushMatrix; 528 my @prev_fow_params;
528 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
529 glScale 1/3, 1/3;
530 glEnable GL_TEXTURE_2D;
531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
532 529
530 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
531 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
532 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
533
534 if ($d1 * $d2) {
535 @prev_fow_params = (
536 (min 1, $d1 / $d2),
537 $self->{lmdx} - $dx - $self->{lfdx},
538 $self->{lmdy} - $dy - $self->{lfdy},
539 @{$self->{prev_fow_texture}}{qw(name data)}
540 );
541 }
542 }
543
544 DC::Texture::draw_fow_texture
533 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 545 $::CFG->{fow_intensity},
534 $self->{fow_texture}->draw_quad_alpha (0, 0); 546 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
535 547 @{$self->{fow_texture}}{qw(name data s t w h)},
536 glDisable GL_TEXTURE_2D; 548 @prev_fow_params;
537 glPopMatrix;
538 } 549 }
539 550
540 if ($self->{magicmap}) { 551 if ($self->{magicmap}) {
541 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 552 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
542 553
543 $x += $::MAP->ox + $self->{dx}; 554 $x += $::MAP->ox + $self->{dx};
544 $y += $::MAP->oy + $self->{dy}; 555 $y += $::MAP->oy + $self->{dy};
545 556
546 glTranslate - $x - 1, - $y - 1; 557 glTranslate - $x - 1, - $y - 1;
547 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 558 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
548 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 559 $::MAP->draw_magicmap ($w, $h, $data);
549 } 560 }
550 561
551 glPopMatrix; 562 glPopMatrix;
552 glEndList; 563 glEndList;
553 } 564 }
554 } else { 565 } else {
566 delete $self->{last_fow_texture};
567 delete $self->{fow_texture};
568
555 glDeleteList delete $self->{list} 569 glDeleteList delete $self->{list}
556 if $self->{list}; 570 if $self->{list};
557 } 571 }
558} 572}
559 573
… …
595 $self->SUPER::DESTROY; 609 $self->SUPER::DESTROY;
596} 610}
597 611
598package DC::MapWidget::MapMap; 612package DC::MapWidget::MapMap;
599 613
600use strict; 614use common::sense;
601use utf8;
602 615
603our @ISA = DC::UI::Base::; 616our @ISA = DC::UI::Base::;
604 617
605use Time::HiRes qw(time);
606use DC::OpenGL; 618use DC::OpenGL;
607 619
608sub size_request { 620sub size_request {
609 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 621 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
610} 622}
611 623
612sub refresh_hook { 624sub refresh_hook {
613 my ($self) = @_; 625 my ($self) = @_;
614 626
615 if ($::MAP && $self->{texture_atime} < time) { 627 if ($::MAP && $self->{texture_atime} < AE::now) {
616 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
617 629
618 return unless $w && $h; 630 return unless $w && $h;
619 631
620 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 632 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
… …
635 $self->{sh} = $sh; 647 $self->{sh} = $sh;
636 648
637 $self->{x0} = $x0; 649 $self->{x0} = $x0;
638 $self->{y0} = $y0; 650 $self->{y0} = $y0;
639 651
640 $self->{texture_atime} = time + 1/3; 652 $self->{texture_atime} = AE::now + 1/2;
641 653
642 $self->{texture} = 654 $self->{texture} =
643 new DC::Texture 655 new DC::Texture
644 w => $w, 656 w => $w,
645 h => $h, 657 h => $h,
… …
700 glDisable GL_BLEND; 712 glDisable GL_BLEND;
701} 713}
702 714
703package DC::MapWidget::Command; 715package DC::MapWidget::Command;
704 716
705use strict; 717use common::sense;
706 718
707use DC::OpenGL; 719use DC::OpenGL;
708 720
709our @ISA = DC::UI::Frame::; 721our @ISA = DC::UI::Frame::;
710 722
… …
852 my $text = $self->{entry}->get_text; 864 my $text = $self->{entry}->get_text;
853 865
854 length $text 866 length $text
855 or return $self->hide; 867 or return $self->hide;
856 868
857 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
858
859 if ($text ne $self->{last_search}) { 869 if ($text ne $self->{last_search}) {
860 my @match; 870 my @match;
861 871
862 if ($text =~ /^(.*?)\s+$/) { 872 if ($text =~ /^(.*?)\s+$/) {
873 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
863 @match = [$cmd, "(appended whitespace suppresses completion)"]; 874 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
864 } else { 875 } else {
876 # @match is [command, penalty, command with arguments] until sort
877
878 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
879
865 my $regexp = do { 880 my $regexp_abbrev = do {
866 my ($beg, @chr) = split //, lc $cmd; 881 my ($beg, @chr) = split //, lc $cmd;
867 882
868 # the following regex is used to match our "completion entry" 883 # the following regex is used to match our "completion entry"
869 # to an actual command - the parentheses match kind of "overhead" 884 # to an actual command - the parentheses match kind of "overhead"
870 # - the more characters the parentheses match, the less attractive 885 # - the more characters the parentheses match, the less attractive
… …
872 my $regexp = "^\Q$beg\E" 887 my $regexp = "^\Q$beg\E"
873 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 888 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
874 qr<$regexp> 889 qr<$regexp>
875 }; 890 };
876 891
877 my @penalty; 892 my $regexp_partial = do {
893 my $regexp = "^\Q$text\E(.*)";
894 qr<$regexp>
895 };
878 896
879 for (keys %{$self->{command}}) { 897 for (keys %{$self->{command}}) {
880 if (@penalty = $_ =~ $regexp) { 898 my @scores;
881 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 899
900 # 1. Complete command [with args]
901 # command is a prefix of the text
902 # score is length of complete command matched
903 # e.g. "invoke summon pet monster bat"
904 # "invoke" "summon pet monster bat" = 6
905 # "invoke summon pet monster" "bat" = 25
906 if ($text =~ /^\Q$_\E(.*)/) {
907 push @scores, [$_, length $_, $text];
882 } 908 }
909
910 # 2. Partial command
911 # text is a prefix of the full command
912 # score is the length of the input text
913 # e.g. "invoke s"
914 # "invoke small fireball" = 8
915 # "invoke summon pet monster" = 8
916
917 if ($_ =~ $regexp_partial) {
918 push @scores, [$_, length $text, $_];
919 }
920
921 # 3. Abbreviation match
922 # attempts to use first word of text as an abbreviated command
923 # score is length of word + 1 - 3 per non-word-initial character
924
925 if (my @penalty = $_ =~ $regexp_abbrev) {
926 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
927 }
928
929 # Pick the best option for this command
930 push @match, (sort {
931 $b->[1] <=> $a->[1]
932 } @scores)[0];
883 } 933 }
884 934
935 # @match is now [command object, command with arguments]
885 @match = map $self->{command}{$_->[0]}, 936 @match = map [$self->{command}{$_->[0]}, $_->[2]],
886 sort { 937 sort {
887 $a->[1] <=> $b->[1] 938 $b->[1] <=> $a->[1]
888 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 939 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
889 or (length $b->[0]) <=> (length $a->[0]) 940 or (length $b->[0]) <=> (length $a->[0])
890 } @match; 941 } @match;
891 } 942 }
892 943
… …
911 $label->{fg} = [1, 1, 1, 1]; 962 $label->{fg} = [1, 1, 1, 1];
912 $label->{bg} = [0, 0, 0, 0]; 963 $label->{bg} = [0, 0, 0, 0];
913 } 964 }
914 965
915 if (@matches) { 966 if (@matches) {
916 $self->{select} = "$matches[0][0]$arg"; 967 $self->{select} = "$matches[0][1]";
917 968
918 $labels[0]->{fg} = [0, 0, 0, 1]; 969 $labels[0]->{fg} = [0, 0, 0, 1];
919 $labels[0]->{bg} = [1, 1, 1, 0.8]; 970 $labels[0]->{bg} = [1, 1, 1, 0.8];
920 } else { 971 } else {
921 $self->{select} = "$cmd$arg"; 972 $self->{select} = "$text";
922 } 973 }
923 974
924 for my $match (@matches) { 975 for my $match (@matches) {
925 my $label = shift @labels; 976 my $label = shift @labels;
926 977
927 if (@labels) { 978 if (@labels) {
928 $label->set_text ("$match->[0]$arg"); 979 $label->set_text ("$match->[1]");
929 $label->set_tooltip ($match->[1]); 980 $label->set_tooltip ("$match->[0][1]");
930 } else { 981 } else {
931 $label->set_text ("..."); 982 $label->set_text ("...");
932 $label->set_tooltip ("Use Cursor-Down to view more matches"); 983 $label->set_tooltip ("Use Cursor-Down to view more matches");
933 last; 984 last;
934 } 985 }

Diff Legend

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