… | |
… | |
11 | use DC::Macro; |
11 | use DC::Macro; |
12 | |
12 | |
13 | our @ISA = DC::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
14 | |
14 | |
15 | my $magicmap_tex = |
15 | my $magicmap_tex = |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
16 | new_from_resource DC::Texture "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my $class = shift; |
21 | |
21 | |
… | |
… | |
285 | $self->{need_update} = 1; |
285 | $self->{need_update} = 1; |
286 | $self->SUPER::update; |
286 | $self->SUPER::update; |
287 | } |
287 | } |
288 | |
288 | |
289 | my %DIR = ( |
289 | my %DIR = ( |
290 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
290 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
291 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
291 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
292 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
292 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
293 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
293 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
294 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
294 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
295 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
295 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
296 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
296 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
297 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
297 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
298 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
298 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
299 | |
299 | |
|
|
300 | ( "," . DC::SDLK_PAGEUP ), [2, "northeast"], |
|
|
301 | ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"], |
|
|
302 | ( "," . DC::SDLK_END ), [6, "southwest"], |
|
|
303 | ( "," . DC::SDLK_HOME ), [8, "northwest"], |
|
|
304 | |
300 | ( "," . DC::SDLK_UP ), [1, "north"], |
305 | ( "," . DC::SDLK_UP ), [1, "north"], |
301 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
306 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
302 | ( "," . DC::SDLK_RIGHT), [3, "east"], |
307 | ( "," . DC::SDLK_RIGHT ), [3, "east"], |
303 | ("1," . DC::SDLK_RIGHT), [4, "southeast"], |
308 | ("1," . DC::SDLK_RIGHT ), [4, "southeast"], |
304 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
309 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
305 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
310 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
306 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
311 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
307 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
312 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
308 | ); |
313 | ); |
309 | |
314 | |
310 | sub invoke_key_down { |
315 | sub invoke_key_down { |
311 | my ($self, $ev) = @_; |
316 | my ($self, $ev) = @_; |
312 | |
317 | |
313 | my $mod = $ev->{mod}; |
318 | my $mod = $ev->{mod}; |
314 | my $sym = $ev->{sym}; |
319 | my $sym = $ev->{sym}; |
315 | my $uni = $ev->{unicode}; |
320 | my $uni = $ev->{unicode}; |
316 | |
321 | |
317 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; |
322 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT; |
318 | |
323 | |
319 | # ignore repeated keypresses |
324 | # ignore repeated keypresses |
320 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
325 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
321 | $self->{last_mod} = $mod; |
326 | $self->{last_mod} = $mod; |
322 | $self->{last_sym} = $sym; |
327 | $self->{last_sym} = $sym; |
323 | |
328 | |
324 | if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { |
329 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
|
|
330 | |
|
|
331 | if ($::CONN && $dir) { |
325 | if ($mod & DC::KMOD_SHIFT) { |
332 | if ($mod & DC::KMOD_SHIFT) { |
326 | $self->{shft}++; |
333 | $self->{shft}++; |
327 | if ($dir->[0] != $self->{fire_dir}) { |
334 | if ($dir->[0] != $self->{fire_dir}) { |
328 | $::CONN->user_send ("fire $dir->[0]"); |
335 | $::CONN->user_send ("fire $dir->[0]"); |
329 | } |
336 | } |
… | |
… | |
356 | $::CONN->user_send ("fire_stop"); |
363 | $::CONN->user_send ("fire_stop"); |
357 | delete $self->{fire_dir}; |
364 | delete $self->{fire_dir}; |
358 | $res = 1; |
365 | $res = 1; |
359 | } |
366 | } |
360 | } else { |
367 | } else { |
361 | if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
368 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
|
|
369 | |
|
|
370 | if ($dir && delete $self->{shft}) { |
362 | $::CONN->user_send ("fire_stop"); |
371 | $::CONN->user_send ("fire_stop"); |
363 | delete $self->{fire_dir}; |
372 | delete $self->{fire_dir}; |
364 | $res = 1; |
373 | $res = 1; |
365 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
374 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
366 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
375 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
… | |
… | |
368 | delete $self->{fire_dir}; |
377 | delete $self->{fire_dir}; |
369 | $res = 1; |
378 | $res = 1; |
370 | } |
379 | } |
371 | } |
380 | } |
372 | |
381 | |
373 | if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { |
382 | if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) { |
374 | $::CONN->user_send ("run_stop"); |
383 | $::CONN->user_send ("run_stop"); |
375 | $res = 1; |
384 | $res = 1; |
376 | } |
385 | } |
377 | |
386 | |
378 | $res |
387 | $res |
… | |
… | |
421 | if ($self->{sdx} || $self->{sdy}) { |
430 | if ($self->{sdx} || $self->{sdy}) { |
422 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
431 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
423 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
432 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
424 | |
433 | |
425 | # the minimum time for a single tile movement |
434 | # the minimum time for a single tile movement |
426 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); |
435 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
|
|
436 | |
|
|
437 | $spd *= $self->{tilesize}; |
427 | |
438 | |
428 | # jump if "impossibly high" speed |
439 | # jump if "impossibly high" speed |
429 | if ( |
440 | if ( |
430 | (max abs $self->{sdx}, abs $self->{sdy}) |
441 | (max abs $self->{sdx}, abs $self->{sdy}) |
431 | > $spd * $self->{tilesize} * $mintime * 1.1 |
442 | > $spd * $mintime * 2.1 |
432 | ) { |
443 | ) { |
433 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# |
444 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d# |
434 | $self->{sdx} = $self->{sdy} = 0; |
445 | $self->{sdx} = $self->{sdy} = 0; |
435 | } else { |
446 | } else { |
436 | my $upd = 0; |
447 | $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
437 | |
|
|
438 | $spd *= $self->{tilesize} * $diff * 1.0001; |
|
|
439 | |
448 | |
440 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
449 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
441 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
450 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
442 | |
451 | |
443 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 } |
452 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
444 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 } |
453 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
445 | |
|
|
446 | $self->update if $upd; |
|
|
447 | } |
454 | } |
|
|
455 | |
|
|
456 | $self->update; |
448 | } |
457 | } |
449 | } else { |
458 | } else { |
450 | $self->{sdx} = $self->{sdy} = 0; |
459 | $self->{sdx} = $self->{sdy} = 0; |
451 | } |
460 | } |
452 | |
461 | |
… | |
… | |
460 | if (delete $self->{need_update}) { |
469 | if (delete $self->{need_update}) { |
461 | $self->movement_update; |
470 | $self->movement_update; |
462 | |
471 | |
463 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
472 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
464 | |
473 | |
|
|
474 | my $sdx_t = DC::ceil $self->{sdx} / $tilesize; |
|
|
475 | my $sdy_t = DC::ceil $self->{sdy} / $tilesize; |
|
|
476 | |
465 | # width/height of map, in tiles |
477 | # width/height of map, in tiles |
466 | my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; |
478 | my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; |
467 | my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; |
479 | my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; |
468 | |
480 | |
469 | # the map displacement, in tiles |
481 | # the map displacement, in tiles |
470 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; |
482 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; |
471 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; |
483 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; |
472 | |
484 | |
473 | # the upper left "visible" corner, in pixels |
485 | # the upper left "visible" corner, in pixels |
474 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
486 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
475 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
487 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
476 | |
488 | |
477 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
489 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
478 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
490 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
479 | |
491 | |
480 | if ($::CFG->{fow_enable}) { |
492 | if ($::CFG->{fow_enable}) { |
|
|
493 | $sdx_t = $sdy_t = 0;#d# |
481 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
494 | my ($w, $h, $data) = $::MAP->fow_texture ( |
|
|
495 | $dx + (min 0, $sdx_t), |
|
|
496 | $dy + (min 0, $sdy_t), |
|
|
497 | $sw + abs $sdx_t, |
|
|
498 | $sh + abs $sdy_t |
|
|
499 | ); |
482 | |
500 | |
483 | $self->{fow_texture} = new DC::Texture |
501 | $self->{fow_texture} = new DC::Texture |
484 | w => $w, |
502 | w => $w, |
485 | h => $h, |
503 | h => $h, |
486 | data => $data, |
504 | data => $data, |
… | |
… | |
491 | } |
509 | } |
492 | |
510 | |
493 | glNewList ($self->{list} ||= glGenList); |
511 | glNewList ($self->{list} ||= glGenList); |
494 | |
512 | |
495 | glPushMatrix; |
513 | glPushMatrix; |
496 | glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy}; |
514 | glTranslate $sx0, $sy0; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
515 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
516 | glTranslate $self->{sdx}, $self->{sdy}; |
498 | |
517 | |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, |
518 | $::MAP->draw ($dx, $dy, $sw, $sh, |
500 | $self->{tilesize}, |
519 | $self->{tilesize}, |
501 | $::CONN->{player}{tag}, |
520 | $::CONN->{player}{tag}, |
502 | -$self->{sdx}, -$self->{sdy}); |
521 | -$self->{sdx}, -$self->{sdy}); |
503 | |
522 | |
|
|
523 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player |
504 | glScale $self->{tilesize}, $self->{tilesize}; |
524 | glScale $self->{tilesize}, $self->{tilesize}; |
505 | |
525 | |
506 | if (my $tex = $self->{fow_texture}) { |
526 | if (my $tex = $self->{fow_texture}) { |
507 | glPushMatrix; |
527 | glPushMatrix; |
|
|
528 | glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); |
508 | glScale 1/3, 1/3; |
529 | glScale 1/3, 1/3; |
509 | glEnable GL_TEXTURE_2D; |
530 | glEnable GL_TEXTURE_2D; |
510 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
531 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
511 | |
532 | |
512 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
533 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
… | |
… | |
591 | sub refresh_hook { |
612 | sub refresh_hook { |
592 | my ($self) = @_; |
613 | my ($self) = @_; |
593 | |
614 | |
594 | if ($::MAP && $self->{texture_atime} < time) { |
615 | if ($::MAP && $self->{texture_atime} < time) { |
595 | my ($w, $h) = @$self{qw(w h)}; |
616 | my ($w, $h) = @$self{qw(w h)}; |
|
|
617 | |
|
|
618 | return unless $w && $h; |
596 | |
619 | |
597 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
620 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
598 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
621 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
599 | |
622 | |
600 | my $ox = 0.5 * ($w - $sw); |
623 | my $ox = 0.5 * ($w - $sw); |