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.51 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.61 by root, Thu Jun 15 15:33:58 2006 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient::OpenGL; 8use CFClient::OpenGL;
9 9
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11
12my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 15
12sub new { 16sub new {
13 my $class = shift; 17 my $class = shift;
14 18
15 my $self = $class->SUPER::new ( 19 my $self = $class->SUPER::new (
… …
61} 65}
62 66
63sub button_down { 67sub button_down {
64 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
65 69
70 return unless $::CONN;
71
66 $self->focus_in; 72 $self->focus_in;
67 73
68 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 75 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 76 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
71 77
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 78 $x -= int 0.5 * $self->{sw};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 79 $y -= int 0.5 * $self->{sh};
74 80
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 81 $::CONN->lookat ($x, $y)
82 if $::CONN;
76 83
77 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
78 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
80 87
… …
174 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
175 $self->{completer}->show; 182 $self->{completer}->show;
176 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
177 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
178 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
179 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
180 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
181 $self->{ctrl}++; 191 $self->{ctrl}++;
182 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
183 } else { 193 } else {
184 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
… …
212 222
213 my $res = 0; 223 my $res = 0;
214 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
216 226
227 if ($::CFG->{shift_fire_stop}) {
217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
218 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
219 $res = 1; 231 $res = 1;
232 }
233 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir};
241 $res = 1;
242 }
220 } 243 }
221 244
222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
223 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
224 $res = 1; 247 $res = 1;
225 } 248 }
226 249
227 $res 250 $res
228} 251}
229 252
253sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_;
255
256 $x += - $::MAP->x - int 0.5 * $::MAP->w;
257 $y += - $::MAP->y - int 0.5 * $::MAP->h;
258
259 $self->{magicmap} = [$x, $y, $w, $h, $data];
260
261 $self->update;
262}
263
230sub draw { 264sub draw {
231 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
232 268
233 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
234 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
235 271
236 return 272 return
237 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
238 274
239 if (delete $self->{need_update}) { 275 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D,
294 GL_ALPHA,
295 3, 3,
296 GL_ALPHA, GL_FLOAT,
297 (pack "f*", @{ $self->{smooth_matrix} }),
298 );
299 glEnable GL_CONVOLUTION_2D;
300 }
301
302 $self->{fow_texture} = new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $data,
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310 } else {
311 delete $self->{fow_texture};
312 }
313
240 glNewList $self->{list}; 314 glNewList $self->{list};
241 315
242 if ($::MAP) {
243 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
244 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
245
246 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
247 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
248
249 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
250 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
251 319
252 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
253 321
254 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
255 323
256 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
257 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
258 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
259 glConvolutionFilter2D (
260 GL_CONVOLUTION_2D,
261 GL_ALPHA,
262 3, 3,
263 GL_ALPHA, GL_FLOAT,
264 (pack "f*", @{ $self->{smooth_matrix} }),
265 );
266 glEnable GL_CONVOLUTION_2D;
267 }
268
269 $self->{fow_texture_name} ||= glGenTexture;
270 # try to re-use the texture name: TODO improve texture class instead
271
272 $self->{fow_texture} = new CFClient::Texture
273 w => $w,
274 h => $h,
275 data => $data,
276 name => $self->{fow_texture_name},
277 internalformat => GL_ALPHA,
278 format => GL_ALPHA;
279
280 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
281
282 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
284 327
285 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
286 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
287 330
288 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
289 } 332 }
290 333
334 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337 $x += $::MAP->x - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->y - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 }
344
291 glPopMatrix; 345 glPopMatrix;
292 }
293
294 glEndList; 346 glEndList;
295 } 347 }
296 348
297 glPushMatrix;
298 glCallList $self->{list}; 349 glCallList $self->{list};
299 glPopMatrix;
300 350
301 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
302 if ($focused) { 352 unless ($focused) {
303 (delete $self->{out_of_focus})->destroy
304 if $self->{out_of_focus};
305 } else {
306 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
307 glEnable GL_BLEND; 354 glEnable GL_BLEND;
308 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
309 glBegin GL_QUADS; 356 glBegin GL_QUADS;
310 glVertex 0, 0; 357 glVertex 0, 0;
311 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
312 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
313 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
314 glEnd; 361 glEnd;
315 glDisable GL_BLEND; 362 glDisable GL_BLEND;
316
317# $self->{out_of_focus} ||= do {
318# my $label = new CFClient::UI::Label
319# x => 0,
320# y => 0,
321# z => 1,
322# ellipsise => 0,
323# text => "map out of focus (click map to play)";
324#
325# $label->show;
326# $label->update;
327#
328# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
329# $label->move_abs (
330# ($::WIDTH - $label->{w}) * 0.5,
331# ($::HEIGHT - $label->{h}) * 0.5,
332# );
333# });
334#
335# $label
336# };
337 } 363 }
338} 364}
339 365
340sub DESTROY { 366sub DESTROY {
341 my $self = shift; 367 my $self = shift;
… …
454 480
455 $self->{entry} = new CFClient::UI::Entry 481 $self->{entry} = new CFClient::UI::Entry
456 on_changed => sub { 482 on_changed => sub {
457 $self->update_labels; 483 $self->update_labels;
458 }, 484 },
485 on_button_down => sub {
486 my ($entry, $ev, $x, $y) = @_;
487
488 if ($ev->{button} == 3) {
489 (new CFClient::UI::Menu
490 items => [
491 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
492 ],
493 )->popup ($ev);
494 return 1;
495 }
496 0
497 },
459 on_key_down => sub { 498 on_key_down => sub {
460 my ($entry, $ev) = @_; 499 my ($entry, $ev) = @_;
461 500
462 my $self = $entry->{parent}{parent}; 501 my $self = $entry->{parent}{parent};
463 502
464 if ($ev->{sym} == 13) { 503 if ($ev->{sym} == 13) {
465 if (exists $self->{select}) { 504 if (exists $self->{select}) {
466 $self->{last_command} = $self->{select}; 505 $self->{last_command} = $self->{select};
467 $::CONN->user_send ($self->{select}); 506 $::CONN->user_send ($self->{select});
507
508 unshift @{$self->{history}}, $self->{select};
509 $self->{hist_ptr} = 0;
510
468 $self->hide; 511 $self->hide;
469 } 512 }
470 } elsif ($ev->{sym} == 27) { 513 } elsif ($ev->{sym} == 27) {
514 $self->{hist_ptr} = 0;
471 $self->hide; 515 $self->hide;
472 return; 516 return;
473 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 517 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
518 if ($self->{hist_ptr} > 1) {
519 $self->{hist_ptr}--;
520 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
521 } elsif ($self->{hist_ptr} > 0) {
522 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{hist_saveback});
524 } else {
474 ++$self->{select_offset} 525 ++$self->{select_offset}
475 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 526 if $self->{select_offset} < $#{ $self->{last_match} || [] };
527 }
476 $self->update_labels; 528 $self->update_labels;
477 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 529 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
530 if ($self->{select_offset}) {
478 --$self->{select_offset} 531 --$self->{select_offset}
532 } else {
533 unless ($self->{hist_ptr}) {
534 $self->{hist_saveback} = $self->{entry}->get_text;
535 }
536 if ($self->{hist_ptr} <= $#{$self->{history}}) {
479 if $self->{select_offset}; 537 $self->{hist_ptr}++;
538 }
539 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
540 if exists $self->{history}->[$self->{hist_ptr} - 1];
541 }
480 $self->update_labels; 542 $self->update_labels;
481 } else { 543 } else {
482 return 0; 544 return 0;
483 } 545 }
484 546

Diff Legend

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