| … | |
… | |
| 24 | can_focus => 1, |
24 | can_focus => 1, |
| 25 | list => glGenList, |
25 | list => glGenList, |
| 26 | tilesize => 32, |
26 | tilesize => 32, |
| 27 | |
27 | |
| 28 | smooth_matrix => [ |
28 | smooth_matrix => [ |
| 29 | 0.05, 0.13, 0.05, |
29 | 0.30, 0.50, 0.30, |
| 30 | 0.13, 0.30, 0.13, |
|
|
| 31 | 0.05, 0.13, 0.05, |
30 | 0.50, 0.50, 0.50, |
|
|
31 | 0.30, 0.50, 0.30, |
| 32 | ], |
32 | ], |
| 33 | |
33 | |
| 34 | @_ |
34 | @_ |
| 35 | ); |
35 | ); |
| 36 | |
36 | |
| … | |
… | |
| 308 | $self->{need_update} = 1; |
308 | $self->{need_update} = 1; |
| 309 | $self->SUPER::update; |
309 | $self->SUPER::update; |
| 310 | } |
310 | } |
| 311 | |
311 | |
| 312 | my %DIR = ( |
312 | my %DIR = ( |
|
|
313 | CFPlus::SDLK_KP5, [0, "stay fire"], |
| 313 | CFPlus::SDLK_KP8, [1, "north"], |
314 | CFPlus::SDLK_KP8, [1, "north"], |
| 314 | CFPlus::SDLK_KP9, [2, "northeast"], |
315 | CFPlus::SDLK_KP9, [2, "northeast"], |
| 315 | CFPlus::SDLK_KP6, [3, "east"], |
316 | CFPlus::SDLK_KP6, [3, "east"], |
| 316 | CFPlus::SDLK_KP3, [4, "southeast"], |
317 | CFPlus::SDLK_KP3, [4, "southeast"], |
| 317 | CFPlus::SDLK_KP2, [5, "south"], |
318 | CFPlus::SDLK_KP2, [5, "south"], |
| … | |
… | |
| 349 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
350 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
| 350 | $::SETUP_DIALOG->toggle_visibility; |
351 | $::SETUP_DIALOG->toggle_visibility; |
| 351 | } elsif (!$::CONN) { |
352 | } elsif (!$::CONN) { |
| 352 | return 0; # bindings further down need a valid connection |
353 | return 0; # bindings further down need a valid connection |
| 353 | |
354 | |
| 354 | } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) { |
|
|
| 355 | $::CONN->user_send ("stay fire"); |
|
|
| 356 | } elsif ($uni == ord ",") { |
355 | } elsif ($uni == ord ",") { |
| 357 | $::CONN->user_send ("take"); |
356 | $::CONN->user_send ("take"); |
| 358 | } elsif ($uni == ord " ") { |
357 | } elsif ($uni == ord " ") { |
| 359 | $::CONN->user_send ("apply"); |
358 | $::CONN->user_send ("apply"); |
| 360 | } elsif ($uni == 13) { |
359 | } elsif ($uni == 13) { |
| … | |
… | |
| 469 | |
468 | |
| 470 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
469 | 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; |
470 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
| 472 | |
471 | |
| 473 | if ($::CFG->{fow_enable}) { |
472 | if ($::CFG->{fow_enable}) { |
| 474 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
473 | my ($w, $h, $data) = $::MAP->fow_texture ( |
| 475 | |
474 | $dx, $dy, $sw, $sh, |
| 476 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
475 | $::CFG->{fow_smooth}, |
| 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} }), |
476 | pack "f*", @{ $self->{smooth_matrix} }, |
| 484 | ); |
477 | ); |
| 485 | glEnable GL_CONVOLUTION_2D; |
|
|
| 486 | } |
|
|
| 487 | |
478 | |
| 488 | $self->{fow_texture} = new CFPlus::Texture |
479 | $self->{fow_texture} = new CFPlus::Texture |
| 489 | w => $w, |
480 | w => $w, |
| 490 | h => $h, |
481 | h => $h, |
| 491 | data => $data, |
482 | data => $data, |
| 492 | internalformat => GL_ALPHA, |
483 | internalformat => GL_ALPHA, |
| 493 | format => GL_ALPHA; |
484 | format => GL_ALPHA; |
| 494 | |
|
|
| 495 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
| 496 | } else { |
485 | } else { |
| 497 | delete $self->{fow_texture}; |
486 | delete $self->{fow_texture}; |
| 498 | } |
487 | } |
| 499 | |
488 | |
| 500 | glNewList $self->{list}; |
489 | glNewList $self->{list}; |
| … | |
… | |
| 506 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
495 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
| 507 | |
496 | |
| 508 | glScale $self->{tilesize}, $self->{tilesize}; |
497 | glScale $self->{tilesize}, $self->{tilesize}; |
| 509 | |
498 | |
| 510 | if (my $tex = $self->{fow_texture}) { |
499 | if (my $tex = $self->{fow_texture}) { |
|
|
500 | glPushMatrix; |
|
|
501 | #glScale 1/3, 1/3 if $::CFG->{fow_smooth}; |
| 511 | glEnable GL_TEXTURE_2D; |
502 | glEnable GL_TEXTURE_2D; |
| 512 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
503 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
| 513 | |
504 | |
| 514 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
505 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
| 515 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
506 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
| 516 | |
507 | |
| 517 | glDisable GL_TEXTURE_2D; |
508 | glDisable GL_TEXTURE_2D; |
|
|
509 | glPopMatrix; |
| 518 | } |
510 | } |
| 519 | |
511 | |
| 520 | if ($self->{magicmap}) { |
512 | if ($self->{magicmap}) { |
| 521 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
513 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
| 522 | |
514 | |
