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.147 by root, Mon Dec 22 02:33:30 2008 UTC vs.
Revision 1.168 by root, Wed Nov 21 13:23:10 2012 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
… …
25 tilesize => 32, 31 tilesize => 32,
26 @_ 32 @_
27 ); 33 );
28 34
29 $self 35 $self
30}
31
32sub add_command {
33 my ($self, $command, $tooltip, $widget, $cb) = @_;
34
35 (my $data = $command) =~ s/\\//g;
36
37 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//;
40
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42}
43
44sub clr_commands {
45 my ($self) = @_;
46
47 %{$::COMPLETER->{command}} = ();
48
49 $::COMPLETER->hide
50 if $::COMPLETER;
51} 36}
52 37
53sub server_login { 38sub server_login {
54 my ($server) = @_; 39 my ($server) = @_;
55 40
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 190# ["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 ); 191 );
213 192
214 if ($::CONN && $::CONN->{editor_support}) { 193 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 194# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 195# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 196# \&editor_invoke,
218# ]; 197# ];
219 198
220 for my $type (qw(test name)) { 199 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 200 $::CONN->{editor_support}{servertype} ne $type
222 or next; 201 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 202 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 203 or next;
225 204
226 push @items, [ 205 push @items, [
… …
402} 381}
403 382
404sub scroll { 383sub scroll {
405 my ($self, $dx, $dy) = @_; 384 my ($self, $dx, $dy) = @_;
406 385
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update; 386 $self->movement_update;
410 387
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 388 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize}; 389 $self->{sdy} += $dy * $self->{tilesize};
390
391 # save old fow texture, if applicable
392 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
393 $self->{lfdx} = $dx;
394 $self->{lfdy} = $dy;
395 $self->{lmdx} = $self->{dx};
396 $self->{lmdy} = $self->{dy};
397
398 $::MAP->scroll ($dx, $dy);
413} 399}
414 400
415sub set_magicmap { 401sub set_magicmap {
416 my ($self, $w, $h, $x, $y, $data) = @_; 402 my ($self, $w, $h, $x, $y, $data) = @_;
417 403
… …
426sub movement_update { 412sub movement_update {
427 my ($self) = @_; 413 my ($self) = @_;
428 414
429 if ($::CFG->{smooth_movement}) { 415 if ($::CFG->{smooth_movement}) {
430 if ($self->{sdx} || $self->{sdy}) { 416 if ($self->{sdx} || $self->{sdy}) {
431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 417 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 418 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 419
434 # the minimum time for a single tile movement 420 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 421 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436 422
… …
457 } 443 }
458 } else { 444 } else {
459 $self->{sdx} = $self->{sdy} = 0; 445 $self->{sdx} = $self->{sdy} = 0;
460 } 446 }
461 447
462 $self->{last_update} = EV::time; 448 $self->{last_update} = AE::time;
463} 449}
464 450
465sub refresh_hook { 451sub refresh_hook {
466 my ($self) = @_; 452 my ($self) = @_;
467 453
… …
488 474
489 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 475 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; 476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
491 477
492 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
493 $sdx_t = $sdy_t = 0;#d# 479 # draw_fow_texture REQUIRES the fow texture to stay the same size.
494 my ($w, $h, $data) = $::MAP->fow_texture ( 480 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 481
501 $self->{fow_texture} = new DC::Texture 482 $self->{fow_texture} = new DC::Texture
502 w => $w, 483 w => $w,
503 h => $h, 484 h => $h,
504 data => $data, 485 data => $data,
… …
511 glNewList ($self->{list} ||= glGenList); 492 glNewList ($self->{list} ||= glGenList);
512 493
513 glPushMatrix; 494 glPushMatrix;
514 glTranslate $sx0, $sy0; 495 glTranslate $sx0, $sy0;
515 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 496 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
516 glTranslate $self->{sdx}, $self->{sdy}; 497 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
517 498
518 $::MAP->draw ($dx, $dy, $sw, $sh, 499 $::MAP->draw ($dx, $dy, $sw, $sh,
519 $self->{tilesize}, 500 ($self->{tilesize}) x 2,
520 $::CONN->{player}{tag}, 501 $::CONN->{player}{tag},
521 -$self->{sdx}, -$self->{sdy}); 502 -$self->{sdx}, -$self->{sdy});
522 503
523 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
524 glScale $self->{tilesize}, $self->{tilesize}; 504 glScale $self->{tilesize}, $self->{tilesize};
525 505
526 if (my $tex = $self->{fow_texture}) { 506 if (my $tex = $self->{fow_texture}) {
527 glPushMatrix; 507 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 508
509 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
510 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
511 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
512
513 if ($d1 * $d2) {
514 @prev_fow_params = (
515 (min 1, $d1 / $d2),
516 $self->{lmdx} - $dx - $self->{lfdx},
517 $self->{lmdy} - $dy - $self->{lfdy},
518 @{$self->{prev_fow_texture}}{qw(name data)}
519 );
520 }
521 }
522
523 DC::Texture::draw_fow_texture
533 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 524 $::CFG->{fow_intensity},
534 $self->{fow_texture}->draw_quad_alpha (0, 0); 525 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
535 526 @{$self->{fow_texture}}{qw(name data s t w h)},
536 glDisable GL_TEXTURE_2D; 527 @prev_fow_params;
537 glPopMatrix;
538 } 528 }
539 529
540 if ($self->{magicmap}) { 530 if ($self->{magicmap}) {
541 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 531 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
542 532
543 $x += $::MAP->ox + $self->{dx}; 533 $x += $::MAP->ox + $self->{dx};
544 $y += $::MAP->oy + $self->{dy}; 534 $y += $::MAP->oy + $self->{dy};
545 535
546 glTranslate - $x - 1, - $y - 1; 536 glTranslate - $x - 1, - $y - 1;
547 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 537 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
548 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 538 $::MAP->draw_magicmap ($w, $h, $data);
549 } 539 }
550 540
551 glPopMatrix; 541 glPopMatrix;
552 glEndList; 542 glEndList;
553 } 543 }
554 } else { 544 } else {
545 delete $self->{last_fow_texture};
546 delete $self->{fow_texture};
547
555 glDeleteList delete $self->{list} 548 glDeleteList delete $self->{list}
556 if $self->{list}; 549 if $self->{list};
557 } 550 }
558} 551}
559 552
… …
595 $self->SUPER::DESTROY; 588 $self->SUPER::DESTROY;
596} 589}
597 590
598package DC::MapWidget::MapMap; 591package DC::MapWidget::MapMap;
599 592
600use strict; 593use common::sense;
601use utf8;
602 594
603our @ISA = DC::UI::Base::; 595our @ISA = DC::UI::Base::;
604 596
605use Time::HiRes qw(time);
606use DC::OpenGL; 597use DC::OpenGL;
607 598
608sub size_request { 599sub size_request {
609 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 600 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
610} 601}
611 602
612sub refresh_hook { 603sub refresh_hook {
613 my ($self) = @_; 604 my ($self) = @_;
614 605
615 if ($::MAP && $self->{texture_atime} < time) { 606 if ($::MAP && $self->{texture_atime} < AE::now) {
616 my ($w, $h) = @$self{qw(w h)}; 607 my ($w, $h) = @$self{qw(w h)};
617 608
618 return unless $w && $h; 609 return unless $w && $h;
619 610
620 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 611 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
… …
635 $self->{sh} = $sh; 626 $self->{sh} = $sh;
636 627
637 $self->{x0} = $x0; 628 $self->{x0} = $x0;
638 $self->{y0} = $y0; 629 $self->{y0} = $y0;
639 630
640 $self->{texture_atime} = time + 1/3; 631 $self->{texture_atime} = AE::now + 1/2;
641 632
642 $self->{texture} = 633 $self->{texture} =
643 new DC::Texture 634 new DC::Texture
644 w => $w, 635 w => $w,
645 h => $h, 636 h => $h,
… …
700 glDisable GL_BLEND; 691 glDisable GL_BLEND;
701} 692}
702 693
703package DC::MapWidget::Command; 694package DC::MapWidget::Command;
704 695
705use strict; 696use common::sense;
706 697
707use DC::OpenGL; 698use DC::OpenGL;
708 699
709our @ISA = DC::UI::Frame::; 700our @ISA = DC::UI::Frame::;
710 701
… …
806 ); 797 );
807 798
808 $self 799 $self
809} 800}
810 801
802sub reset {
803 my ($self) = @_;
804
805 $self->hide;
806 delete $self->{command_list};
807}
808
811sub set_prefix { 809sub set_prefix {
812 my ($self, $prefix) = @_; 810 my ($self, $prefix) = @_;
813 811
814 $self->{entry}->set_text ($prefix); 812 $self->{entry}->set_text ($prefix);
815 $self->show; 813 $self->show;
… …
852 my $text = $self->{entry}->get_text; 850 my $text = $self->{entry}->get_text;
853 851
854 length $text 852 length $text
855 or return $self->hide; 853 or return $self->hide;
856 854
857 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 855 return unless $::CONN;
856
857 # regenerate spell list if necessary
858 $self->{command_list}{spells} ||= [
859 map { ("cast $_->{name}", "invoke $_->{name}") }
860 values %{ $::CONN->{spell} }
861 ];
858 862
859 if ($text ne $self->{last_search}) { 863 if ($text ne $self->{last_search}) {
860 my @match; 864 my @match;
861 865
862 if ($text =~ /^(.*?)\s+$/) { 866 if ($text =~ /^(.*?)\s+$/) {
867 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
863 @match = [$cmd, "(appended whitespace suppresses completion)"]; 868 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
864 } else { 869 } else {
870 # @match is [command, penalty, command with arguments] until sort
871
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
873
874 my $first_char = substr $cmd, 0, 1;
875
865 my $regexp = do { 876 my $regexp_abbrev = do {
866 my ($beg, @chr) = split //, lc $cmd; 877 my ($beg, @chr) = split //, lc $cmd;
867 878
868 # the following regex is used to match our "completion entry" 879 # the following regex is used to match our "completion entry"
869 # to an actual command - the parentheses match kind of "overhead" 880 # to an actual command - the parentheses match kind of "overhead"
870 # - the more characters the parentheses match, the less attractive 881 # - the more characters the parentheses match, the less attractive
871 # is the match. 882 # is the match.
872 my $regexp = "^\Q$beg\E" 883 my $regexp = "^\Q$beg\E"
873 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 884 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
874 qr<$regexp> 885 qr<$regexp>
875 }; 886 };
876 887
877 my @penalty; 888 my $regexp_partial = do {
889 my $regexp = "^\Q$text\E(.*)";
890 qr<$regexp>
891 };
878 892
879 for (keys %{$self->{command}}) { 893 for my $list (values %{ $self->{command_list} }) {
894 for (@$list) {
895 # we only match and score if the first character matches,
896 # so quickly rule out all others first.
897 next unless $first_char = substr $_, 0, 1;
898
899 my @scores;
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 ((substr $text, 0, length $_) eq $_) {
908 push @scores, [$_, length $_, $text];
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
880 if (@penalty = $_ =~ $regexp) { 926 if (my @penalty = $_ =~ $regexp_abbrev) {
881 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 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];
882 } 934 }
883 } 935 }
884 936
937 # @match is now [command object, command with arguments]
885 @match = map $self->{command}{$_->[0]}, 938 @match = map [$self->{command}{$_->[0]}, $_->[2]],
886 sort { 939 sort {
887 $a->[1] <=> $b->[1] 940 $b->[1] <=> $a->[1]
888 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 941 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
889 or (length $b->[0]) <=> (length $a->[0]) 942 or (length $b->[0]) <=> (length $a->[0])
890 } @match; 943 } @match;
891 } 944 }
892 945
… …
911 $label->{fg} = [1, 1, 1, 1]; 964 $label->{fg} = [1, 1, 1, 1];
912 $label->{bg} = [0, 0, 0, 0]; 965 $label->{bg} = [0, 0, 0, 0];
913 } 966 }
914 967
915 if (@matches) { 968 if (@matches) {
916 $self->{select} = "$matches[0][0]$arg"; 969 $self->{select} = "$matches[0][1]";
917 970
918 $labels[0]->{fg} = [0, 0, 0, 1]; 971 $labels[0]->{fg} = [0, 0, 0, 1];
919 $labels[0]->{bg} = [1, 1, 1, 0.8]; 972 $labels[0]->{bg} = [1, 1, 1, 0.8];
920 } else { 973 } else {
921 $self->{select} = "$cmd$arg"; 974 $self->{select} = "$text";
922 } 975 }
923 976
924 for my $match (@matches) { 977 for my $match (@matches) {
925 my $label = shift @labels; 978 my $label = shift @labels;
926 979
927 if (@labels) { 980 if (@labels) {
928 $label->set_text ("$match->[0]$arg"); 981 $label->set_text ("$match->[1]");
929 $label->set_tooltip ($match->[1]); 982 $label->set_tooltip ("$match->[0][1]");
930 } else { 983 } else {
931 $label->set_text ("..."); 984 $label->set_text ("...");
932 $label->set_tooltip ("Use Cursor-Down to view more matches"); 985 $label->set_tooltip ("Use Cursor-Down to view more matches");
933 last; 986 last;
934 } 987 }

Diff Legend

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