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.98 by root, Sun Dec 10 01:30:54 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC

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, 25 list => glGenList,
26 26 tilesize => 32,
27 smooth_matrix => [
28 0.05, 0.13, 0.05,
29 0.13, 0.30, 0.13,
30 0.05, 0.13, 0.05,
31 ],
32
33 @_ 27 @_
34 ); 28 );
35 29
36 $self->{completer} = new CFPlus::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
37 command => $self->{command}, 31 command => $self->{command},
38 tooltip => "#completer_help", 32 tooltip => "#completer_help",
39 ; 33 ;
40 34
41 $self 35 $self
36}
37
38sub set_tilesize {
39 my ($self, $tilesize) = @_;
40
41 $self->{tilesize} = $tilesize;
42} 42}
43 43
44sub add_command { 44sub add_command {
45 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
46 46
177 177
178 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
179 $self->grab_focus; 179 $self->grab_focus;
180 return unless $::CONN; 180 return unless $::CONN;
181 181
182 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};
183 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};
184 184
185 $x -= CFPlus::floor $::MAP->w * 0.5; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
187 187
188 if ($::CONN) { 188 if ($::CONN) {
285 285
286 1 286 1
287} 287}
288 288
289sub size_request { 289sub size_request {
290 my ($self) = @_;
291
290 ( 292 (
291 32 * CFPlus::ceil $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
292 32 * CFPlus::ceil $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
293 ) 295 )
294} 296}
295 297
296sub update { 298sub update {
297 my ($self) = @_; 299 my ($self) = @_;
299 $self->{need_update} = 1; 301 $self->{need_update} = 1;
300 $self->SUPER::update; 302 $self->SUPER::update;
301} 303}
302 304
303my %DIR = ( 305my %DIR = (
306 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
304 CFPlus::SDLK_KP8, [1, "north"], 307 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
305 CFPlus::SDLK_KP9, [2, "northeast"], 308 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
306 CFPlus::SDLK_KP6, [3, "east"], 309 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
307 CFPlus::SDLK_KP3, [4, "southeast"], 310 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
308 CFPlus::SDLK_KP2, [5, "south"], 311 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
309 CFPlus::SDLK_KP1, [6, "southwest"], 312 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
310 CFPlus::SDLK_KP4, [7, "west"], 313 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
311 CFPlus::SDLK_KP7, [8, "northwest"], 314 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
312 315
313 CFPlus::SDLK_UP, [1, "north"], 316 ( "," . CFPlus::SDLK_UP ), [1, "north"],
317 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
314 CFPlus::SDLK_RIGHT, [3, "east"], 318 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
319 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
315 CFPlus::SDLK_DOWN, [5, "south"], 320 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
321 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
316 CFPlus::SDLK_LEFT, [7, "west"], 322 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
323 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
317); 324);
318 325
319sub invoke_key_down { 326sub invoke_key_down {
320 my ($self, $ev) = @_; 327 my ($self, $ev) = @_;
321 328
323 my $sym = $ev->{sym}; 330 my $sym = $ev->{sym};
324 my $uni = $ev->{unicode}; 331 my $uni = $ev->{unicode};
325 332
326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 333 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327 334
328 if ($uni == ord "\t") { 335 if ($sym == 9) {
329 $::PL_WINDOW->toggle_visibility; 336 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 337 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility; 338 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE); 340 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341 $::SETUP_DIALOG->toggle_visibility; 348 $::SETUP_DIALOG->toggle_visibility;
342 } elsif (!$::CONN) { 349 } elsif (!$::CONN) {
343 return 0; # bindings further down need a valid connection 350 return 0; # bindings further down need a valid connection
344 351
345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
346 $::CONN->user_send ("stay fire");
347 } elsif ($uni == ord ",") { 352 } elsif ($uni == ord ",") {
348 $::CONN->user_send ("take"); 353 $::CONN->user_send ("take");
349 } elsif ($uni == ord " ") { 354 } elsif ($uni == ord " ") {
350 $::CONN->user_send ("apply"); 355 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) { 356 } elsif ($uni == 13) {
357 $::CONN->macro_send ($_) for @macros; 362 $::CONN->macro_send ($_) for @macros;
358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 363 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
359 $::CONN->user_send ("rotateshoottype +"); 364 $::CONN->user_send ("rotateshoottype +");
360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 365 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
361 $::CONN->user_send ("rotateshoottype -"); 366 $::CONN->user_send ("rotateshoottype -");
367 } elsif ($uni == ord '!') {
368 $self->{completer}->set_prefix ("shout ");
369 $self->{completer}->show;
362 } elsif ($uni == ord '"') { 370 } elsif ($uni == ord '"') {
363 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 371 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
364 $self->{completer}->show; 372 $self->{completer}->show;
365 } elsif ($uni == ord "'") { 373 } elsif ($uni == ord "'") {
366 $self->{completer}->set_prefix (""); 374 $self->{completer}->set_prefix ("");
367 $self->{completer}->show; 375 $self->{completer}->show;
368 } elsif (exists $DIR{$sym}) { 376 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
369 if ($mod & CFPlus::KMOD_SHIFT) { 377 if ($mod & CFPlus::KMOD_SHIFT) {
370 $self->{shft}++; 378 $self->{shft}++;
371 if ($DIR{$sym}[0] != $self->{fire_dir}) { 379 if ($dir->[0] != $self->{fire_dir}) {
372 $::CONN->user_send ("fire $DIR{$sym}[0]"); 380 $::CONN->user_send ("fire $dir->[0]");
373 } 381 }
374 $self->{fire_dir} = $DIR{$sym}[0]; 382 $self->{fire_dir} = $DIR{$sym}[0];
375 } elsif ($mod & CFPlus::KMOD_CTRL) { 383 } elsif ($mod & CFPlus::KMOD_CTRL) {
376 $self->{ctrl}++; 384 $self->{ctrl}++;
377 $::CONN->user_send ("run $DIR{$sym}[0]"); 385 $::CONN->user_send ("run $dir->[0]");
378 } else { 386 } else {
379 $::CONN->user_send ("$DIR{$sym}[1]"); 387 $::CONN->user_send ("$dir->[1]");
380 } 388 }
381 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 389 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
382 $self->{completer}->inject_key_down ($ev); 390 $self->{completer}->inject_key_down ($ev);
383 $self->{completer}->show; 391 $self->{completer}->show;
384 } else { 392 } else {
419 } 427 }
420 428
421 $res 429 $res
422} 430}
423 431
432sub invoke_visibility_change {
433 my ($self) = @_;
434
435 $self->refresh_hook;
436
437 0
438}
439
424sub set_magicmap { 440sub set_magicmap {
425 my ($self, $w, $h, $x, $y, $data) = @_; 441 my ($self, $w, $h, $x, $y, $data) = @_;
426 442
427 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 443 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
428 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 444 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
430 $self->{magicmap} = [$x, $y, $w, $h, $data]; 446 $self->{magicmap} = [$x, $y, $w, $h, $data];
431 447
432 $self->update; 448 $self->update;
433} 449}
434 450
435sub draw { 451sub refresh_hook {
436 my ($self) = @_; 452 my ($self) = @_;
437 453
438 return unless $::MAP; 454 return unless $::MAP;
439 455
440 my $focused = $CFPlus::UI::FOCUS == $self
441 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
442
443 return
444 unless $focused || !$::FAST;
445
446 if (delete $self->{need_update}) { 456 if (delete $self->{need_update}) {
447 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
448 458
449 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
450 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 460 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
451 461
452 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 462 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
458 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;
459 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;
460 470
461 if ($::CFG->{fow_enable}) { 471 if ($::CFG->{fow_enable}) {
462 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
463
464 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
465 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
466 glConvolutionFilter2D (
467 GL_CONVOLUTION_2D,
468 GL_ALPHA,
469 3, 3,
470 GL_ALPHA, GL_FLOAT,
471 (pack "f*", @{ $self->{smooth_matrix} }),
472 );
473 glEnable GL_CONVOLUTION_2D;
474 }
475 473
476 $self->{fow_texture} = new CFPlus::Texture 474 $self->{fow_texture} = new CFPlus::Texture
477 w => $w, 475 w => $w,
478 h => $h, 476 h => $h,
479 data => $data, 477 data => $data,
480 internalformat => GL_ALPHA, 478 internalformat => GL_ALPHA,
481 format => GL_ALPHA; 479 format => GL_ALPHA;
482
483 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
484 } else { 480 } else {
485 delete $self->{fow_texture}; 481 delete $self->{fow_texture};
486 } 482 }
487 483
488 glNewList $self->{list}; 484 glNewList $self->{list};
489 485
490 glPushMatrix; 486 glPushMatrix;
491 glTranslate $sx0, $sy0; 487 glTranslate $sx0, $sy0;
492 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 488 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
493 489
494 $::MAP->draw ($dx, $dy, $sw, $sh); 490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
495 491
496 glScale 32, 32; 492 glScale $self->{tilesize}, $self->{tilesize};
497 493
498 if (my $tex = $self->{fow_texture}) { 494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix;
496 glScale 1/3, 1/3;
499 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
500 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
501 499
502 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 500 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
503 $self->{fow_texture}->draw_quad_alpha (0, 0); 501 $self->{fow_texture}->draw_quad_alpha (0, 0);
504 502
505 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
504 glPopMatrix;
506 } 505 }
507 506
508 if ($self->{magicmap}) { 507 if ($self->{magicmap}) {
509 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
510 509
517 } 516 }
518 517
519 glPopMatrix; 518 glPopMatrix;
520 glEndList; 519 glEndList;
521 } 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;
522 536
523 glCallList $self->{list}; 537 glCallList $self->{list};
524 538
525 # TNT2 emulates logops in software (or worse :) 539 # TNT2 emulates logops in software (or worse :)
526 unless ($focused) { 540 unless ($focused) {
545 $self->SUPER::DESTROY; 559 $self->SUPER::DESTROY;
546} 560}
547 561
548package CFPlus::MapWidget::MapMap; 562package CFPlus::MapWidget::MapMap;
549 563
564use strict;
565use utf8;
566
550our @ISA = CFPlus::UI::Base::; 567our @ISA = CFPlus::UI::Base::;
551 568
552use Time::HiRes qw(time); 569use Time::HiRes qw(time);
553use CFPlus::OpenGL; 570use CFPlus::OpenGL;
554 571
555sub size_request { 572sub size_request {
556 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 573 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
557} 574}
558 575
559sub invoke_size_allocate { 576sub refresh_hook {
560 my ($self, $w, $h) = @_; 577 my ($self) = @_;
561 578
562 $self->update; 579 if ($::MAP && $self->{texture_atime} < time) {
563
564 1
565}
566
567sub update {
568 my ($self) = @_;
569
570 delete $self->{texture_atime};
571 $self->SUPER::update;
572}
573
574sub _draw {
575 my ($self) = @_;
576
577 $::MAP or return;
578
579 my ($w, $h) = @$self{qw(w h)}; 580 my ($w, $h) = @$self{qw(w h)};
580 581
581 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
582 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 583 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 584
584 my $sx = int $::CFG->{map_shift_x} / 32;
585 my $sy = int $::CFG->{map_shift_y} / 32;
586
587 my $ox = 0.5 * ($w - $sw); 585 my $ox = 0.5 * ($w - $sw);
588 my $oy = 0.5 * ($h - $sh); 586 my $oy = 0.5 * ($h - $sh);
589 587
590 glEnable GL_BLEND; 588 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
591 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 589 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
592 glEnable GL_TEXTURE_2D;
593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
594 590
595 if ($self->{texture_atime} < time) { 591 #TODO: map scale is completely borked
592
593 my $x0 = int $ox - $sx + 0.5;
594 my $y0 = int $oy - $sy + 0.5;
595
596 $self->{sw} = $sw;
597 $self->{sh} = $sh;
598
599 $self->{x0} = $x0;
600 $self->{y0} = $y0;
601
596 $self->{texture_atime} = time + 1/3; 602 $self->{texture_atime} = time + 1/3;
597 603
598 $self->{texture} = 604 $self->{texture} =
599 new CFPlus::Texture 605 new CFPlus::Texture
600 w => $w, 606 w => $w,
601 h => $h, 607 h => $h,
602 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 608 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
603 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;
604 } 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;
605 647
606 $self->{texture}->draw_quad (0, 0); 648 $self->{texture}->draw_quad (0, 0);
607 649
608 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
609 651
610 glTranslate 0.375, 0.375; 652 glTranslate 0.375, 0.375;
611
612 #TODO: map scale is completely borked
613
614 my $x0 = int $ox - $sx + 0.5;
615 my $y0 = int $oy - $sy + 0.5;
616 653
617 glColor 1, 1, 0, 1; 654 glColor 1, 1, 0, 1;
618 glBegin GL_LINE_LOOP; 655 glBegin GL_LINE_LOOP;
619 glVertex $x0 , $y0 ; 656 glVertex $self->{x0} , $self->{y0} ;
620 glVertex $x0 , $y0 + $sh; 657 glVertex $self->{x0} , $self->{y0} + $self->{sh};
621 glVertex $x0 + $sw, $y0 + $sh; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
622 glVertex $x0 + $sw, $y0 ; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
623 glEnd; 660 glEnd;
624 661
625 glDisable GL_BLEND; 662 glDisable GL_BLEND;
626} 663}
627 664

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines