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.109 by root, Tue Jul 17 17:39:07 2007 UTC vs.
Revision 1.117 by root, Fri Aug 10 04:02:13 2007 UTC

… …
20 my $class = shift; 20 my $class = shift;
21 21
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,
26 tilesize => 32, 25 tilesize => 32,
27
28 smooth_matrix => [
29 0.30, 0.50, 0.30,
30 0.50, 0.50, 0.50,
31 0.30, 0.50, 0.30,
32 ],
33
34 @_ 26 @_
35 ); 27 );
36 28
37 $self->{completer} = new CFPlus::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
38 command => $self->{command}, 30 command => $self->{command},
… …
191 183
192 $x -= CFPlus::floor $::MAP->w * 0.5; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
193 $y -= CFPlus::floor $::MAP->h * 0.5; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
194 186
195 if ($::CONN) { 187 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
199 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
200 }
201 } 189 }
202 190
203 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
204 $self->grab_focus; 192 $self->grab_focus;
205 return unless $::CONN; 193 return unless $::CONN;
… …
308 $self->{need_update} = 1; 296 $self->{need_update} = 1;
309 $self->SUPER::update; 297 $self->SUPER::update;
310} 298}
311 299
312my %DIR = ( 300my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"], 301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
314 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
315 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
316 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
317 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
318 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
319 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
320 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
321 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
322 310
323 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
324 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
325 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
326 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
327); 319);
328 320
329sub invoke_key_down { 321sub invoke_key_down {
330 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
331 323
… …
334 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
335 327
336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
337 329
338 if ($sym == 9) { 330 if ($sym == 9) {
339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
341 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
343 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
374 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
375 $self->{completer}->show; 367 $self->{completer}->show;
376 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
377 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
378 $self->{completer}->show; 370 $self->{completer}->show;
379 } elsif (exists $DIR{$sym}) { 371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
380 if ($mod & CFPlus::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
381 $self->{shft}++; 373 $self->{shft}++;
382 if ($DIR{$sym}[0] != $self->{fire_dir}) { 374 if ($dir->[0] != $self->{fire_dir}) {
383 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $dir->[0]");
384 } 376 }
385 $self->{fire_dir} = $DIR{$sym}[0]; 377 $self->{fire_dir} = $DIR{$sym}[0];
386 } elsif ($mod & CFPlus::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
387 $self->{ctrl}++; 379 $self->{ctrl}++;
388 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $dir->[0]");
389 } else { 381 } else {
390 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$dir->[1]");
391 } 383 }
392 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
393 $self->{completer}->inject_key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
394 $self->{completer}->show; 386 $self->{completer}->show;
395 } else { 387 } else {
… …
430 } 422 }
431 423
432 $res 424 $res
433} 425}
434 426
427sub invoke_visibility_change {
428 my ($self) = @_;
429
430 $self->refresh_hook;
431
432 0
433}
434
435sub set_magicmap { 435sub set_magicmap {
436 my ($self, $w, $h, $x, $y, $data) = @_; 436 my ($self, $w, $h, $x, $y, $data) = @_;
437 437
438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
441 $self->{magicmap} = [$x, $y, $w, $h, $data]; 441 $self->{magicmap} = [$x, $y, $w, $h, $data];
442 442
443 $self->update; 443 $self->update;
444} 444}
445 445
446sub refresh_hook {
447 my ($self) = @_;
448
449 if ($::MAP && $::CONN) {
450 if (delete $self->{need_update}) {
451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
452
453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
455
456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
458
459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
461
462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
464
465 if ($::CFG->{fow_enable}) {
466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
467
468 $self->{fow_texture} = new CFPlus::Texture
469 w => $w,
470 h => $h,
471 data => $data,
472 internalformat => GL_ALPHA,
473 format => GL_ALPHA;
474 } else {
475 delete $self->{fow_texture};
476 }
477
478 glNewList ($self->{list} ||= glGenList);
479
480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485
486 glScale $self->{tilesize}, $self->{tilesize};
487
488 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix;
490 glScale 1/3, 1/3;
491 glEnable GL_TEXTURE_2D;
492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
493
494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
495 $self->{fow_texture}->draw_quad_alpha (0, 0);
496
497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
499 }
500
501 if ($self->{magicmap}) {
502 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
503
504 $x += $::MAP->ox + $self->{dx};
505 $y += $::MAP->oy + $self->{dy};
506
507 glTranslate - $x - 1, - $y - 1;
508 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
509 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510 }
511
512 glPopMatrix;
513 glEndList;
514 }
515 } else {
516 glDeleteList delete $self->{list}
517 if $self->{list};
518 }
519}
520
446sub draw { 521sub draw {
447 my ($self) = @_; 522 my ($self) = @_;
448 523
449 return unless $::MAP; 524 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
525
526 return unless $self->{list};
450 527
451 my $focused = $CFPlus::UI::FOCUS == $self 528 my $focused = $CFPlus::UI::FOCUS == $self
452 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 529 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
453 530
454 return 531 return
455 unless $focused || !$::FAST; 532 unless $focused || !$::FAST;
456
457 if (delete $self->{need_update}) {
458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
459
460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
462
463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
464 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
465
466 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
467 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
468
469 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;
471
472 if ($::CFG->{fow_enable}) {
473 my ($w, $h, $data) = $::MAP->fow_texture (
474 $dx, $dy, $sw, $sh,
475 $::CFG->{fow_smooth},
476 pack "f*", @{ $self->{smooth_matrix} },
477 );
478
479 $self->{fow_texture} = new CFPlus::Texture
480 w => $w,
481 h => $h,
482 data => $data,
483 internalformat => GL_ALPHA,
484 format => GL_ALPHA;
485 } else {
486 delete $self->{fow_texture};
487 }
488
489 glNewList $self->{list};
490
491 glPushMatrix;
492 glTranslate $sx0, $sy0;
493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
494
495 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
496
497 glScale $self->{tilesize}, $self->{tilesize};
498
499 if (my $tex = $self->{fow_texture}) {
500 glPushMatrix;
501 #glScale 1/3, 1/3 if $::CFG->{fow_smooth};
502 glEnable GL_TEXTURE_2D;
503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
504
505 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
506 $self->{fow_texture}->draw_quad_alpha (0, 0);
507
508 glDisable GL_TEXTURE_2D;
509 glPopMatrix;
510 }
511
512 if ($self->{magicmap}) {
513 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
514
515 $x += $::MAP->ox + $self->{dx};
516 $y += $::MAP->oy + $self->{dy};
517
518 glTranslate - $x - 1, - $y - 1;
519 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
520 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
521 }
522
523 glPopMatrix;
524 glEndList;
525 }
526 533
527 glCallList $self->{list}; 534 glCallList $self->{list};
528 535
529 # TNT2 emulates logops in software (or worse :) 536 # TNT2 emulates logops in software (or worse :)
530 unless ($focused) { 537 unless ($focused) {
… …
558 565
559use Time::HiRes qw(time); 566use Time::HiRes qw(time);
560use CFPlus::OpenGL; 567use CFPlus::OpenGL;
561 568
562sub size_request { 569sub size_request {
563 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 570 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
564} 571}
565 572
566sub invoke_size_allocate { 573sub refresh_hook {
567 my ($self, $w, $h) = @_; 574 my ($self) = @_;
568 575
569 $self->update; 576 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)}; 577 my ($w, $h) = @$self{qw(w h)};
587 578
588 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 579 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
589 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 580 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
590 581
582 my $ox = 0.5 * ($w - $sw);
583 my $oy = 0.5 * ($h - $sh);
584
591 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; 585 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
592 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; 586 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
593 587
594 my $ox = 0.5 * ($w - $sw); 588 #TODO: map scale is completely borked
595 my $oy = 0.5 * ($h - $sh);
596 589
597 glEnable GL_BLEND; 590 my $x0 = int $ox - $sx + 0.5;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 591 my $y0 = int $oy - $sy + 0.5;
599 glEnable GL_TEXTURE_2D;
600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
601 592
602 if ($self->{texture_atime} < time) { 593 $self->{sw} = $sw;
594 $self->{sh} = $sh;
595
596 $self->{x0} = $x0;
597 $self->{y0} = $y0;
598
603 $self->{texture_atime} = time + 1/3; 599 $self->{texture_atime} = time + 1/3;
604 600
605 $self->{texture} = 601 $self->{texture} =
606 new CFPlus::Texture 602 new CFPlus::Texture
607 w => $w, 603 w => $w,
608 h => $h, 604 h => $h,
609 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 605 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; 606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611 } 607 }
608}
609
610sub invoke_visibility_change {
611 my ($self) = @_;
612
613 $self->refresh_hook;
614
615 0
616}
617
618sub invoke_size_allocate {
619 my ($self, $w, $h) = @_;
620
621 $self->update;
622
623 1
624}
625
626sub update {
627 my ($self) = @_;
628
629 delete $self->{texture_atime};
630 $self->SUPER::update;
631}
632
633sub _draw {
634 my ($self) = @_;
635
636 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
637
638 $self->{texture} or return;
639
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
612 644
613 $self->{texture}->draw_quad (0, 0); 645 $self->{texture}->draw_quad (0, 0);
614 646
615 glDisable GL_TEXTURE_2D; 647 glDisable GL_TEXTURE_2D;
616 648
617 glTranslate 0.375, 0.375; 649 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 650
624 glColor 1, 1, 0, 1; 651 glColor 1, 1, 0, 1;
625 glBegin GL_LINE_LOOP; 652 glBegin GL_LINE_LOOP;
626 glVertex $x0 , $y0 ; 653 glVertex $self->{x0} , $self->{y0} ;
627 glVertex $x0 , $y0 + $sh; 654 glVertex $self->{x0} , $self->{y0} + $self->{sh};
628 glVertex $x0 + $sw, $y0 + $sh; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629 glVertex $x0 + $sw, $y0 ; 656 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630 glEnd; 657 glEnd;
631 658
632 glDisable GL_BLEND; 659 glDisable GL_BLEND;
633} 660}
634 661

Diff Legend

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