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

Diff Legend

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