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.113 by elmex, Sat Jul 21 20:30:41 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,
25 26 tilesize => 32,
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 27 @_
33 ); 28 );
34 29
35 $self->{completer} = new CFPlus::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 31 command => $self->{command},
… …
38 ; 33 ;
39 34
40 $self 35 $self
41} 36}
42 37
38sub set_tilesize {
39 my ($self, $tilesize) = @_;
40
41 $self->{tilesize} = $tilesize;
42}
43
43sub add_command { 44sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 46
46 (my $data = $command) =~ s/\\//g; 47 (my $data = $command) =~ s/\\//g;
47 48
… …
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->{ctilesize};
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->{ctilesize};
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
… …
296 285
297 1 286 1
298} 287}
299 288
300sub size_request { 289sub size_request {
290 my ($self) = @_;
291
301 ( 292 (
302 32 * CFPlus::ceil $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
303 32 * CFPlus::ceil $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
304 ) 295 )
305} 296}
306 297
307sub update { 298sub update {
308 my ($self) = @_; 299 my ($self) = @_;
… …
310 $self->{need_update} = 1; 301 $self->{need_update} = 1;
311 $self->SUPER::update; 302 $self->SUPER::update;
312} 303}
313 304
314my %DIR = ( 305my %DIR = (
306 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
315 CFPlus::SDLK_KP8, [1, "north"], 307 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
316 CFPlus::SDLK_KP9, [2, "northeast"], 308 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
317 CFPlus::SDLK_KP6, [3, "east"], 309 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
318 CFPlus::SDLK_KP3, [4, "southeast"], 310 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
319 CFPlus::SDLK_KP2, [5, "south"], 311 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
320 CFPlus::SDLK_KP1, [6, "southwest"], 312 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
321 CFPlus::SDLK_KP4, [7, "west"], 313 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
322 CFPlus::SDLK_KP7, [8, "northwest"], 314 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
323 315
324 CFPlus::SDLK_UP, [1, "north"], 316 ( "," . CFPlus::SDLK_UP ), [1, "north"],
317 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
325 CFPlus::SDLK_RIGHT, [3, "east"], 318 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
319 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
326 CFPlus::SDLK_DOWN, [5, "south"], 320 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
321 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
327 CFPlus::SDLK_LEFT, [7, "west"], 322 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
323 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
328); 324);
329 325
330sub invoke_key_down { 326sub invoke_key_down {
331 my ($self, $ev) = @_; 327 my ($self, $ev) = @_;
332 328
… …
334 my $sym = $ev->{sym}; 330 my $sym = $ev->{sym};
335 my $uni = $ev->{unicode}; 331 my $uni = $ev->{unicode};
336 332
337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 333 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
338 334
339 if ($uni == ord "\t") { 335 if ($sym == 9) {
340 $::PL_WINDOW->toggle_visibility; 336 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 337 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
342 $::HELP_WINDOW->toggle_visibility; 338 $::HELP_WINDOW->toggle_visibility;
343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
344 ::toggle_player_page ($::STATS_PAGE); 340 ::toggle_player_page ($::STATS_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
348 ::toggle_player_page ($::SPELL_PAGE); 344 ::toggle_player_page ($::SPELL_PAGE);
349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
350 ::toggle_player_page ($::INVENTORY_PAGE); 346 ::toggle_player_page ($::INVENTORY_PAGE);
351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
352 $::SETUP_DIALOG->toggle_visibility; 348 $::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) { 349 } elsif (!$::CONN) {
367 return 0; # bindings further down need a valid connection 350 return 0; # bindings further down need a valid connection
368 351
369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
370 $::CONN->user_send ("stay fire");
371 } elsif ($uni == ord ",") { 352 } elsif ($uni == ord ",") {
372 $::CONN->user_send ("take"); 353 $::CONN->user_send ("take");
373 } elsif ($uni == ord " ") { 354 } elsif ($uni == ord " ") {
374 $::CONN->user_send ("apply"); 355 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) { 356 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine"); 357 $::CONN->user_send ("examine");
377 } elsif ($uni == ord ".") { 358 } elsif ($uni == ord ".") {
378 $::CONN->user_send ($self->{completer}{last_command}) 359 $::CONN->user_send ($self->{completer}{last_command})
379 if exists $self->{completer}{last_command}; 360 if exists $self->{completer}{last_command};
380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 361 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
381 $::CONN->user_send ($_) for @$bind_cmd; 362 $::CONN->macro_send ($_) for @macros;
382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 363 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
383 $::CONN->user_send ("rotateshoottype +"); 364 $::CONN->user_send ("rotateshoottype +");
384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 365 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
385 $::CONN->user_send ("rotateshoottype -"); 366 $::CONN->user_send ("rotateshoottype -");
367 } elsif ($uni == ord '!') {
368 $self->{completer}->set_prefix ("shout ");
369 $self->{completer}->show;
386 } elsif ($uni == ord '"') { 370 } elsif ($uni == ord '"') {
387 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 371 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
388 $self->{completer}->show; 372 $self->{completer}->show;
389 } elsif ($uni == ord "'") { 373 } elsif ($uni == ord "'") {
390 $self->{completer}->set_prefix (""); 374 $self->{completer}->set_prefix ("");
391 $self->{completer}->show; 375 $self->{completer}->show;
392 } elsif (exists $DIR{$sym}) { 376 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
393 if ($mod & CFPlus::KMOD_SHIFT) { 377 if ($mod & CFPlus::KMOD_SHIFT) {
394 $self->{shft}++; 378 $self->{shft}++;
395 if ($DIR{$sym}[0] != $self->{fire_dir}) { 379 if ($dir->[0] != $self->{fire_dir}) {
396 $::CONN->user_send ("fire $DIR{$sym}[0]"); 380 $::CONN->user_send ("fire $dir->[0]");
397 } 381 }
398 $self->{fire_dir} = $DIR{$sym}[0]; 382 $self->{fire_dir} = $DIR{$sym}[0];
399 } elsif ($mod & CFPlus::KMOD_CTRL) { 383 } elsif ($mod & CFPlus::KMOD_CTRL) {
400 $self->{ctrl}++; 384 $self->{ctrl}++;
401 $::CONN->user_send ("run $DIR{$sym}[0]"); 385 $::CONN->user_send ("run $dir->[0]");
402 } else { 386 } else {
403 $::CONN->user_send ("$DIR{$sym}[1]"); 387 $::CONN->user_send ("$dir->[1]");
404 } 388 }
405 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 389 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
406 $self->{completer}->inject_key_down ($ev); 390 $self->{completer}->inject_key_down ($ev);
407 $self->{completer}->show; 391 $self->{completer}->show;
408 } else { 392 } else {
… …
443 } 427 }
444 428
445 $res 429 $res
446} 430}
447 431
432sub invoke_visibility_change {
433 my ($self) = @_;
434
435 $self->refresh_hook;
436
437 0
438}
439
448sub set_magicmap { 440sub set_magicmap {
449 my ($self, $w, $h, $x, $y, $data) = @_; 441 my ($self, $w, $h, $x, $y, $data) = @_;
450 442
451 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 443 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
452 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 444 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
453 445
454 $self->{magicmap} = [$x, $y, $w, $h, $data]; 446 $self->{magicmap} = [$x, $y, $w, $h, $data];
455 447
456 $self->update; 448 $self->update;
457} 449}
458 450
459sub draw { 451sub refresh_hook {
460 my ($self) = @_; 452 my ($self) = @_;
461 453
462 return unless $::MAP; 454 return unless $::MAP;
463 455
464 my $focused = $CFPlus::UI::FOCUS == $self
465 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
466
467 return
468 unless $focused || !$::FAST;
469
470 if (delete $self->{need_update}) { 456 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
472 458
459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
460 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
461
473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 462 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 463 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
475 464
476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 465 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 466 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
478 467
479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 468 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 469 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
481 470
482 if ($::CFG->{fow_enable}) { 471 if ($::CFG->{fow_enable}) {
483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
484
485 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);
487 glConvolutionFilter2D (
488 GL_CONVOLUTION_2D,
489 GL_ALPHA,
490 3, 3,
491 GL_ALPHA, GL_FLOAT,
492 (pack "f*", @{ $self->{smooth_matrix} }),
493 );
494 glEnable GL_CONVOLUTION_2D;
495 }
496 473
497 $self->{fow_texture} = new CFPlus::Texture 474 $self->{fow_texture} = new CFPlus::Texture
498 w => $w, 475 w => $w,
499 h => $h, 476 h => $h,
500 data => $data, 477 data => $data,
501 internalformat => GL_ALPHA, 478 internalformat => GL_ALPHA,
502 format => GL_ALPHA; 479 format => GL_ALPHA;
503
504 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
505 } else { 480 } else {
506 delete $self->{fow_texture}; 481 delete $self->{fow_texture};
507 } 482 }
508 483
509 glNewList $self->{list}; 484 glNewList $self->{list};
510 485
511 glPushMatrix; 486 glPushMatrix;
512 glTranslate $sx0, $sy0; 487 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 488 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 489
515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
516 491
517 glScale 32, 32; 492 glScale $self->{tilesize}, $self->{tilesize};
518 493
519 if (my $tex = $self->{fow_texture}) { 494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix;
496 glScale 1/3, 1/3;
520 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
522 499
523 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 500 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
524 $self->{fow_texture}->draw_quad_alpha (0, 0); 501 $self->{fow_texture}->draw_quad_alpha (0, 0);
525 502
526 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
504 glPopMatrix;
527 } 505 }
528 506
529 if ($self->{magicmap}) { 507 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531 509
532 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 510 $x += $::MAP->ox + $self->{dx};
533 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 511 $y += $::MAP->oy + $self->{dy};
534 512
535 glTranslate - $x - 1, - $y - 1; 513 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 514 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 515 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 } 516 }
539 517
540 glPopMatrix; 518 glPopMatrix;
541 glEndList; 519 glEndList;
542 } 520 }
521
522}
523
524sub draw {
525 my ($self) = @_;
526
527 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
528
529 return unless $self->{list};
530
531 my $focused = $CFPlus::UI::FOCUS == $self
532 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
533
534 return
535 unless $focused || !$::FAST;
543 536
544 glCallList $self->{list}; 537 glCallList $self->{list};
545 538
546 # TNT2 emulates logops in software (or worse :) 539 # TNT2 emulates logops in software (or worse :)
547 unless ($focused) { 540 unless ($focused) {
… …
566 $self->SUPER::DESTROY; 559 $self->SUPER::DESTROY;
567} 560}
568 561
569package CFPlus::MapWidget::MapMap; 562package CFPlus::MapWidget::MapMap;
570 563
564use strict;
565use utf8;
566
571our @ISA = CFPlus::UI::Base::; 567our @ISA = CFPlus::UI::Base::;
572 568
573use Time::HiRes qw(time); 569use Time::HiRes qw(time);
574use CFPlus::OpenGL; 570use CFPlus::OpenGL;
575 571
576sub size_request { 572sub size_request {
577 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 573 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
578} 574}
579 575
580sub invoke_size_allocate { 576sub refresh_hook {
581 my ($self, $w, $h) = @_; 577 my ($self) = @_;
582 578
583 $self->update; 579 if ($::MAP && $self->{texture_atime} < time) {
584
585 1
586}
587
588sub update {
589 my ($self) = @_;
590
591 delete $self->{texture_atime};
592 $self->SUPER::update;
593}
594
595sub _draw {
596 my ($self) = @_;
597
598 $::MAP or return;
599
600 my ($w, $h) = @$self{qw(w h)}; 580 my ($w, $h) = @$self{qw(w h)};
601 581
602 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
603 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 583 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
604 584
605 my $sx = int $::CFG->{map_shift_x} / 32;
606 my $sy = int $::CFG->{map_shift_y} / 32;
607
608 my $ox = 0.5 * ($w - $sw); 585 my $ox = 0.5 * ($w - $sw);
609 my $oy = 0.5 * ($h - $sh); 586 my $oy = 0.5 * ($h - $sh);
610 587
611 glEnable GL_BLEND; 588 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
612 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 589 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
613 glEnable GL_TEXTURE_2D;
614 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
615 590
616 if ($self->{texture_atime} < time) { 591 #TODO: map scale is completely borked
592
593 my $x0 = int $ox - $sx + 0.5;
594 my $y0 = int $oy - $sy + 0.5;
595
596 $self->{sw} = $sw;
597 $self->{sh} = $sh;
598
599 $self->{x0} = $x0;
600 $self->{y0} = $y0;
601
617 $self->{texture_atime} = time + 1/3; 602 $self->{texture_atime} = time + 1/3;
618 603
619 $self->{texture} = 604 $self->{texture} =
620 new CFPlus::Texture 605 new CFPlus::Texture
621 w => $w, 606 w => $w,
622 h => $h, 607 h => $h,
623 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 608 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
624 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 609 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625 } 610 }
611}
612
613sub invoke_visibility_change {
614 my ($self) = @_;
615
616 $self->refresh_hook;
617
618 0
619}
620
621sub invoke_size_allocate {
622 my ($self, $w, $h) = @_;
623
624 $self->update;
625
626 1
627}
628
629sub update {
630 my ($self) = @_;
631
632 delete $self->{texture_atime};
633 $self->SUPER::update;
634}
635
636sub _draw {
637 my ($self) = @_;
638
639 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
640
641 $self->{texture} or return;
642
643 glEnable GL_BLEND;
644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
645 glEnable GL_TEXTURE_2D;
646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
626 647
627 $self->{texture}->draw_quad (0, 0); 648 $self->{texture}->draw_quad (0, 0);
628 649
629 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
630 651
631 glTranslate 0.375, 0.375; 652 glTranslate 0.375, 0.375;
632
633 #TODO: map scale is completely borked
634
635 my $x0 = int $ox - $sx + 0.5;
636 my $y0 = int $oy - $sy + 0.5;
637 653
638 glColor 1, 1, 0, 1; 654 glColor 1, 1, 0, 1;
639 glBegin GL_LINE_LOOP; 655 glBegin GL_LINE_LOOP;
640 glVertex $x0 , $y0 ; 656 glVertex $self->{x0} , $self->{y0} ;
641 glVertex $x0 , $y0 + $sh; 657 glVertex $self->{x0} , $self->{y0} + $self->{sh};
642 glVertex $x0 + $sw, $y0 + $sh; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
643 glVertex $x0 + $sw, $y0 ; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
644 glEnd; 660 glEnd;
645 661
646 glDisable GL_BLEND; 662 glDisable GL_BLEND;
647} 663}
648 664
… …
684 700
685 if ($ev->{button} == 3) { 701 if ($ev->{button} == 3) {
686 (new CFPlus::UI::Menu 702 (new CFPlus::UI::Menu
687 items => [ 703 items => [
688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 704 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 705 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
690 ], 706 ],
691 )->popup ($ev); 707 )->popup ($ev);
692 return 1; 708 return 1;
693 } 709 }
694 0 710 0

Diff Legend

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