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.88 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
25 27
26 smooth_matrix => [ 28 smooth_matrix => [
27 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
38 ; 40 ;
39 41
40 $self 42 $self
41} 43}
42 44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
49}
50
43sub add_command { 51sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 53
46 (my $data = $command) =~ s/\\//g; 54 (my $data = $command) =~ s/\\//g;
47 55
… …
67 ::stop_game (); 75 ::stop_game ();
68 local $::PROFILE->{host} = $server; 76 local $::PROFILE->{host} = $server;
69 ::start_game (); 77 ::start_game ();
70} 78}
71 79
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 80sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 81 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 82 or return;
84 83
85 CFPlus::background { 84 CFPlus::background {
86 print "preparing editor startup...\n"; 85 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88 86
89 my $server = $editsup->{gameserver} || "default"; 87 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 88 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91 89
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 90 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
93 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 91 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94 92
95 print "map directory is $mapdir\n"; 93 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n"; 94 print "lib directory is $libdir\n";
97 95
98 require LWP::UserAgent; 96 my $ua = CFPlus::lwp_useragent;
99
100 my $ua = LWP::UserAgent->new (
101 agent => "cfplus $CFPlus::VERSION",
102 keep_alive => 1,
103 env_proxy => 1,
104 timeout => 30,
105 );
106 97
107 for my $file (qw(archetypes crossfire.0)) { 98 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file"; 99 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n"; 100 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file"); 101 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 102 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 } 103 }
113 104
114 if (1) { # upload a map 105 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0]; 106 my $mapname = $::CONN->{map_info}[0];
… …
120 111
121 print "getting map revision for $mapname...\n"; 112 print "getting map revision for $mapname...\n";
122 113
123 # try to get the most recent head revision, what a hack, 114 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh* 115 # this should have been returned while downloading *sigh*
125 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 116 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126 117
127 if ($log =~ /\?rev=(\d+\.\d+)"/) { 118 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1; 119 my $rev = $1;
129 120
130 print "downloading revision $rev...\n"; 121 print "downloading revision $rev...\n";
131 122
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 123 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133 124
134 my $meta = { 125 my $meta = {
135 %$editsup, 126 %$editsup,
136 path => $mapname, 127 path => $mapname,
137 revision => $rev, 128 revision => $rev,
… …
193 184
194 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
195 $self->grab_focus; 186 $self->grab_focus;
196 return unless $::CONN; 187 return unless $::CONN;
197 188
198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
199 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
200 191
201 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
202 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
203 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
204 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
205 if $::CONN; 200 }
201 }
206 202
207 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
208 $self->grab_focus; 204 $self->grab_focus;
209 return unless $::CONN; 205 return unless $::CONN;
210 206
… …
296 292
297 1 293 1
298} 294}
299 295
300sub size_request { 296sub size_request {
297 my ($self) = @_;
298
301 ( 299 (
302 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
303 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
304 ) 302 )
305} 303}
306 304
307sub update { 305sub update {
308 my ($self) = @_; 306 my ($self) = @_;
… …
334 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
335 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
336 334
337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
338 336
339 if ($uni == ord "\t") { 337 if ($sym == 9) {
340 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
348 ::toggle_player_page ($::SPELL_PAGE); 346 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE); 348 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility; 350 $::SETUP_DIALOG->toggle_visibility;
353 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
354 $::BIND_EDITOR->set_binding (undef, undef, [],
355 sub {
356 my ($mod, $sym, $cmds) = @_;
357 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
358 });
359 $::BIND_EDITOR->start;
360 $::BIND_EDITOR->show;
361#TODO: elmex, what was this supposed to do? it currently crashes the client.
362# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
363# $::BIND_EDITOR->stop;
364# $::BIND_EDITOR->ask_for_bind_and_commit;
365# $::BIND_EDITOR->hide;
366 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
368 353
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) {
370 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
371 } elsif ($uni == ord ",") { 356 } elsif ($uni == ord ",") {
372 $::CONN->user_send ("take"); 357 $::CONN->user_send ("take");
373 } elsif ($uni == ord " ") { 358 } elsif ($uni == ord " ") {
374 $::CONN->user_send ("apply"); 359 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) { 360 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine"); 361 $::CONN->user_send ("examine");
377 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
378 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
379 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
381 $::CONN->user_send ($_) for @$bind_cmd; 366 $::CONN->macro_send ($_) for @macros;
382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
383 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
385 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
386 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
387 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
388 $self->{completer}->show; 376 $self->{completer}->show;
389 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
390 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
446} 434}
447 435
448sub set_magicmap { 436sub set_magicmap {
449 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
450 438
451 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453 441
454 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
455 443
456 $self->update; 444 $self->update;
457} 445}
… …
466 454
467 return 455 return
468 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
469 457
470 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
472 460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475 466
476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478 469
479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
481 472
482 if ($::CFG->{fow_enable}) { 473 if ($::CFG->{fow_enable}) {
483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
484 475
485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
486 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
487 glConvolutionFilter2D ( 478 glConvolutionFilter2D (
488 GL_CONVOLUTION_2D, 479 GL_CONVOLUTION_2D,
… …
510 501
511 glPushMatrix; 502 glPushMatrix;
512 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 505
515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
516 507
517 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
518 509
519 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
520 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522 513
… …
527 } 518 }
528 519
529 if ($self->{magicmap}) { 520 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531 522
532 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 523 $x += $::MAP->ox + $self->{dx};
533 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 524 $y += $::MAP->oy + $self->{dy};
534 525
535 glTranslate - $x - 1, - $y - 1; 526 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 } 529 }
… …
566 $self->SUPER::DESTROY; 557 $self->SUPER::DESTROY;
567} 558}
568 559
569package CFPlus::MapWidget::MapMap; 560package CFPlus::MapWidget::MapMap;
570 561
562use strict;
563use utf8;
564
571our @ISA = CFPlus::UI::Base::; 565our @ISA = CFPlus::UI::Base::;
572 566
573use Time::HiRes qw(time); 567use Time::HiRes qw(time);
574use CFPlus::OpenGL; 568use CFPlus::OpenGL;
575 569
… …
597 591
598 $::MAP or return; 592 $::MAP or return;
599 593
600 my ($w, $h) = @$self{qw(w h)}; 594 my ($w, $h) = @$self{qw(w h)};
601 595
602 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
603 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
604 598
605 my $sx = int $::CFG->{map_shift_x} / 32; 599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
606 my $sy = int $::CFG->{map_shift_y} / 32; 600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
607 601
608 my $ox = 0.5 * ($w - $sw); 602 my $ox = 0.5 * ($w - $sw);
609 my $oy = 0.5 * ($h - $sh); 603 my $oy = 0.5 * ($h - $sh);
610 604
611 glEnable GL_BLEND; 605 glEnable GL_BLEND;
… …
684 678
685 if ($ev->{button} == 3) { 679 if ($ev->{button} == 3) {
686 (new CFPlus::UI::Menu 680 (new CFPlus::UI::Menu
687 items => [ 681 items => [
688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 682 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 683 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690 ], 684 ],
691 )->popup ($ev); 685 )->popup ($ev);
692 return 1; 686 return 1;
693 } 687 }
694 0 688 0

Diff Legend

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