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

Diff Legend

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