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

Diff Legend

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