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.102 by root, Sun Apr 1 15:08:14 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::;
14
15sub ::T() { 64 }
13 16
14my $magicmap_tex = 17my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 20
… …
67 ::stop_game (); 70 ::stop_game ();
68 local $::PROFILE->{host} = $server; 71 local $::PROFILE->{host} = $server;
69 ::start_game (); 72 ::start_game ();
70} 73}
71 74
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 { 75sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 76 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 77 or return;
84 78
85 CFPlus::background { 79 CFPlus::background {
86 print "preparing editor startup...\n"; 80 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88 81
89 my $server = $editsup->{gameserver} || "default"; 82 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 83 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91 84
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 85 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; 86 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94 87
95 print "map directory is $mapdir\n"; 88 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n"; 89 print "lib directory is $libdir\n";
97 90
98 require LWP::UserAgent; 91 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 92
107 for my $file (qw(archetypes crossfire.0)) { 93 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file"; 94 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n"; 95 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file"); 96 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 97 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 } 98 }
113 99
114 if (1) { # upload a map 100 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0]; 101 my $mapname = $::CONN->{map_info}[0];
… …
120 106
121 print "getting map revision for $mapname...\n"; 107 print "getting map revision for $mapname...\n";
122 108
123 # try to get the most recent head revision, what a hack, 109 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh* 110 # 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; 111 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126 112
127 if ($log =~ /\?rev=(\d+\.\d+)"/) { 113 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1; 114 my $rev = $1;
129 115
130 print "downloading revision $rev...\n"; 116 print "downloading revision $rev...\n";
131 117
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 118 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133 119
134 my $meta = { 120 my $meta = {
135 %$editsup, 121 %$editsup,
136 path => $mapname, 122 path => $mapname,
137 revision => $rev, 123 revision => $rev,
… …
193 179
194 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
195 $self->grab_focus; 181 $self->grab_focus;
196 return unless $::CONN; 182 return unless $::CONN;
197 183
198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
199 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
200 186
201 $x -= int 0.5 * $self->{sw}; 187 $x -= CFPlus::floor $::MAP->w * 0.5;
202 $y -= int 0.5 * $self->{sh}; 188 $y -= CFPlus::floor $::MAP->h * 0.5;
203 189
190 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
204 $::CONN->lookat ($x, $y) 194 $::CONN->lookat ($x, $y)
205 if $::CONN; 195 }
196 }
206 197
207 } elsif ($ev->{button} == 2) { 198 } elsif ($ev->{button} == 2) {
208 $self->grab_focus; 199 $self->grab_focus;
209 return unless $::CONN; 200 return unless $::CONN;
210 201
… …
297 1 288 1
298} 289}
299 290
300sub size_request { 291sub size_request {
301 ( 292 (
302 32 * CFPlus::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
303 32 * CFPlus::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
304 ) 295 )
305} 296}
306 297
307sub update { 298sub update {
308 my ($self) = @_; 299 my ($self) = @_;
… …
334 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
335 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
336 327
337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
338 329
339 if ($uni == ord "\t") { 330 if ($sym == 9) {
340 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
348 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility; 343 $::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) { 344 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection 345 return 0; # bindings further down need a valid connection
368 346
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
… …
375 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine"); 354 $::CONN->user_send ("examine");
377 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
378 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
379 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
381 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
383 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
385 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
386 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
387 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
388 $self->{completer}->show; 369 $self->{completer}->show;
389 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
390 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
… …
446} 427}
447 428
448sub set_magicmap { 429sub set_magicmap {
449 my ($self, $w, $h, $x, $y, $data) = @_; 430 my ($self, $w, $h, $x, $y, $data) = @_;
450 431
451 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453 434
454 $self->{magicmap} = [$x, $y, $w, $h, $data]; 435 $self->{magicmap} = [$x, $y, $w, $h, $data];
455 436
456 $self->update; 437 $self->update;
457} 438}
… …
466 447
467 return 448 return
468 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
469 450
470 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
472 453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475 459
476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478 462
479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
481 465
482 if ($::CFG->{fow_enable}) { 466 if ($::CFG->{fow_enable}) {
483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 467 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
484 468
485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 469 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); 470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
487 glConvolutionFilter2D ( 471 glConvolutionFilter2D (
488 GL_CONVOLUTION_2D, 472 GL_CONVOLUTION_2D,
… …
510 494
511 glPushMatrix; 495 glPushMatrix;
512 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 498
515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
516 500
517 glScale 32, 32; 501 glScale ::T, ::T;
518 502
519 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
520 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522 506
… …
527 } 511 }
528 512
529 if ($self->{magicmap}) { 513 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531 515
532 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 516 $x += $::MAP->ox + $self->{dx};
533 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 517 $y += $::MAP->oy + $self->{dy};
534 518
535 glTranslate - $x - 1, - $y - 1; 519 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 } 522 }
… …
597 581
598 $::MAP or return; 582 $::MAP or return;
599 583
600 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
601 585
602 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
603 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
604 588
605 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
606 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
607 591
608 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
609 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
610 594
611 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
684 668
685 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
686 (new CFPlus::UI::Menu 670 (new CFPlus::UI::Menu
687 items => [ 671 items => [
688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690 ], 674 ],
691 )->popup ($ev); 675 )->popup ($ev);
692 return 1; 676 return 1;
693 } 677 }
694 0 678 0

Diff Legend

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