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

Diff Legend

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