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.111 by root, Thu Jul 19 14:54:50 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",
… …
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 list => glGenList,
25 26 tilesize => 32,
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 @_ 27 @_
33 ); 28 );
34 29
35 $self->{completer} = new CFPlus::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 31 command => $self->{command},
37 tooltip => "#completer_help", 32 tooltip => "#completer_help",
38 ; 33 ;
39 34
40 $self 35 $self
36}
37
38sub set_tilesize {
39 my ($self, $tilesize) = @_;
40
41 $self->{tilesize} = $tilesize;
41} 42}
42 43
43sub add_command { 44sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 46
… …
176 177
177 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
178 $self->grab_focus; 179 $self->grab_focus;
179 return unless $::CONN; 180 return unless $::CONN;
180 181
181 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};
182 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};
183 184
184 $x -= CFPlus::floor $::MAP->w * 0.5; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
186 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
187 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
188 if $::CONN; 193 }
194 }
189 195
190 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
191 $self->grab_focus; 197 $self->grab_focus;
192 return unless $::CONN; 198 return unless $::CONN;
193 199
… …
279 285
280 1 286 1
281} 287}
282 288
283sub size_request { 289sub size_request {
290 my ($self) = @_;
291
284 ( 292 (
285 32 * CFPlus::ceil $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
286 32 * CFPlus::ceil $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
287 ) 295 )
288} 296}
289 297
290sub update { 298sub update {
291 my ($self) = @_; 299 my ($self) = @_;
… …
293 $self->{need_update} = 1; 301 $self->{need_update} = 1;
294 $self->SUPER::update; 302 $self->SUPER::update;
295} 303}
296 304
297my %DIR = ( 305my %DIR = (
306 CFPlus::SDLK_KP5, [0, "stay fire"],
298 CFPlus::SDLK_KP8, [1, "north"], 307 CFPlus::SDLK_KP8, [1, "north"],
299 CFPlus::SDLK_KP9, [2, "northeast"], 308 CFPlus::SDLK_KP9, [2, "northeast"],
300 CFPlus::SDLK_KP6, [3, "east"], 309 CFPlus::SDLK_KP6, [3, "east"],
301 CFPlus::SDLK_KP3, [4, "southeast"], 310 CFPlus::SDLK_KP3, [4, "southeast"],
302 CFPlus::SDLK_KP2, [5, "south"], 311 CFPlus::SDLK_KP2, [5, "south"],
… …
317 my $sym = $ev->{sym}; 326 my $sym = $ev->{sym};
318 my $uni = $ev->{unicode}; 327 my $uni = $ev->{unicode};
319 328
320 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 329 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
321 330
322 if ($uni == ord "\t") { 331 if ($sym == 9) {
323 $::PL_WINDOW->toggle_visibility; 332 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
324 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 333 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
325 $::HELP_WINDOW->toggle_visibility; 334 $::HELP_WINDOW->toggle_visibility;
326 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 335 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327 ::toggle_player_page ($::STATS_PAGE); 336 ::toggle_player_page ($::STATS_PAGE);
328 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 337 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
331 ::toggle_player_page ($::SPELL_PAGE); 340 ::toggle_player_page ($::SPELL_PAGE);
332 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333 ::toggle_player_page ($::INVENTORY_PAGE); 342 ::toggle_player_page ($::INVENTORY_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335 $::SETUP_DIALOG->toggle_visibility; 344 $::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) { 345 } elsif (!$::CONN) {
350 return 0; # bindings further down need a valid connection 346 return 0; # bindings further down need a valid connection
351 347
352 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
353 $::CONN->user_send ("stay fire");
354 } elsif ($uni == ord ",") { 348 } elsif ($uni == ord ",") {
355 $::CONN->user_send ("take"); 349 $::CONN->user_send ("take");
356 } elsif ($uni == ord " ") { 350 } elsif ($uni == ord " ") {
357 $::CONN->user_send ("apply"); 351 $::CONN->user_send ("apply");
358 } elsif ($uni == 13) { 352 } elsif ($uni == 13) {
359 $::CONN->user_send ("examine"); 353 $::CONN->user_send ("examine");
360 } elsif ($uni == ord ".") { 354 } elsif ($uni == ord ".") {
361 $::CONN->user_send ($self->{completer}{last_command}) 355 $::CONN->user_send ($self->{completer}{last_command})
362 if exists $self->{completer}{last_command}; 356 if exists $self->{completer}{last_command};
363 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 357 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
364 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
365 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
366 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
367 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
368 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
363 } elsif ($uni == ord '!') {
364 $self->{completer}->set_prefix ("shout ");
365 $self->{completer}->show;
369 } elsif ($uni == ord '"') { 366 } elsif ($uni == ord '"') {
370 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 367 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
371 $self->{completer}->show; 368 $self->{completer}->show;
372 } elsif ($uni == ord "'") { 369 } elsif ($uni == ord "'") {
373 $self->{completer}->set_prefix (""); 370 $self->{completer}->set_prefix ("");
… …
426 } 423 }
427 424
428 $res 425 $res
429} 426}
430 427
428sub invoke_visibility_change {
429 my ($self) = @_;
430
431 $self->refresh_hook;
432
433 0
434}
435
431sub set_magicmap { 436sub set_magicmap {
432 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
433 438
434 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
435 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
437 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
438 443
439 $self->update; 444 $self->update;
440} 445}
441 446
442sub draw { 447sub refresh_hook {
443 my ($self) = @_; 448 my ($self) = @_;
444 449
445 return unless $::MAP; 450 return unless $::MAP;
446 451
447 my $focused = $CFPlus::UI::FOCUS == $self
448 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
449
450 return
451 unless $focused || !$::FAST;
452
453 if (delete $self->{need_update}) { 452 if (delete $self->{need_update}) {
454 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
455 454
456 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458 457
459 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
… …
465 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;
466 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;
467 466
468 if ($::CFG->{fow_enable}) { 467 if ($::CFG->{fow_enable}) {
469 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 468 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 469
483 $self->{fow_texture} = new CFPlus::Texture 470 $self->{fow_texture} = new CFPlus::Texture
484 w => $w, 471 w => $w,
485 h => $h, 472 h => $h,
486 data => $data, 473 data => $data,
487 internalformat => GL_ALPHA, 474 internalformat => GL_ALPHA,
488 format => GL_ALPHA; 475 format => GL_ALPHA;
489
490 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
491 } else { 476 } else {
492 delete $self->{fow_texture}; 477 delete $self->{fow_texture};
493 } 478 }
494 479
495 glNewList $self->{list}; 480 glNewList $self->{list};
496 481
497 glPushMatrix; 482 glPushMatrix;
498 glTranslate $sx0, $sy0; 483 glTranslate $sx0, $sy0;
499 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
500 485
501 $::MAP->draw ($dx, $dy, $sw, $sh); 486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
502 487
503 glScale 32, 32; 488 glScale $self->{tilesize}, $self->{tilesize};
504 489
505 if (my $tex = $self->{fow_texture}) { 490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
506 glEnable GL_TEXTURE_2D; 493 glEnable GL_TEXTURE_2D;
507 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
508 495
509 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
510 $self->{fow_texture}->draw_quad_alpha (0, 0); 497 $self->{fow_texture}->draw_quad_alpha (0, 0);
511 498
512 glDisable GL_TEXTURE_2D; 499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
513 } 501 }
514 502
515 if ($self->{magicmap}) { 503 if ($self->{magicmap}) {
516 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
517 505
… …
524 } 512 }
525 513
526 glPopMatrix; 514 glPopMatrix;
527 glEndList; 515 glEndList;
528 } 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;
529 532
530 glCallList $self->{list}; 533 glCallList $self->{list};
531 534
532 # TNT2 emulates logops in software (or worse :) 535 # TNT2 emulates logops in software (or worse :)
533 unless ($focused) { 536 unless ($focused) {
… …
552 $self->SUPER::DESTROY; 555 $self->SUPER::DESTROY;
553} 556}
554 557
555package CFPlus::MapWidget::MapMap; 558package CFPlus::MapWidget::MapMap;
556 559
560use strict;
561use utf8;
562
557our @ISA = CFPlus::UI::Base::; 563our @ISA = CFPlus::UI::Base::;
558 564
559use Time::HiRes qw(time); 565use Time::HiRes qw(time);
560use CFPlus::OpenGL; 566use CFPlus::OpenGL;
561 567
562sub size_request { 568sub size_request {
563 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 569 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
564} 570}
565 571
566sub invoke_size_allocate { 572sub refresh_hook {
567 my ($self, $w, $h) = @_; 573 my ($self) = @_;
568 574
569 $self->update; 575 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)}; 576 my ($w, $h) = @$self{qw(w h)};
587 577
588 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 578 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
589 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 579 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
590 580
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); 581 my $ox = 0.5 * ($w - $sw);
595 my $oy = 0.5 * ($h - $sh); 582 my $oy = 0.5 * ($h - $sh);
596 583
597 glEnable GL_BLEND; 584 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 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 586
602 if ($self->{texture_atime} < time) { 587 #TODO: map scale is completely borked
588
589 my $x0 = int $ox - $sx + 0.5;
590 my $y0 = int $oy - $sy + 0.5;
591
592 $self->{sw} = $sw;
593 $self->{sh} = $sh;
594
595 $self->{x0} = $x0;
596 $self->{y0} = $y0;
597
603 $self->{texture_atime} = time + 1/3; 598 $self->{texture_atime} = time + 1/3;
604 599
605 $self->{texture} = 600 $self->{texture} =
606 new CFPlus::Texture 601 new CFPlus::Texture
607 w => $w, 602 w => $w,
608 h => $h, 603 h => $h,
609 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 604 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; 605 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611 } 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;
612 643
613 $self->{texture}->draw_quad (0, 0); 644 $self->{texture}->draw_quad (0, 0);
614 645
615 glDisable GL_TEXTURE_2D; 646 glDisable GL_TEXTURE_2D;
616 647
617 glTranslate 0.375, 0.375; 648 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 649
624 glColor 1, 1, 0, 1; 650 glColor 1, 1, 0, 1;
625 glBegin GL_LINE_LOOP; 651 glBegin GL_LINE_LOOP;
626 glVertex $x0 , $y0 ; 652 glVertex $self->{x0} , $self->{y0} ;
627 glVertex $x0 , $y0 + $sh; 653 glVertex $self->{x0} , $self->{y0} + $self->{sh};
628 glVertex $x0 + $sw, $y0 + $sh; 654 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
629 glVertex $x0 + $sw, $y0 ; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
630 glEnd; 656 glEnd;
631 657
632 glDisable GL_BLEND; 658 glDisable GL_BLEND;
633} 659}
634 660
… …
670 696
671 if ($ev->{button} == 3) { 697 if ($ev->{button} == 3) {
672 (new CFPlus::UI::Menu 698 (new CFPlus::UI::Menu
673 items => [ 699 items => [
674 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 700 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
675 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 701 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
676 ], 702 ],
677 )->popup ($ev); 703 )->popup ($ev);
678 return 1; 704 return 1;
679 } 705 }
680 0 706 0

Diff Legend

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