| … | |
… | |
| 14 | |
14 | |
| 15 | my $self = $class->SUPER::new ( |
15 | my $self = $class->SUPER::new ( |
| 16 | z => -1, |
16 | z => -1, |
| 17 | can_focus => 1, |
17 | can_focus => 1, |
| 18 | list => glGenList, |
18 | list => glGenList, |
|
|
19 | |
|
|
20 | smooth_matrix => [ |
|
|
21 | 0.05, 0.13, 0.05, |
|
|
22 | 0.13, 0.30, 0.13, |
|
|
23 | 0.05, 0.13, 0.05, |
|
|
24 | ], |
|
|
25 | |
| 19 | @_ |
26 | @_ |
| 20 | ); |
27 | ); |
| 21 | |
28 | |
| 22 | $self->{completer} = new CFClient::MapWidget::Command:: |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
| 23 | command => $self->{command}, |
30 | command => $self->{command}, |
| … | |
… | |
| 57 | my ($self, $ev, $x, $y) = @_; |
64 | my ($self, $ev, $x, $y) = @_; |
| 58 | |
65 | |
| 59 | $self->focus_in; |
66 | $self->focus_in; |
| 60 | |
67 | |
| 61 | if ($ev->{button} == 1) { |
68 | if ($ev->{button} == 1) { |
| 62 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
69 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
70 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
| 63 | |
71 | |
| 64 | my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); |
72 | my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; |
| 65 | my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); |
73 | my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; |
| 66 | $fx += $::MAP->x; |
|
|
| 67 | $fy += $::MAP->y; |
|
|
| 68 | |
74 | |
| 69 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy); |
75 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy) |
|
|
76 | if $::CONN; |
| 70 | |
77 | |
| 71 | warn "FOOX: $fx (".$::MAP->ox.")\n"; |
|
|
| 72 | warn "FOOY: $fy (".$::MAP->oy.")\n"; |
|
|
| 73 | } elsif ($ev->{button} == 2) { |
78 | } elsif ($ev->{button} == 2) { |
| 74 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
79 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
| 75 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
80 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
| 76 | |
81 | |
| 77 | $self->{motion} = sub { |
82 | $self->{motion} = sub { |
| … | |
… | |
| 255 | glConvolutionFilter2D ( |
260 | glConvolutionFilter2D ( |
| 256 | GL_CONVOLUTION_2D, |
261 | GL_CONVOLUTION_2D, |
| 257 | GL_ALPHA, |
262 | GL_ALPHA, |
| 258 | 3, 3, |
263 | 3, 3, |
| 259 | GL_ALPHA, GL_FLOAT, |
264 | GL_ALPHA, GL_FLOAT, |
| 260 | pack "f*", |
265 | (pack "f*", @{ $self->{smooth_matrix} }), |
| 261 | 0.05, 0.13, 0.05, |
|
|
| 262 | 0.13, 0.30, 0.13, |
|
|
| 263 | 0.05, 0.13, 0.05, |
|
|
| 264 | ); |
266 | ); |
| 265 | glEnable GL_CONVOLUTION_2D; |
267 | glEnable GL_CONVOLUTION_2D; |
| 266 | } |
268 | } |
| 267 | |
269 | |
| 268 | $self->{fow_texture_name} ||= glGenTexture; |
270 | $self->{fow_texture_name} ||= glGenTexture; |
| … | |
… | |
| 462 | |
464 | |
| 463 | if ($ev->{sym} == 13) { |
465 | if ($ev->{sym} == 13) { |
| 464 | if (exists $self->{select}) { |
466 | if (exists $self->{select}) { |
| 465 | $self->{last_command} = $self->{select}; |
467 | $self->{last_command} = $self->{select}; |
| 466 | $::CONN->user_send ($self->{select}); |
468 | $::CONN->user_send ($self->{select}); |
|
|
469 | |
|
|
470 | unshift @{$self->{history}}, $self->{select}; |
|
|
471 | $self->{hist_ptr} = 0; |
|
|
472 | |
| 467 | $self->hide; |
473 | $self->hide; |
| 468 | } |
474 | } |
| 469 | } elsif ($ev->{sym} == 27) { |
475 | } elsif ($ev->{sym} == 27) { |
|
|
476 | $self->{hist_ptr} = 0; |
| 470 | $self->hide; |
477 | $self->hide; |
| 471 | return; |
478 | return; |
| 472 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
479 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
480 | if ($self->{hist_ptr} > 1) { |
|
|
481 | $self->{hist_ptr}--; |
|
|
482 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
|
|
483 | } elsif ($self->{hist_ptr} > 0) { |
|
|
484 | $self->{hist_ptr}--; |
|
|
485 | $self->{entry}->set_text ($self->{hist_saveback}); |
|
|
486 | } else { |
| 473 | ++$self->{select_offset} |
487 | ++$self->{select_offset} |
| 474 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
488 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
489 | } |
| 475 | $self->update_labels; |
490 | $self->update_labels; |
| 476 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
491 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
492 | if ($self->{select_offset}) { |
| 477 | --$self->{select_offset} |
493 | --$self->{select_offset} |
|
|
494 | } else { |
|
|
495 | unless ($self->{hist_ptr}) { |
|
|
496 | $self->{hist_saveback} = $self->{entry}->get_text; |
|
|
497 | } |
|
|
498 | if ($self->{hist_ptr} <= $#{$self->{history}}) { |
| 478 | if $self->{select_offset}; |
499 | $self->{hist_ptr}++; |
|
|
500 | } |
|
|
501 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) |
|
|
502 | if exists $self->{history}->[$self->{hist_ptr} - 1]; |
|
|
503 | } |
| 479 | $self->update_labels; |
504 | $self->update_labels; |
| 480 | } else { |
505 | } else { |
| 481 | return 0; |
506 | return 0; |
| 482 | } |
507 | } |
| 483 | |
508 | |
