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.107 by root, Sat Apr 14 06:51:45 2007 UTC vs.
Revision 1.112 by root, Fri Jul 20 18:42:45 2007 UTC

… …
22 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
23 z => -1, 23 z => -1,
24 can_focus => 1, 24 can_focus => 1,
25 list => glGenList, 25 list => glGenList,
26 tilesize => 32, 26 tilesize => 32,
27
28 smooth_matrix => [
29 0.05, 0.13, 0.05,
30 0.13, 0.30, 0.13,
31 0.05, 0.13, 0.05,
32 ],
33
34 @_ 27 @_
35 ); 28 );
36 29
37 $self->{completer} = new CFPlus::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
38 command => $self->{command}, 31 command => $self->{command},
… …
308 $self->{need_update} = 1; 301 $self->{need_update} = 1;
309 $self->SUPER::update; 302 $self->SUPER::update;
310} 303}
311 304
312my %DIR = ( 305my %DIR = (
306 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
313 CFPlus::SDLK_KP8, [1, "north"], 307 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
314 CFPlus::SDLK_KP9, [2, "northeast"], 308 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
315 CFPlus::SDLK_KP6, [3, "east"], 309 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
316 CFPlus::SDLK_KP3, [4, "southeast"], 310 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
317 CFPlus::SDLK_KP2, [5, "south"], 311 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
318 CFPlus::SDLK_KP1, [6, "southwest"], 312 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
319 CFPlus::SDLK_KP4, [7, "west"], 313 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
320 CFPlus::SDLK_KP7, [8, "northwest"], 314 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
321 315
322 CFPlus::SDLK_UP, [1, "north"], 316 ( "," . CFPlus::SDLK_UP ), [1, "north"],
317 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
323 CFPlus::SDLK_RIGHT, [3, "east"], 318 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
319 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
324 CFPlus::SDLK_DOWN, [5, "south"], 320 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
321 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
325 CFPlus::SDLK_LEFT, [7, "west"], 322 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
323 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
326); 324);
327 325
328sub invoke_key_down { 326sub invoke_key_down {
329 my ($self, $ev) = @_; 327 my ($self, $ev) = @_;
330 328
… …
349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
350 $::SETUP_DIALOG->toggle_visibility; 348 $::SETUP_DIALOG->toggle_visibility;
351 } elsif (!$::CONN) { 349 } elsif (!$::CONN) {
352 return 0; # bindings further down need a valid connection 350 return 0; # bindings further down need a valid connection
353 351
354 } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) {
355 $::CONN->user_send ("stay fire");
356 } elsif ($uni == ord ",") { 352 } elsif ($uni == ord ",") {
357 $::CONN->user_send ("take"); 353 $::CONN->user_send ("take");
358 } elsif ($uni == ord " ") { 354 } elsif ($uni == ord " ") {
359 $::CONN->user_send ("apply"); 355 $::CONN->user_send ("apply");
360 } elsif ($uni == 13) { 356 } elsif ($uni == 13) {
… …
375 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 371 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
376 $self->{completer}->show; 372 $self->{completer}->show;
377 } elsif ($uni == ord "'") { 373 } elsif ($uni == ord "'") {
378 $self->{completer}->set_prefix (""); 374 $self->{completer}->set_prefix ("");
379 $self->{completer}->show; 375 $self->{completer}->show;
380 } elsif (exists $DIR{$sym}) { 376 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
381 if ($mod & CFPlus::KMOD_SHIFT) { 377 if ($mod & CFPlus::KMOD_SHIFT) {
382 $self->{shft}++; 378 $self->{shft}++;
383 if ($DIR{$sym}[0] != $self->{fire_dir}) { 379 if ($dir->[0] != $self->{fire_dir}) {
384 $::CONN->user_send ("fire $DIR{$sym}[0]"); 380 $::CONN->user_send ("fire $dir->[0]");
385 } 381 }
386 $self->{fire_dir} = $DIR{$sym}[0]; 382 $self->{fire_dir} = $DIR{$sym}[0];
387 } elsif ($mod & CFPlus::KMOD_CTRL) { 383 } elsif ($mod & CFPlus::KMOD_CTRL) {
388 $self->{ctrl}++; 384 $self->{ctrl}++;
389 $::CONN->user_send ("run $DIR{$sym}[0]"); 385 $::CONN->user_send ("run $dir->[0]");
390 } else { 386 } else {
391 $::CONN->user_send ("$DIR{$sym}[1]"); 387 $::CONN->user_send ("$dir->[1]");
392 } 388 }
393 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 389 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
394 $self->{completer}->inject_key_down ($ev); 390 $self->{completer}->inject_key_down ($ev);
395 $self->{completer}->show; 391 $self->{completer}->show;
396 } else { 392 } else {
… …
431 } 427 }
432 428
433 $res 429 $res
434} 430}
435 431
432sub invoke_visibility_change {
433 my ($self) = @_;
434
435 $self->refresh_hook;
436
437 0
438}
439
436sub set_magicmap { 440sub set_magicmap {
437 my ($self, $w, $h, $x, $y, $data) = @_; 441 my ($self, $w, $h, $x, $y, $data) = @_;
438 442
439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 443 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 444 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
442 $self->{magicmap} = [$x, $y, $w, $h, $data]; 446 $self->{magicmap} = [$x, $y, $w, $h, $data];
443 447
444 $self->update; 448 $self->update;
445} 449}
446 450
447sub draw { 451sub refresh_hook {
448 my ($self) = @_; 452 my ($self) = @_;
449 453
450 return unless $::MAP; 454 return unless $::MAP;
451
452 my $focused = $CFPlus::UI::FOCUS == $self
453 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
454
455 return
456 unless $focused || !$::FAST;
457 455
458 if (delete $self->{need_update}) { 456 if (delete $self->{need_update}) {
459 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
460 458
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
… …
470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 468 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 469 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
472 470
473 if ($::CFG->{fow_enable}) { 471 if ($::CFG->{fow_enable}) {
474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
475
476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
478 glConvolutionFilter2D (
479 GL_CONVOLUTION_2D,
480 GL_ALPHA,
481 3, 3,
482 GL_ALPHA, GL_FLOAT,
483 (pack "f*", @{ $self->{smooth_matrix} }),
484 );
485 glEnable GL_CONVOLUTION_2D;
486 }
487 473
488 $self->{fow_texture} = new CFPlus::Texture 474 $self->{fow_texture} = new CFPlus::Texture
489 w => $w, 475 w => $w,
490 h => $h, 476 h => $h,
491 data => $data, 477 data => $data,
492 internalformat => GL_ALPHA, 478 internalformat => GL_ALPHA,
493 format => GL_ALPHA; 479 format => GL_ALPHA;
494
495 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496 } else { 480 } else {
497 delete $self->{fow_texture}; 481 delete $self->{fow_texture};
498 } 482 }
499 483
500 glNewList $self->{list}; 484 glNewList $self->{list};
… …
506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
507 491
508 glScale $self->{tilesize}, $self->{tilesize}; 492 glScale $self->{tilesize}, $self->{tilesize};
509 493
510 if (my $tex = $self->{fow_texture}) { 494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix;
496 glScale 1/3, 1/3;
511 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513 499
514 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 500 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515 $self->{fow_texture}->draw_quad_alpha (0, 0); 501 $self->{fow_texture}->draw_quad_alpha (0, 0);
516 502
517 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
504 glPopMatrix;
518 } 505 }
519 506
520 if ($self->{magicmap}) { 507 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522 509
… …
529 } 516 }
530 517
531 glPopMatrix; 518 glPopMatrix;
532 glEndList; 519 glEndList;
533 } 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;
534 536
535 glCallList $self->{list}; 537 glCallList $self->{list};
536 538
537 # TNT2 emulates logops in software (or worse :) 539 # TNT2 emulates logops in software (or worse :)
538 unless ($focused) { 540 unless ($focused) {
… …
566 568
567use Time::HiRes qw(time); 569use Time::HiRes qw(time);
568use CFPlus::OpenGL; 570use CFPlus::OpenGL;
569 571
570sub size_request { 572sub size_request {
571 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 573 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
572} 574}
573 575
574sub invoke_size_allocate { 576sub refresh_hook {
575 my ($self, $w, $h) = @_; 577 my ($self) = @_;
576 578
577 $self->update; 579 if ($::MAP && $self->{texture_atime} < time) {
578
579 1
580}
581
582sub update {
583 my ($self) = @_;
584
585 delete $self->{texture_atime};
586 $self->SUPER::update;
587}
588
589sub _draw {
590 my ($self) = @_;
591
592 $::MAP or return;
593
594 my ($w, $h) = @$self{qw(w h)}; 580 my ($w, $h) = @$self{qw(w h)};
595 581
596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 582 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 583 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
598 584
585 my $ox = 0.5 * ($w - $sw);
586 my $oy = 0.5 * ($h - $sh);
587
599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; 588 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; 589 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
601 590
602 my $ox = 0.5 * ($w - $sw); 591 #TODO: map scale is completely borked
603 my $oy = 0.5 * ($h - $sh);
604 592
605 glEnable GL_BLEND; 593 my $x0 = int $ox - $sx + 0.5;
606 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 my $y0 = int $oy - $sy + 0.5;
607 glEnable GL_TEXTURE_2D;
608 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
609 595
610 if ($self->{texture_atime} < time) { 596 $self->{sw} = $sw;
597 $self->{sh} = $sh;
598
599 $self->{x0} = $x0;
600 $self->{y0} = $y0;
601
611 $self->{texture_atime} = time + 1/3; 602 $self->{texture_atime} = time + 1/3;
612 603
613 $self->{texture} = 604 $self->{texture} =
614 new CFPlus::Texture 605 new CFPlus::Texture
615 w => $w, 606 w => $w,
616 h => $h, 607 h => $h,
617 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 608 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
618 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;
619 } 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;
620 647
621 $self->{texture}->draw_quad (0, 0); 648 $self->{texture}->draw_quad (0, 0);
622 649
623 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
624 651
625 glTranslate 0.375, 0.375; 652 glTranslate 0.375, 0.375;
626
627 #TODO: map scale is completely borked
628
629 my $x0 = int $ox - $sx + 0.5;
630 my $y0 = int $oy - $sy + 0.5;
631 653
632 glColor 1, 1, 0, 1; 654 glColor 1, 1, 0, 1;
633 glBegin GL_LINE_LOOP; 655 glBegin GL_LINE_LOOP;
634 glVertex $x0 , $y0 ; 656 glVertex $self->{x0} , $self->{y0} ;
635 glVertex $x0 , $y0 + $sh; 657 glVertex $self->{x0} , $self->{y0} + $self->{sh};
636 glVertex $x0 + $sw, $y0 + $sh; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
637 glVertex $x0 + $sw, $y0 ; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
638 glEnd; 660 glEnd;
639 661
640 glDisable GL_BLEND; 662 glDisable GL_BLEND;
641} 663}
642 664

Diff Legend

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