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.104 by root, Wed Apr 4 02:43:29 2007 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 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},
… …
184 177
185 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
186 $self->grab_focus; 179 $self->grab_focus;
187 return unless $::CONN; 180 return unless $::CONN;
188 181
189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
191 184
192 $x -= CFPlus::floor $::MAP->w * 0.5; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
193 $y -= CFPlus::floor $::MAP->h * 0.5; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
194 187
195 if ($::CONN) { 188 if ($::CONN) {
… …
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"],
… …
349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
350 $::SETUP_DIALOG->toggle_visibility; 344 $::SETUP_DIALOG->toggle_visibility;
351 } elsif (!$::CONN) { 345 } elsif (!$::CONN) {
352 return 0; # bindings further down need a valid connection 346 return 0; # bindings further down need a valid connection
353 347
354 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
355 $::CONN->user_send ("stay fire");
356 } elsif ($uni == ord ",") { 348 } elsif ($uni == ord ",") {
357 $::CONN->user_send ("take"); 349 $::CONN->user_send ("take");
358 } elsif ($uni == ord " ") { 350 } elsif ($uni == ord " ") {
359 $::CONN->user_send ("apply"); 351 $::CONN->user_send ("apply");
360 } elsif ($uni == 13) { 352 } elsif ($uni == 13) {
… …
431 } 423 }
432 424
433 $res 425 $res
434} 426}
435 427
428sub invoke_visibility_change {
429 my ($self) = @_;
430
431 $self->refresh_hook;
432
433 0
434}
435
436sub set_magicmap { 436sub set_magicmap {
437 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
438 438
439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
442 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
443 443
444 $self->update; 444 $self->update;
445} 445}
446 446
447sub draw { 447sub refresh_hook {
448 my ($self) = @_; 448 my ($self) = @_;
449 449
450 return unless $::MAP; 450 return unless $::MAP;
451 451
452 my $focused = $CFPlus::UI::FOCUS == $self
453 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
454
455 return
456 unless $focused || !$::FAST;
457
458 if (delete $self->{need_update}) { 452 if (delete $self->{need_update}) {
459 my $tilesize = $self->{tilesize} = int $self->{tilesize} * $::CFG->{map_scale}; 453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
460 454
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463 457
464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 464 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; 465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
472 466
473 if ($::CFG->{fow_enable}) { 467 if ($::CFG->{fow_enable}) {
474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 468 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 469
488 $self->{fow_texture} = new CFPlus::Texture 470 $self->{fow_texture} = new CFPlus::Texture
489 w => $w, 471 w => $w,
490 h => $h, 472 h => $h,
491 data => $data, 473 data => $data,
492 internalformat => GL_ALPHA, 474 internalformat => GL_ALPHA,
493 format => GL_ALPHA; 475 format => GL_ALPHA;
494
495 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496 } else { 476 } else {
497 delete $self->{fow_texture}; 477 delete $self->{fow_texture};
498 } 478 }
499 479
500 glNewList $self->{list}; 480 glNewList $self->{list};
… …
506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
507 487
508 glScale $self->{tilesize}, $self->{tilesize}; 488 glScale $self->{tilesize}, $self->{tilesize};
509 489
510 if (my $tex = $self->{fow_texture}) { 490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
511 glEnable GL_TEXTURE_2D; 493 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513 495
514 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515 $self->{fow_texture}->draw_quad_alpha (0, 0); 497 $self->{fow_texture}->draw_quad_alpha (0, 0);
516 498
517 glDisable GL_TEXTURE_2D; 499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
518 } 501 }
519 502
520 if ($self->{magicmap}) { 503 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522 505
… …
529 } 512 }
530 513
531 glPopMatrix; 514 glPopMatrix;
532 glEndList; 515 glEndList;
533 } 516 }
517
518}
519
520sub draw {
521 my ($self) = @_;
522
523 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
524
525 return unless $self->{list};
526
527 my $focused = $CFPlus::UI::FOCUS == $self
528 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
529
530 return
531 unless $focused || !$::FAST;
534 532
535 glCallList $self->{list}; 533 glCallList $self->{list};
536 534
537 # TNT2 emulates logops in software (or worse :) 535 # TNT2 emulates logops in software (or worse :)
538 unless ($focused) { 536 unless ($focused) {
… …
557 $self->SUPER::DESTROY; 555 $self->SUPER::DESTROY;
558} 556}
559 557
560package CFPlus::MapWidget::MapMap; 558package CFPlus::MapWidget::MapMap;
561 559
560use strict;
561use utf8;
562
562our @ISA = CFPlus::UI::Base::; 563our @ISA = CFPlus::UI::Base::;
563 564
564use Time::HiRes qw(time); 565use Time::HiRes qw(time);
565use CFPlus::OpenGL; 566use CFPlus::OpenGL;
566 567
567sub size_request { 568sub size_request {
568 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 569 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
569} 570}
570 571
571sub invoke_size_allocate { 572sub refresh_hook {
572 my ($self, $w, $h) = @_; 573 my ($self) = @_;
573 574
574 $self->update; 575 if ($::MAP && $self->{texture_atime} < time) {
575
576 1
577}
578
579sub update {
580 my ($self) = @_;
581
582 delete $self->{texture_atime};
583 $self->SUPER::update;
584}
585
586sub _draw {
587 my ($self) = @_;
588
589 $::MAP or return;
590
591 my ($w, $h) = @$self{qw(w h)}; 576 my ($w, $h) = @$self{qw(w h)};
592 577
593 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 578 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
594 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 579 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
595 580
581 my $ox = 0.5 * ($w - $sw);
582 my $oy = 0.5 * ($h - $sh);
583
596 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; 584 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
597 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; 585 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
598 586
599 my $ox = 0.5 * ($w - $sw); 587 #TODO: map scale is completely borked
600 my $oy = 0.5 * ($h - $sh);
601 588
602 glEnable GL_BLEND; 589 my $x0 = int $ox - $sx + 0.5;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 590 my $y0 = int $oy - $sy + 0.5;
604 glEnable GL_TEXTURE_2D;
605 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
606 591
607 if ($self->{texture_atime} < time) { 592 $self->{sw} = $sw;
593 $self->{sh} = $sh;
594
595 $self->{x0} = $x0;
596 $self->{y0} = $y0;
597
608 $self->{texture_atime} = time + 1/3; 598 $self->{texture_atime} = time + 1/3;
609 599
610 $self->{texture} = 600 $self->{texture} =
611 new CFPlus::Texture 601 new CFPlus::Texture
612 w => $w, 602 w => $w,
613 h => $h, 603 h => $h,
614 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 604 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
615 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 605 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
616 } 606 }
607}
608
609sub invoke_visibility_change {
610 my ($self) = @_;
611
612 $self->refresh_hook;
613
614 0
615}
616
617sub invoke_size_allocate {
618 my ($self, $w, $h) = @_;
619
620 $self->update;
621
622 1
623}
624
625sub update {
626 my ($self) = @_;
627
628 delete $self->{texture_atime};
629 $self->SUPER::update;
630}
631
632sub _draw {
633 my ($self) = @_;
634
635 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
636
637 $self->{texture} or return;
638
639 glEnable GL_BLEND;
640 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
641 glEnable GL_TEXTURE_2D;
642 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
617 643
618 $self->{texture}->draw_quad (0, 0); 644 $self->{texture}->draw_quad (0, 0);
619 645
620 glDisable GL_TEXTURE_2D; 646 glDisable GL_TEXTURE_2D;
621 647
622 glTranslate 0.375, 0.375; 648 glTranslate 0.375, 0.375;
623
624 #TODO: map scale is completely borked
625
626 my $x0 = int $ox - $sx + 0.5;
627 my $y0 = int $oy - $sy + 0.5;
628 649
629 glColor 1, 1, 0, 1; 650 glColor 1, 1, 0, 1;
630 glBegin GL_LINE_LOOP; 651 glBegin GL_LINE_LOOP;
631 glVertex $x0 , $y0 ; 652 glVertex $self->{x0} , $self->{y0} ;
632 glVertex $x0 , $y0 + $sh; 653 glVertex $self->{x0} , $self->{y0} + $self->{sh};
633 glVertex $x0 + $sw, $y0 + $sh; 654 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
634 glVertex $x0 + $sw, $y0 ; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
635 glEnd; 656 glEnd;
636 657
637 glDisable GL_BLEND; 658 glDisable GL_BLEND;
638} 659}
639 660

Diff Legend

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