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.89 by root, Wed Oct 18 12:53:46 2006 UTC vs.
Revision 1.97 by root, Sat Dec 9 22:28:11 2006 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",
… …
67 ::stop_game (); 68 ::stop_game ();
68 local $::PROFILE->{host} = $server; 69 local $::PROFILE->{host} = $server;
69 ::start_game (); 70 ::start_game ();
70} 71}
71 72
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 { 73sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 74 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 75 or return;
84 76
85 CFPlus::background { 77 CFPlus::background {
86 print "preparing editor startup...\n"; 78 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88 79
89 my $server = $editsup->{gameserver} || "default"; 80 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91 82
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 83 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; 84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94 85
95 print "map directory is $mapdir\n"; 86 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n"; 87 print "lib directory is $libdir\n";
97 88
98 require LWP::UserAgent; 89 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 90
107 for my $file (qw(archetypes crossfire.0)) { 91 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file"; 92 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n"; 93 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file"); 94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 } 96 }
113 97
114 if (1) { # upload a map 98 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0]; 99 my $mapname = $::CONN->{map_info}[0];
… …
120 104
121 print "getting map revision for $mapname...\n"; 105 print "getting map revision for $mapname...\n";
122 106
123 # try to get the most recent head revision, what a hack, 107 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh* 108 # 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; 109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126 110
127 if ($log =~ /\?rev=(\d+\.\d+)"/) { 111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1; 112 my $rev = $1;
129 113
130 print "downloading revision $rev...\n"; 114 print "downloading revision $rev...\n";
131 115
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133 117
134 my $meta = { 118 my $meta = {
135 %$editsup, 119 %$editsup,
136 path => $mapname, 120 path => $mapname,
137 revision => $rev, 121 revision => $rev,
… …
193 177
194 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
195 $self->grab_focus; 179 $self->grab_focus;
196 return unless $::CONN; 180 return unless $::CONN;
197 181
198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 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}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
200 184
201 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
202 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
203 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
204 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
205 if $::CONN; 193 }
194 }
206 195
207 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
208 $self->grab_focus; 197 $self->grab_focus;
209 return unless $::CONN; 198 return unless $::CONN;
210 199
… …
236 : "Enable automatic pickup", 225 : "Enable automatic pickup",
237 sub { $::PICKUP_ENABLE->toggle } 226 sub { $::PICKUP_ENABLE->toggle }
238 ], 227 ],
239 ); 228 );
240 229
241 if ($::CONN && $::CONN->{editor_support} && 0) { 230 if ($::CONN && $::CONN->{editor_support}) {
242 push @items, [ 231 push @items, [
243 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 232 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
244 \&editor_invoke, 233 \&editor_invoke,
245 ]; 234 ];
246 235
… …
348 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility; 341 $::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) { 342 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
368 344
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
… …
375 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine"); 352 $::CONN->user_send ("examine");
377 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
378 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
379 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 warn "<@macros>\n";#d#
381 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
383 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
385 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
386 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
… …
446} 423}
447 424
448sub set_magicmap { 425sub set_magicmap {
449 my ($self, $w, $h, $x, $y, $data) = @_; 426 my ($self, $w, $h, $x, $y, $data) = @_;
450 427
451 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453 430
454 $self->{magicmap} = [$x, $y, $w, $h, $data]; 431 $self->{magicmap} = [$x, $y, $w, $h, $data];
455 432
456 $self->update; 433 $self->update;
457} 434}
… …
468 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
469 446
470 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
472 449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475 455
476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478 458
479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
481 461
482 if ($::CFG->{fow_enable}) { 462 if ($::CFG->{fow_enable}) {
483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 463 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
484 464
485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 465 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); 466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
487 glConvolutionFilter2D ( 467 glConvolutionFilter2D (
488 GL_CONVOLUTION_2D, 468 GL_CONVOLUTION_2D,
… …
510 490
511 glPushMatrix; 491 glPushMatrix;
512 glTranslate $sx0, $sy0; 492 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 494
515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 495 $::MAP->draw ($dx, $dy, $sw, $sh);
516 496
517 glScale 32, 32; 497 glScale 32, 32;
518 498
519 if (my $tex = $self->{fow_texture}) { 499 if (my $tex = $self->{fow_texture}) {
520 glEnable GL_TEXTURE_2D; 500 glEnable GL_TEXTURE_2D;
… …
527 } 507 }
528 508
529 if ($self->{magicmap}) { 509 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531 511
532 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 512 $x += $::MAP->ox + $self->{dx};
533 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 513 $y += $::MAP->oy + $self->{dy};
534 514
535 glTranslate - $x - 1, - $y - 1; 515 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 } 518 }
… …
684 664
685 if ($ev->{button} == 3) { 665 if ($ev->{button} == 3) {
686 (new CFPlus::UI::Menu 666 (new CFPlus::UI::Menu
687 items => [ 667 items => [
688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690 ], 670 ],
691 )->popup ($ev); 671 )->popup ($ev);
692 return 1; 672 return 1;
693 } 673 }
694 0 674 0

Diff Legend

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