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.152 by root, Sat Nov 21 05:17:28 2009 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 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
… …
27 ); 33 );
28 34
29 $self 35 $self
30} 36}
31 37
32sub add_command { 38sub add_command {#d# remove
33 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
34 40
35 (my $data = $command) =~ s/\\//g; 41 (my $data = $command) =~ s/\\//g;
36 42
37 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
40 46
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::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} 48}
52 49
53sub server_login { 50sub server_login {
54 my ($server) = @_; 51 my ($server) = @_;
55 52
… …
209# push @items, [ 206# push @items, [
210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 207# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
211# \&editor_invoke, 208# \&editor_invoke,
212# ]; 209# ];
213 210
214 for my $type (qw(test name)) { 211 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
215 $::CONN->{editor_support}{type} ne $type 212 $::CONN->{editor_support}{servertype} ne $type
216 or next; 213 or next;
217 my $server = $::CONN->{editor_support}{"${type}server"} 214 my $server = $::CONN->{editor_support}{"${type}server"}
218 or next; 215 or next;
219 216
220 push @items, [ 217 push @items, [
… …
396} 393}
397 394
398sub scroll { 395sub scroll {
399 my ($self, $dx, $dy) = @_; 396 my ($self, $dx, $dy) = @_;
400 397
401 $::MAP->scroll ($dx, $dy);
402
403 $self->{last_fow_texture} = $self->{fow_texture};
404 $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
405 $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
406
407 $self->movement_update; 398 $self->movement_update;
408 399
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 400 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize}; 401 $self->{sdy} += $dy * $self->{tilesize};
402
403 # save old fow texture, if applicable
404 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
405 $self->{lfdx} = $dx;
406 $self->{lfdy} = $dy;
407 $self->{lmdx} = $self->{dx};
408 $self->{lmdy} = $self->{dy};
409
410 $::MAP->scroll ($dx, $dy);
411} 411}
412 412
413sub set_magicmap { 413sub set_magicmap {
414 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
415 415
… …
424sub movement_update { 424sub movement_update {
425 my ($self) = @_; 425 my ($self) = @_;
426 426
427 if ($::CFG->{smooth_movement}) { 427 if ($::CFG->{smooth_movement}) {
428 if ($self->{sdx} || $self->{sdy}) { 428 if ($self->{sdx} || $self->{sdy}) {
429 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 429 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
431 431
432 # the minimum time for a single tile movement 432 # the minimum time for a single tile movement
433 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);
434 434
… …
455 } 455 }
456 } else { 456 } else {
457 $self->{sdx} = $self->{sdy} = 0; 457 $self->{sdx} = $self->{sdy} = 0;
458 } 458 }
459 459
460 $self->{last_update} = EV::time; 460 $self->{last_update} = AE::time;
461} 461}
462 462
463sub refresh_hook { 463sub refresh_hook {
464 my ($self) = @_; 464 my ($self) = @_;
465 465
… …
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 my ($sdx_t, $sdy_t);#d# do not anchor at player 491 # draw_fow_texture REQUIRES the fow texture to stay the same size.
492
493 my ($w, $h, $data) = $::MAP->fow_texture ( 492 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
494 $dx + (min 0, $sdx_t),
495 $dy + (min 0, $sdy_t),
496 $sw + abs $sdx_t,
497 $sh + abs $sdy_t
498 );
499 493
500 $self->{fow_texture} = new DC::Texture 494 $self->{fow_texture} = new DC::Texture
501 w => $w, 495 w => $w,
502 h => $h, 496 h => $h,
503 data => $data, 497 data => $data,
… …
513 glTranslate $sx0, $sy0; 507 glTranslate $sx0, $sy0;
514 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 508 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy}; 509 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
516 510
517 $::MAP->draw ($dx, $dy, $sw, $sh, 511 $::MAP->draw ($dx, $dy, $sw, $sh,
518 $self->{tilesize}, 512 ($self->{tilesize}) x 2,
519 $::CONN->{player}{tag}, 513 $::CONN->{player}{tag},
520 -$self->{sdx}, -$self->{sdy}); 514 -$self->{sdx}, -$self->{sdy});
521 515
522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
523 glScale $self->{tilesize}, $self->{tilesize}; 516 glScale $self->{tilesize}, $self->{tilesize};
524 517
525 if (my $tex = $self->{fow_texture}) { 518 if (my $tex = $self->{fow_texture}) {
526 glEnable GL_TEXTURE_2D; 519 my @prev_fow_params;
527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
528 520
529 my $a1 = 0.9; 521 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
530 522 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
531 if (0 && $self->{last_fow_texture}) { 523 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
532 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
533 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
534 524
535 if ($d1 * $d2) { 525 if ($d1 * $d2) {
526 @prev_fow_params = (
536 my $a2 = $d1 / $d2; 527 (min 1, $d1 / $d2),
537 528 $self->{lmdx} - $dx - $self->{lfdx},
538 $a1 = (1/$a2); 529 $self->{lmdy} - $dy - $self->{lfdy},
539 530 @{$self->{prev_fow_texture}}{qw(name data)}
540 #$a1 *= 0.9;
541 #$a2 *= 0.9;
542
543 printf "%4g %4g %4g\n", $d1, $d2, $a1+$a2;#d#
544
545 #$a1 = 1 - (1-$a1) * 0.707;
546 #$a2 = 1 - (1-$a2) * 0.707;
547
548 glColor 1,0,0,1;
549 glBegin GL_QUADS;
550 glVertex 10 + $sdx_t, 10;
551 glVertex 11 + $sdx_t, 10;
552 glVertex 11 + $sdx_t, 11;
553 glVertex 10 + $sdx_t, 11;
554 glEnd; 531 );
555
556 glColor +($::CFG->{fow_intensity}) x 3, $a2;
557 glPushMatrix;
558 glTranslate $sdx_t, $sdy_t; # anchor at player
559 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
560 glScale 1/3, 1/3;
561 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
562 glPopMatrix;
563 } else {
564 delete $self->{last_fow_texture};
565 } 532 }
566 } 533 }
567 534
535 DC::Texture::draw_fow_texture
568 glColor +($::CFG->{fow_intensity}) x 3, $a1; 536 $::CFG->{fow_intensity},
569 glPushMatrix; 537 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
570 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player 538 @{$self->{fow_texture}}{qw(name data s t w h)},
571 glScale 1/3, 1/3; 539 @prev_fow_params;
572 $self->{fow_texture}->draw_quad_alpha (0, 0);
573 glPopMatrix;
574
575 glDisable GL_TEXTURE_2D;
576 } 540 }
577 541
578 if ($self->{magicmap}) { 542 if ($self->{magicmap}) {
579 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 543 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
580 544
581 $x += $::MAP->ox + $self->{dx}; 545 $x += $::MAP->ox + $self->{dx};
582 $y += $::MAP->oy + $self->{dy}; 546 $y += $::MAP->oy + $self->{dy};
583 547
584 glTranslate - $x - 1, - $y - 1; 548 glTranslate - $x - 1, - $y - 1;
585 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 549 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
586 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 550 $::MAP->draw_magicmap ($w, $h, $data);
587 } 551 }
588 552
589 glPopMatrix; 553 glPopMatrix;
590 glEndList; 554 glEndList;
591 } 555 }
592 } else { 556 } else {
557 delete $self->{last_fow_texture};
558 delete $self->{fow_texture};
559
593 glDeleteList delete $self->{list} 560 glDeleteList delete $self->{list}
594 if $self->{list}; 561 if $self->{list};
595 } 562 }
596} 563}
597 564
… …
633 $self->SUPER::DESTROY; 600 $self->SUPER::DESTROY;
634} 601}
635 602
636package DC::MapWidget::MapMap; 603package DC::MapWidget::MapMap;
637 604
638use strict; 605use common::sense;
639use utf8;
640 606
641our @ISA = DC::UI::Base::; 607our @ISA = DC::UI::Base::;
642 608
643use Time::HiRes qw(time);
644use DC::OpenGL; 609use DC::OpenGL;
645 610
646sub size_request { 611sub size_request {
647 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 612 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
648} 613}
649 614
650sub refresh_hook { 615sub refresh_hook {
651 my ($self) = @_; 616 my ($self) = @_;
652 617
653 if ($::MAP && $self->{texture_atime} < time) { 618 if ($::MAP && $self->{texture_atime} < AE::now) {
654 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
655 620
656 return unless $w && $h; 621 return unless $w && $h;
657 622
658 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 623 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
… …
673 $self->{sh} = $sh; 638 $self->{sh} = $sh;
674 639
675 $self->{x0} = $x0; 640 $self->{x0} = $x0;
676 $self->{y0} = $y0; 641 $self->{y0} = $y0;
677 642
678 $self->{texture_atime} = time + 1/3; 643 $self->{texture_atime} = AE::now + 1/2;
679 644
680 $self->{texture} = 645 $self->{texture} =
681 new DC::Texture 646 new DC::Texture
682 w => $w, 647 w => $w,
683 h => $h, 648 h => $h,
… …
738 glDisable GL_BLEND; 703 glDisable GL_BLEND;
739} 704}
740 705
741package DC::MapWidget::Command; 706package DC::MapWidget::Command;
742 707
743use strict; 708use common::sense;
744 709
745use DC::OpenGL; 710use DC::OpenGL;
746 711
747our @ISA = DC::UI::Frame::; 712our @ISA = DC::UI::Frame::;
748 713
… …
844 ); 809 );
845 810
846 $self 811 $self
847} 812}
848 813
814sub reset {
815 my ($self) = @_;
816
817 $self->hide;
818 delete $self->{command_list};
819}
820
849sub set_prefix { 821sub set_prefix {
850 my ($self, $prefix) = @_; 822 my ($self, $prefix) = @_;
851 823
852 $self->{entry}->set_text ($prefix); 824 $self->{entry}->set_text ($prefix);
853 $self->show; 825 $self->show;
… …
889 861
890 my $text = $self->{entry}->get_text; 862 my $text = $self->{entry}->get_text;
891 863
892 length $text 864 length $text
893 or return $self->hide; 865 or return $self->hide;
866
867 return unless $::CONN;
868
869 # regenerate spell list if necessary
870 $self->{command_list}{spells} ||= [
871 map { ("cast $_->{name}", "invoke $_->{name}") }
872 values %{ $::CONN->{spell} }
873 ];
894 874
895 if ($text ne $self->{last_search}) { 875 if ($text ne $self->{last_search}) {
896 my @match; 876 my @match;
897 877
898 if ($text =~ /^(.*?)\s+$/) { 878 if ($text =~ /^(.*?)\s+$/) {
… …
901 } else { 881 } else {
902 # @match is [command, penalty, command with arguments] until sort 882 # @match is [command, penalty, command with arguments] until sort
903 883
904 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 884 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
905 885
886 my $first_char = substr $cmd, 0, 1;
887
906 my $regexp_abbrev = do { 888 my $regexp_abbrev = do {
907 my ($beg, @chr) = split //, lc $cmd; 889 my ($beg, @chr) = split //, lc $cmd;
908 890
909 # the following regex is used to match our "completion entry" 891 # the following regex is used to match our "completion entry"
910 # to an actual command - the parentheses match kind of "overhead" 892 # to an actual command - the parentheses match kind of "overhead"
911 # - the more characters the parentheses match, the less attractive 893 # - the more characters the parentheses match, the less attractive
912 # is the match. 894 # is the match.
913 my $regexp = "^\Q$beg\E" 895 my $regexp = "^\Q$beg\E"
914 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 896 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
915 qr<$regexp> 897 qr<$regexp>
916 }; 898 };
917 899
918 my $regexp_partial = do { 900 my $regexp_partial = do {
919 my $regexp = "^\Q$text\E(.*)"; 901 my $regexp = "^\Q$text\E(.*)";
920 qr<$regexp> 902 qr<$regexp>
921 }; 903 };
922 904
923 for (keys %{$self->{command}}) { 905 for my $list (values %{ $self->{command_list} }) {
906 for (@$list) {
907 # we only match and score if the first character matches,
908 # so quickly rule out all others first.
909 next unless $first_char = substr $_, 0, 1;
910
924 my @scores; 911 my @scores;
925 912
926 # 1. Complete command [with args] 913 # 1. Complete command [with args]
927 # command is a prefix of the text 914 # command is a prefix of the text
928 # score is length of complete command matched 915 # score is length of complete command matched
929 # e.g. "invoke summon pet monster bat" 916 # e.g. "invoke summon pet monster bat"
930 # "invoke" "summon pet monster bat" = 6 917 # "invoke" "summon pet monster bat" = 6
931 # "invoke summon pet monster" "bat" = 25 918 # "invoke summon pet monster" "bat" = 25
932 if ($text =~ /^\Q$_\E(.*)/) { 919 if ((substr $text, 0, length $_) eq $_) {
933 push @scores, [$_, length $_, $text]; 920 push @scores, [$_, length $_, $text];
921 }
922
923 # 2. Partial command
924 # text is a prefix of the full command
925 # score is the length of the input text
926 # e.g. "invoke s"
927 # "invoke small fireball" = 8
928 # "invoke summon pet monster" = 8
929
930 if ($_ =~ $regexp_partial) {
931 push @scores, [$_, length $text, $_];
932 }
933
934 # 3. Abbreviation match
935 # attempts to use first word of text as an abbreviated command
936 # score is length of word + 1 - 3 per non-word-initial character
937
938 if (my @penalty = $_ =~ $regexp_abbrev) {
939 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
940 }
941
942 # Pick the best option for this command
943 push @match, (sort {
944 $b->[1] <=> $a->[1]
945 } @scores)[0];
934 } 946 }
935
936 # 2. Partial command
937 # text is a prefix of the full command
938 # score is the length of the input text
939 # e.g. "invoke s"
940 # "invoke small fireball" = 8
941 # "invoke summon pet monster" = 8
942
943 if ($_ =~ $regexp_partial) {
944 push @scores, [$_, length $text, $_];
945 }
946
947 # 3. Abbreviation match
948 # attempts to use first word of text as an abbreviated command
949 # score is length of word + 1 - 3 per non-word-initial character
950
951 if (my @penalty = $_ =~ $regexp_abbrev) {
952 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
953 }
954
955 # Pick the best option for this command
956 push @match, (sort {
957 $b->[1] <=> $a->[1]
958 } @scores)[0];
959 } 947 }
960 948
961 # @match is now [command object, command with arguments] 949 # @match is now [command object, command with arguments]
962 @match = map [$self->{command}{$_->[0]}, $_->[2]], 950 @match = map [$self->{command}{$_->[0]}, $_->[2]],
963 sort { 951 sort {

Diff Legend

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